From 1043ff6d68428232c6d46891eb5b470e75ca5506 Mon Sep 17 00:00:00 2001 From: Lu Fang Date: Thu, 7 Mar 2019 10:51:29 -0800 Subject: [PATCH] Set the default ONNX opset to the latest stable opset (i.e., 9) (#17736) Summary: 1) The changes in the new opset won't affect internal pipeline. 2) The CI won't be affected by the ONNX changes. Pull Request resolved: https://github.com/pytorch/pytorch/pull/17736 Reviewed By: zrphercule Differential Revision: D14358710 Pulled By: houseroad fbshipit-source-id: 4ef15d2246b50f6875ee215ce37ecf92d555ca6a --- test/onnx/expect/TestOperators.test_acos.expect | 2 +- test/onnx/expect/TestOperators.test_add_broadcast.expect | 2 +- test/onnx/expect/TestOperators.test_add_left_broadcast.expect | 2 +- test/onnx/expect/TestOperators.test_add_size1_broadcast.expect | 2 +- .../expect/TestOperators.test_add_size1_right_broadcast.expect | 2 +- .../TestOperators.test_add_size1_singleton_broadcast.expect | 2 +- test/onnx/expect/TestOperators.test_addconstant.expect | 2 +- test/onnx/expect/TestOperators.test_addmm.expect | 2 +- test/onnx/expect/TestOperators.test_argmax.expect | 2 +- test/onnx/expect/TestOperators.test_asin.expect | 2 +- test/onnx/expect/TestOperators.test_at_op.expect | 2 +- test/onnx/expect/TestOperators.test_atan.expect | 2 +- test/onnx/expect/TestOperators.test_basic.expect | 2 +- test/onnx/expect/TestOperators.test_batchnorm.expect | 2 +- test/onnx/expect/TestOperators.test_batchnorm_1d.expect | 2 +- test/onnx/expect/TestOperators.test_batchnorm_noaffine.expect | 2 +- test/onnx/expect/TestOperators.test_batchnorm_training.expect | 2 +- test/onnx/expect/TestOperators.test_chunk.expect | 2 +- test/onnx/expect/TestOperators.test_clip.expect | 2 +- test/onnx/expect/TestOperators.test_clip_max.expect | 2 +- test/onnx/expect/TestOperators.test_clip_min.expect | 2 +- test/onnx/expect/TestOperators.test_concat2.expect | 2 +- test/onnx/expect/TestOperators.test_conv.expect | 2 +- test/onnx/expect/TestOperators.test_convtranspose.expect | 2 +- test/onnx/expect/TestOperators.test_cos.expect | 2 +- test/onnx/expect/TestOperators.test_dropout.expect | 2 +- test/onnx/expect/TestOperators.test_elu.expect | 2 +- test/onnx/expect/TestOperators.test_embedding_bags.expect | 2 +- test/onnx/expect/TestOperators.test_equal.expect | 2 +- test/onnx/expect/TestOperators.test_erf.expect | 2 +- test/onnx/expect/TestOperators.test_exp.expect | 2 +- test/onnx/expect/TestOperators.test_expand.expect | 2 +- test/onnx/expect/TestOperators.test_flatten.expect | 2 +- test/onnx/expect/TestOperators.test_flatten2D.expect | 2 +- test/onnx/expect/TestOperators.test_full.expect | 2 +- test/onnx/expect/TestOperators.test_full_like.expect | 2 +- test/onnx/expect/TestOperators.test_ge.expect | 2 +- test/onnx/expect/TestOperators.test_gt.expect | 2 +- test/onnx/expect/TestOperators.test_hardtanh.expect | 2 +- test/onnx/expect/TestOperators.test_implicit_expand.expect | 2 +- test/onnx/expect/TestOperators.test_index.expect | 2 +- test/onnx/expect/TestOperators.test_le.expect | 2 +- test/onnx/expect/TestOperators.test_linear.expect | 2 +- test/onnx/expect/TestOperators.test_log_sigmoid.expect | 2 +- test/onnx/expect/TestOperators.test_logsoftmax.expect | 2 +- test/onnx/expect/TestOperators.test_lt.expect | 2 +- ...stable_opset.expect => TestOperators.test_master_opset.expect} | 2 +- test/onnx/expect/TestOperators.test_max.expect | 2 +- test/onnx/expect/TestOperators.test_maxpool.expect | 2 +- test/onnx/expect/TestOperators.test_maxpool_indices.expect | 2 +- test/onnx/expect/TestOperators.test_mean.expect | 2 +- test/onnx/expect/TestOperators.test_min.expect | 2 +- test/onnx/expect/TestOperators.test_mm.expect | 2 +- test/onnx/expect/TestOperators.test_ne.expect | 2 +- test/onnx/expect/TestOperators.test_nonzero.expect | 2 +- test/onnx/expect/TestOperators.test_norm.expect | 2 +- test/onnx/expect/TestOperators.test_ones_like.expect | 2 +- test/onnx/expect/TestOperators.test_pad.expect | 2 +- test/onnx/expect/TestOperators.test_params.expect | 2 +- test/onnx/expect/TestOperators.test_permute2.expect | 2 +- test/onnx/expect/TestOperators.test_pow.expect | 2 +- test/onnx/expect/TestOperators.test_prod.expect | 2 +- test/onnx/expect/TestOperators.test_randn.expect | 2 +- .../expect/TestOperators.test_reduce_sum_negative_indices.expect | 2 +- test/onnx/expect/TestOperators.test_reduced_mean.expect | 2 +- test/onnx/expect/TestOperators.test_reduced_mean_keepdim.expect | 2 +- test/onnx/expect/TestOperators.test_reduced_prod.expect | 2 +- test/onnx/expect/TestOperators.test_reduced_prod_keepdim.expect | 2 +- test/onnx/expect/TestOperators.test_reduced_sum.expect | 2 +- test/onnx/expect/TestOperators.test_reduced_sum_keepdim.expect | 2 +- test/onnx/expect/TestOperators.test_reducemax.expect | 2 +- test/onnx/expect/TestOperators.test_reducemin.expect | 2 +- test/onnx/expect/TestOperators.test_repeat.expect | 2 +- test/onnx/expect/TestOperators.test_repeat_dim_overflow.expect | 2 +- test/onnx/expect/TestOperators.test_rrelu.expect | 2 +- test/onnx/expect/TestOperators.test_rsub.expect | 2 +- test/onnx/expect/TestOperators.test_selu.expect | 2 +- test/onnx/expect/TestOperators.test_sin.expect | 2 +- test/onnx/expect/TestOperators.test_slice.expect | 2 +- test/onnx/expect/TestOperators.test_split.expect | 2 +- test/onnx/expect/TestOperators.test_split_with_sizes.expect | 2 +- test/onnx/expect/TestOperators.test_sqrt.expect | 2 +- test/onnx/expect/TestOperators.test_sum.expect | 2 +- test/onnx/expect/TestOperators.test_tan.expect | 2 +- test/onnx/expect/TestOperators.test_transpose.expect | 2 +- test/onnx/expect/TestOperators.test_type_as.expect | 2 +- test/onnx/expect/TestOperators.test_unsqueeze.expect | 2 +- test/onnx/expect/TestOperators.test_view.expect | 2 +- test/onnx/expect/TestOperators.test_view_flatten.expect | 2 +- test/onnx/expect/TestOperators.test_zeros_like.expect | 2 +- test/onnx/test_operators.py | 4 ++-- torch/onnx/symbolic.py | 8 +++++--- torch/onnx/utils.py | 4 +++- 93 files changed, 100 insertions(+), 96 deletions(-) rename test/onnx/expect/{TestOperators.test_stable_opset.expect => TestOperators.test_master_opset.expect} (98%) diff --git a/test/onnx/expect/TestOperators.test_acos.expect b/test/onnx/expect/TestOperators.test_acos.expect index 3f50055..129fb56 100644 --- a/test/onnx/expect/TestOperators.test_acos.expect +++ b/test/onnx/expect/TestOperators.test_acos.expect @@ -42,5 +42,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_add_broadcast.expect b/test/onnx/expect/TestOperators.test_add_broadcast.expect index d21f68b..77727a5 100644 --- a/test/onnx/expect/TestOperators.test_add_broadcast.expect +++ b/test/onnx/expect/TestOperators.test_add_broadcast.expect @@ -56,5 +56,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_add_left_broadcast.expect b/test/onnx/expect/TestOperators.test_add_left_broadcast.expect index b7878a4..558f2ab 100644 --- a/test/onnx/expect/TestOperators.test_add_left_broadcast.expect +++ b/test/onnx/expect/TestOperators.test_add_left_broadcast.expect @@ -56,5 +56,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_add_size1_broadcast.expect b/test/onnx/expect/TestOperators.test_add_size1_broadcast.expect index aa43174..47f1a29 100644 --- a/test/onnx/expect/TestOperators.test_add_size1_broadcast.expect +++ b/test/onnx/expect/TestOperators.test_add_size1_broadcast.expect @@ -59,5 +59,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_add_size1_right_broadcast.expect b/test/onnx/expect/TestOperators.test_add_size1_right_broadcast.expect index d21f68b..77727a5 100644 --- a/test/onnx/expect/TestOperators.test_add_size1_right_broadcast.expect +++ b/test/onnx/expect/TestOperators.test_add_size1_right_broadcast.expect @@ -56,5 +56,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_add_size1_singleton_broadcast.expect b/test/onnx/expect/TestOperators.test_add_size1_singleton_broadcast.expect index ddc8b1b..f32b7d2 100644 --- a/test/onnx/expect/TestOperators.test_add_size1_singleton_broadcast.expect +++ b/test/onnx/expect/TestOperators.test_add_size1_singleton_broadcast.expect @@ -59,5 +59,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_addconstant.expect b/test/onnx/expect/TestOperators.test_addconstant.expect index c02268d..4bff59b 100644 --- a/test/onnx/expect/TestOperators.test_addconstant.expect +++ b/test/onnx/expect/TestOperators.test_addconstant.expect @@ -55,5 +55,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_addmm.expect b/test/onnx/expect/TestOperators.test_addmm.expect index c27d4d9..63145e7 100644 --- a/test/onnx/expect/TestOperators.test_addmm.expect +++ b/test/onnx/expect/TestOperators.test_addmm.expect @@ -100,5 +100,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_argmax.expect b/test/onnx/expect/TestOperators.test_argmax.expect index efe6eb9..96e6532 100644 --- a/test/onnx/expect/TestOperators.test_argmax.expect +++ b/test/onnx/expect/TestOperators.test_argmax.expect @@ -49,5 +49,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_asin.expect b/test/onnx/expect/TestOperators.test_asin.expect index d9f2369..0ce924b 100644 --- a/test/onnx/expect/TestOperators.test_asin.expect +++ b/test/onnx/expect/TestOperators.test_asin.expect @@ -42,5 +42,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_at_op.expect b/test/onnx/expect/TestOperators.test_at_op.expect index 6a5f6c1..58672ec 100644 --- a/test/onnx/expect/TestOperators.test_at_op.expect +++ b/test/onnx/expect/TestOperators.test_at_op.expect @@ -48,5 +48,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_atan.expect b/test/onnx/expect/TestOperators.test_atan.expect index d3d0fbd..d214ece 100644 --- a/test/onnx/expect/TestOperators.test_atan.expect +++ b/test/onnx/expect/TestOperators.test_atan.expect @@ -42,5 +42,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_basic.expect b/test/onnx/expect/TestOperators.test_basic.expect index 8b257cf..1048b5c 100644 --- a/test/onnx/expect/TestOperators.test_basic.expect +++ b/test/onnx/expect/TestOperators.test_basic.expect @@ -71,5 +71,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_batchnorm.expect b/test/onnx/expect/TestOperators.test_batchnorm.expect index 77f6e6e..da13303 100644 --- a/test/onnx/expect/TestOperators.test_batchnorm.expect +++ b/test/onnx/expect/TestOperators.test_batchnorm.expect @@ -159,5 +159,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_batchnorm_1d.expect b/test/onnx/expect/TestOperators.test_batchnorm_1d.expect index 193a3b8..bd66622 100644 --- a/test/onnx/expect/TestOperators.test_batchnorm_1d.expect +++ b/test/onnx/expect/TestOperators.test_batchnorm_1d.expect @@ -167,5 +167,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_batchnorm_noaffine.expect b/test/onnx/expect/TestOperators.test_batchnorm_noaffine.expect index 6495868..787db9b 100644 --- a/test/onnx/expect/TestOperators.test_batchnorm_noaffine.expect +++ b/test/onnx/expect/TestOperators.test_batchnorm_noaffine.expect @@ -147,5 +147,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_batchnorm_training.expect b/test/onnx/expect/TestOperators.test_batchnorm_training.expect index 55cd830..92c983c 100644 --- a/test/onnx/expect/TestOperators.test_batchnorm_training.expect +++ b/test/onnx/expect/TestOperators.test_batchnorm_training.expect @@ -163,5 +163,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_chunk.expect b/test/onnx/expect/TestOperators.test_chunk.expect index 801662e..6cfe6e0 100644 --- a/test/onnx/expect/TestOperators.test_chunk.expect +++ b/test/onnx/expect/TestOperators.test_chunk.expect @@ -61,5 +61,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_clip.expect b/test/onnx/expect/TestOperators.test_clip.expect index cddd05a..ae6b886 100644 --- a/test/onnx/expect/TestOperators.test_clip.expect +++ b/test/onnx/expect/TestOperators.test_clip.expect @@ -52,5 +52,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_clip_max.expect b/test/onnx/expect/TestOperators.test_clip_max.expect index a8a8025..c17e330 100644 --- a/test/onnx/expect/TestOperators.test_clip_max.expect +++ b/test/onnx/expect/TestOperators.test_clip_max.expect @@ -59,5 +59,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_clip_min.expect b/test/onnx/expect/TestOperators.test_clip_min.expect index 5c80dbc..7f330c1 100644 --- a/test/onnx/expect/TestOperators.test_clip_min.expect +++ b/test/onnx/expect/TestOperators.test_clip_min.expect @@ -59,5 +59,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_concat2.expect b/test/onnx/expect/TestOperators.test_concat2.expect index d83e9d1..d9dd3a7 100644 --- a/test/onnx/expect/TestOperators.test_concat2.expect +++ b/test/onnx/expect/TestOperators.test_concat2.expect @@ -64,5 +64,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_conv.expect b/test/onnx/expect/TestOperators.test_conv.expect index 57d9432..f9121b6 100644 --- a/test/onnx/expect/TestOperators.test_conv.expect +++ b/test/onnx/expect/TestOperators.test_conv.expect @@ -117,5 +117,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_convtranspose.expect b/test/onnx/expect/TestOperators.test_convtranspose.expect index 618cc5a..1c2bcfc 100644 --- a/test/onnx/expect/TestOperators.test_convtranspose.expect +++ b/test/onnx/expect/TestOperators.test_convtranspose.expect @@ -123,5 +123,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_cos.expect b/test/onnx/expect/TestOperators.test_cos.expect index b2cbfc5..6af6dd7 100644 --- a/test/onnx/expect/TestOperators.test_cos.expect +++ b/test/onnx/expect/TestOperators.test_cos.expect @@ -42,5 +42,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_dropout.expect b/test/onnx/expect/TestOperators.test_dropout.expect index 0f6a55c..262bdaa 100644 --- a/test/onnx/expect/TestOperators.test_dropout.expect +++ b/test/onnx/expect/TestOperators.test_dropout.expect @@ -41,5 +41,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_elu.expect b/test/onnx/expect/TestOperators.test_elu.expect index b7dc0cf..9348966 100644 --- a/test/onnx/expect/TestOperators.test_elu.expect +++ b/test/onnx/expect/TestOperators.test_elu.expect @@ -59,5 +59,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_embedding_bags.expect b/test/onnx/expect/TestOperators.test_embedding_bags.expect index 60a3d9b..ffa59ff 100644 --- a/test/onnx/expect/TestOperators.test_embedding_bags.expect +++ b/test/onnx/expect/TestOperators.test_embedding_bags.expect @@ -100,5 +100,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_equal.expect b/test/onnx/expect/TestOperators.test_equal.expect index ea3c205..9d6c1be 100644 --- a/test/onnx/expect/TestOperators.test_equal.expect +++ b/test/onnx/expect/TestOperators.test_equal.expect @@ -81,5 +81,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_erf.expect b/test/onnx/expect/TestOperators.test_erf.expect index 921cdfb..69ebbbf 100644 --- a/test/onnx/expect/TestOperators.test_erf.expect +++ b/test/onnx/expect/TestOperators.test_erf.expect @@ -54,5 +54,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_exp.expect b/test/onnx/expect/TestOperators.test_exp.expect index f701724..773277e 100644 --- a/test/onnx/expect/TestOperators.test_exp.expect +++ b/test/onnx/expect/TestOperators.test_exp.expect @@ -42,5 +42,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_expand.expect b/test/onnx/expect/TestOperators.test_expand.expect index b9a2735..7646a64 100644 --- a/test/onnx/expect/TestOperators.test_expand.expect +++ b/test/onnx/expect/TestOperators.test_expand.expect @@ -59,5 +59,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_flatten.expect b/test/onnx/expect/TestOperators.test_flatten.expect index 5b82b5a..1102a94 100644 --- a/test/onnx/expect/TestOperators.test_flatten.expect +++ b/test/onnx/expect/TestOperators.test_flatten.expect @@ -59,5 +59,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_flatten2D.expect b/test/onnx/expect/TestOperators.test_flatten2D.expect index c41d82a..0270a2f 100644 --- a/test/onnx/expect/TestOperators.test_flatten2D.expect +++ b/test/onnx/expect/TestOperators.test_flatten2D.expect @@ -53,5 +53,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_full.expect b/test/onnx/expect/TestOperators.test_full.expect index 71640c6..5737a1c 100644 --- a/test/onnx/expect/TestOperators.test_full.expect +++ b/test/onnx/expect/TestOperators.test_full.expect @@ -137,5 +137,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_full_like.expect b/test/onnx/expect/TestOperators.test_full_like.expect index f5f6e4a..f6edcde 100644 --- a/test/onnx/expect/TestOperators.test_full_like.expect +++ b/test/onnx/expect/TestOperators.test_full_like.expect @@ -55,5 +55,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_ge.expect b/test/onnx/expect/TestOperators.test_ge.expect index 2573c4b..d68aa4c 100644 --- a/test/onnx/expect/TestOperators.test_ge.expect +++ b/test/onnx/expect/TestOperators.test_ge.expect @@ -74,5 +74,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_gt.expect b/test/onnx/expect/TestOperators.test_gt.expect index 3aa9412..4c5335c 100644 --- a/test/onnx/expect/TestOperators.test_gt.expect +++ b/test/onnx/expect/TestOperators.test_gt.expect @@ -81,5 +81,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_hardtanh.expect b/test/onnx/expect/TestOperators.test_hardtanh.expect index 0544ae0..7888875 100644 --- a/test/onnx/expect/TestOperators.test_hardtanh.expect +++ b/test/onnx/expect/TestOperators.test_hardtanh.expect @@ -52,5 +52,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_implicit_expand.expect b/test/onnx/expect/TestOperators.test_implicit_expand.expect index fe8ec48..02e6baf 100644 --- a/test/onnx/expect/TestOperators.test_implicit_expand.expect +++ b/test/onnx/expect/TestOperators.test_implicit_expand.expect @@ -55,5 +55,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_index.expect b/test/onnx/expect/TestOperators.test_index.expect index 7bc0c23..8ebe92d 100644 --- a/test/onnx/expect/TestOperators.test_index.expect +++ b/test/onnx/expect/TestOperators.test_index.expect @@ -57,5 +57,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_le.expect b/test/onnx/expect/TestOperators.test_le.expect index 584b49a..30c1a3c 100644 --- a/test/onnx/expect/TestOperators.test_le.expect +++ b/test/onnx/expect/TestOperators.test_le.expect @@ -74,5 +74,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_linear.expect b/test/onnx/expect/TestOperators.test_linear.expect index d383b66..ca3d9b6 100644 --- a/test/onnx/expect/TestOperators.test_linear.expect +++ b/test/onnx/expect/TestOperators.test_linear.expect @@ -101,5 +101,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_log_sigmoid.expect b/test/onnx/expect/TestOperators.test_log_sigmoid.expect index 0251c32..4e691b5 100644 --- a/test/onnx/expect/TestOperators.test_log_sigmoid.expect +++ b/test/onnx/expect/TestOperators.test_log_sigmoid.expect @@ -59,5 +59,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_logsoftmax.expect b/test/onnx/expect/TestOperators.test_logsoftmax.expect index 77607e8..e2494bc 100644 --- a/test/onnx/expect/TestOperators.test_logsoftmax.expect +++ b/test/onnx/expect/TestOperators.test_logsoftmax.expect @@ -59,5 +59,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_lt.expect b/test/onnx/expect/TestOperators.test_lt.expect index ea45778..f9d4aa6 100644 --- a/test/onnx/expect/TestOperators.test_lt.expect +++ b/test/onnx/expect/TestOperators.test_lt.expect @@ -81,5 +81,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_stable_opset.expect b/test/onnx/expect/TestOperators.test_master_opset.expect similarity index 98% rename from test/onnx/expect/TestOperators.test_stable_opset.expect rename to test/onnx/expect/TestOperators.test_master_opset.expect index b92cb3b..c37b34d 100644 --- a/test/onnx/expect/TestOperators.test_stable_opset.expect +++ b/test/onnx/expect/TestOperators.test_master_opset.expect @@ -59,5 +59,5 @@ graph { } } opset_import { - version: 9 + version: 10 } diff --git a/test/onnx/expect/TestOperators.test_max.expect b/test/onnx/expect/TestOperators.test_max.expect index 65cc0d5..3b305a7 100644 --- a/test/onnx/expect/TestOperators.test_max.expect +++ b/test/onnx/expect/TestOperators.test_max.expect @@ -59,5 +59,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_maxpool.expect b/test/onnx/expect/TestOperators.test_maxpool.expect index 3481e37..1f359a6 100644 --- a/test/onnx/expect/TestOperators.test_maxpool.expect +++ b/test/onnx/expect/TestOperators.test_maxpool.expect @@ -64,5 +64,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_maxpool_indices.expect b/test/onnx/expect/TestOperators.test_maxpool_indices.expect index a635a75..ef154b8 100644 --- a/test/onnx/expect/TestOperators.test_maxpool_indices.expect +++ b/test/onnx/expect/TestOperators.test_maxpool_indices.expect @@ -126,5 +126,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_mean.expect b/test/onnx/expect/TestOperators.test_mean.expect index d7c1064..791d581 100644 --- a/test/onnx/expect/TestOperators.test_mean.expect +++ b/test/onnx/expect/TestOperators.test_mean.expect @@ -47,5 +47,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_min.expect b/test/onnx/expect/TestOperators.test_min.expect index cebb894..4996812 100644 --- a/test/onnx/expect/TestOperators.test_min.expect +++ b/test/onnx/expect/TestOperators.test_min.expect @@ -59,5 +59,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_mm.expect b/test/onnx/expect/TestOperators.test_mm.expect index c333b5b..9fbc32b 100644 --- a/test/onnx/expect/TestOperators.test_mm.expect +++ b/test/onnx/expect/TestOperators.test_mm.expect @@ -83,5 +83,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_ne.expect b/test/onnx/expect/TestOperators.test_ne.expect index 57d1c04..6a1aa4b 100644 --- a/test/onnx/expect/TestOperators.test_ne.expect +++ b/test/onnx/expect/TestOperators.test_ne.expect @@ -86,5 +86,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_nonzero.expect b/test/onnx/expect/TestOperators.test_nonzero.expect index 4e9cfd2..d5bd735 100644 --- a/test/onnx/expect/TestOperators.test_nonzero.expect +++ b/test/onnx/expect/TestOperators.test_nonzero.expect @@ -45,5 +45,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_norm.expect b/test/onnx/expect/TestOperators.test_norm.expect index 12e6cd6..5fc2454 100644 --- a/test/onnx/expect/TestOperators.test_norm.expect +++ b/test/onnx/expect/TestOperators.test_norm.expect @@ -61,5 +61,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_ones_like.expect b/test/onnx/expect/TestOperators.test_ones_like.expect index a36b3d5..70394a8 100644 --- a/test/onnx/expect/TestOperators.test_ones_like.expect +++ b/test/onnx/expect/TestOperators.test_ones_like.expect @@ -55,5 +55,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_pad.expect b/test/onnx/expect/TestOperators.test_pad.expect index a422160..60e1f2c 100644 --- a/test/onnx/expect/TestOperators.test_pad.expect +++ b/test/onnx/expect/TestOperators.test_pad.expect @@ -71,5 +71,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_params.expect b/test/onnx/expect/TestOperators.test_params.expect index b50314f..bfd11ff 100644 --- a/test/onnx/expect/TestOperators.test_params.expect +++ b/test/onnx/expect/TestOperators.test_params.expect @@ -87,5 +87,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_permute2.expect b/test/onnx/expect/TestOperators.test_permute2.expect index 30aca40..310ad4b 100644 --- a/test/onnx/expect/TestOperators.test_permute2.expect +++ b/test/onnx/expect/TestOperators.test_permute2.expect @@ -76,5 +76,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_pow.expect b/test/onnx/expect/TestOperators.test_pow.expect index e2351b7..ef64d11 100644 --- a/test/onnx/expect/TestOperators.test_pow.expect +++ b/test/onnx/expect/TestOperators.test_pow.expect @@ -77,5 +77,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_prod.expect b/test/onnx/expect/TestOperators.test_prod.expect index c87851a..a42ef92 100644 --- a/test/onnx/expect/TestOperators.test_prod.expect +++ b/test/onnx/expect/TestOperators.test_prod.expect @@ -47,5 +47,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_randn.expect b/test/onnx/expect/TestOperators.test_randn.expect index eae7624..cd1f2d0 100644 --- a/test/onnx/expect/TestOperators.test_randn.expect +++ b/test/onnx/expect/TestOperators.test_randn.expect @@ -67,5 +67,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_reduce_sum_negative_indices.expect b/test/onnx/expect/TestOperators.test_reduce_sum_negative_indices.expect index c41e396..4a3909c 100644 --- a/test/onnx/expect/TestOperators.test_reduce_sum_negative_indices.expect +++ b/test/onnx/expect/TestOperators.test_reduce_sum_negative_indices.expect @@ -49,5 +49,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_reduced_mean.expect b/test/onnx/expect/TestOperators.test_reduced_mean.expect index 78768bc..faed3da 100644 --- a/test/onnx/expect/TestOperators.test_reduced_mean.expect +++ b/test/onnx/expect/TestOperators.test_reduced_mean.expect @@ -61,5 +61,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_reduced_mean_keepdim.expect b/test/onnx/expect/TestOperators.test_reduced_mean_keepdim.expect index e2fc4e4..5de3fef 100644 --- a/test/onnx/expect/TestOperators.test_reduced_mean_keepdim.expect +++ b/test/onnx/expect/TestOperators.test_reduced_mean_keepdim.expect @@ -64,5 +64,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_reduced_prod.expect b/test/onnx/expect/TestOperators.test_reduced_prod.expect index e2bfebf..5dfd5de 100644 --- a/test/onnx/expect/TestOperators.test_reduced_prod.expect +++ b/test/onnx/expect/TestOperators.test_reduced_prod.expect @@ -61,5 +61,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_reduced_prod_keepdim.expect b/test/onnx/expect/TestOperators.test_reduced_prod_keepdim.expect index 931448b..65a6ef1 100644 --- a/test/onnx/expect/TestOperators.test_reduced_prod_keepdim.expect +++ b/test/onnx/expect/TestOperators.test_reduced_prod_keepdim.expect @@ -64,5 +64,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_reduced_sum.expect b/test/onnx/expect/TestOperators.test_reduced_sum.expect index b905539..51c17ae 100644 --- a/test/onnx/expect/TestOperators.test_reduced_sum.expect +++ b/test/onnx/expect/TestOperators.test_reduced_sum.expect @@ -61,5 +61,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_reduced_sum_keepdim.expect b/test/onnx/expect/TestOperators.test_reduced_sum_keepdim.expect index 174af16..d53d13d 100644 --- a/test/onnx/expect/TestOperators.test_reduced_sum_keepdim.expect +++ b/test/onnx/expect/TestOperators.test_reduced_sum_keepdim.expect @@ -64,5 +64,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_reducemax.expect b/test/onnx/expect/TestOperators.test_reducemax.expect index 0ac171a..db1c1ec 100644 --- a/test/onnx/expect/TestOperators.test_reducemax.expect +++ b/test/onnx/expect/TestOperators.test_reducemax.expect @@ -47,5 +47,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_reducemin.expect b/test/onnx/expect/TestOperators.test_reducemin.expect index bb234cf..059c584 100644 --- a/test/onnx/expect/TestOperators.test_reducemin.expect +++ b/test/onnx/expect/TestOperators.test_reducemin.expect @@ -47,5 +47,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_repeat.expect b/test/onnx/expect/TestOperators.test_repeat.expect index a740486..82e4bb5 100644 --- a/test/onnx/expect/TestOperators.test_repeat.expect +++ b/test/onnx/expect/TestOperators.test_repeat.expect @@ -68,5 +68,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_repeat_dim_overflow.expect b/test/onnx/expect/TestOperators.test_repeat_dim_overflow.expect index c51ae16..dddf2f9 100644 --- a/test/onnx/expect/TestOperators.test_repeat_dim_overflow.expect +++ b/test/onnx/expect/TestOperators.test_repeat_dim_overflow.expect @@ -81,5 +81,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_rrelu.expect b/test/onnx/expect/TestOperators.test_rrelu.expect index 744fb07..6a0a338 100644 --- a/test/onnx/expect/TestOperators.test_rrelu.expect +++ b/test/onnx/expect/TestOperators.test_rrelu.expect @@ -70,5 +70,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_rsub.expect b/test/onnx/expect/TestOperators.test_rsub.expect index e951830..d87d356 100644 --- a/test/onnx/expect/TestOperators.test_rsub.expect +++ b/test/onnx/expect/TestOperators.test_rsub.expect @@ -55,5 +55,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_selu.expect b/test/onnx/expect/TestOperators.test_selu.expect index 2af3e62..9835d17 100644 --- a/test/onnx/expect/TestOperators.test_selu.expect +++ b/test/onnx/expect/TestOperators.test_selu.expect @@ -54,5 +54,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_sin.expect b/test/onnx/expect/TestOperators.test_sin.expect index 990c2b1..f6a736c 100644 --- a/test/onnx/expect/TestOperators.test_sin.expect +++ b/test/onnx/expect/TestOperators.test_sin.expect @@ -42,5 +42,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_slice.expect b/test/onnx/expect/TestOperators.test_slice.expect index 28ee0ca..7527d15 100644 --- a/test/onnx/expect/TestOperators.test_slice.expect +++ b/test/onnx/expect/TestOperators.test_slice.expect @@ -77,5 +77,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_split.expect b/test/onnx/expect/TestOperators.test_split.expect index 559c47f..c7798ab 100644 --- a/test/onnx/expect/TestOperators.test_split.expect +++ b/test/onnx/expect/TestOperators.test_split.expect @@ -88,5 +88,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_split_with_sizes.expect b/test/onnx/expect/TestOperators.test_split_with_sizes.expect index ec0b907..f7ff653 100644 --- a/test/onnx/expect/TestOperators.test_split_with_sizes.expect +++ b/test/onnx/expect/TestOperators.test_split_with_sizes.expect @@ -88,5 +88,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_sqrt.expect b/test/onnx/expect/TestOperators.test_sqrt.expect index de1fdde..06b59bf 100644 --- a/test/onnx/expect/TestOperators.test_sqrt.expect +++ b/test/onnx/expect/TestOperators.test_sqrt.expect @@ -42,5 +42,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_sum.expect b/test/onnx/expect/TestOperators.test_sum.expect index ef07d61..69f0d02 100644 --- a/test/onnx/expect/TestOperators.test_sum.expect +++ b/test/onnx/expect/TestOperators.test_sum.expect @@ -47,5 +47,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_tan.expect b/test/onnx/expect/TestOperators.test_tan.expect index 8707514..6378140 100644 --- a/test/onnx/expect/TestOperators.test_tan.expect +++ b/test/onnx/expect/TestOperators.test_tan.expect @@ -42,5 +42,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_transpose.expect b/test/onnx/expect/TestOperators.test_transpose.expect index 12c0d56..ccff4fc 100644 --- a/test/onnx/expect/TestOperators.test_transpose.expect +++ b/test/onnx/expect/TestOperators.test_transpose.expect @@ -37,5 +37,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_type_as.expect b/test/onnx/expect/TestOperators.test_type_as.expect index 8a2a0c2..41f2467 100644 --- a/test/onnx/expect/TestOperators.test_type_as.expect +++ b/test/onnx/expect/TestOperators.test_type_as.expect @@ -31,5 +31,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_unsqueeze.expect b/test/onnx/expect/TestOperators.test_unsqueeze.expect index 2161d14..8a97a91 100644 --- a/test/onnx/expect/TestOperators.test_unsqueeze.expect +++ b/test/onnx/expect/TestOperators.test_unsqueeze.expect @@ -50,5 +50,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_view.expect b/test/onnx/expect/TestOperators.test_view.expect index 5bb2d35..71cb888 100644 --- a/test/onnx/expect/TestOperators.test_view.expect +++ b/test/onnx/expect/TestOperators.test_view.expect @@ -44,5 +44,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_view_flatten.expect b/test/onnx/expect/TestOperators.test_view_flatten.expect index b428d3b..4fe33d1 100644 --- a/test/onnx/expect/TestOperators.test_view_flatten.expect +++ b/test/onnx/expect/TestOperators.test_view_flatten.expect @@ -192,5 +192,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/expect/TestOperators.test_zeros_like.expect b/test/onnx/expect/TestOperators.test_zeros_like.expect index 0e73576..9ab783a 100644 --- a/test/onnx/expect/TestOperators.test_zeros_like.expect +++ b/test/onnx/expect/TestOperators.test_zeros_like.expect @@ -55,5 +55,5 @@ graph { } } opset_import { - version: 10 + version: 9 } diff --git a/test/onnx/test_operators.py b/test/onnx/test_operators.py index 396ee3f..981f662 100644 --- a/test/onnx/test_operators.py +++ b/test/onnx/test_operators.py @@ -547,10 +547,10 @@ class TestOperators(TestCase): x = torch.tensor([[[2., 2.], [1., 0.]], [[0., 0.], [1., 1.]]], requires_grad=True) self.assertONNX(lambda x: torch.nonzero(x), x) - def test_stable_opset(self): + def test_master_opset(self): x = torch.randn(2, 3).float() y = torch.randn(2, 3).float() - self.assertONNX(lambda x, y: x + y, (x, y), opset_version=9) + self.assertONNX(lambda x, y: x + y, (x, y), opset_version=10) if __name__ == '__main__': diff --git a/torch/onnx/symbolic.py b/torch/onnx/symbolic.py index 772b11e..cca06c2 100644 --- a/torch/onnx/symbolic.py +++ b/torch/onnx/symbolic.py @@ -200,16 +200,18 @@ def _try_get_scalar_type(*args): # and the symbolic functions should check it to determine the behavior # of the exporter. -_default_onnx_opset_version = 10 -_export_onnx_opset_version = _default_onnx_opset_version + +_default_onnx_opset_version = 9 +_onnx_master_opset = 10 _onnx_stable_opsets = [9] +_export_onnx_opset_version = _default_onnx_opset_version def _set_opset_version(opset_version): global _export_onnx_opset_version if opset_version == _default_onnx_opset_version: return - if opset_version in _onnx_stable_opsets: + if opset_version in _onnx_stable_opsets + [_onnx_master_opset]: _export_onnx_opset_version = opset_version return raise ValueError("Unsupported ONNX opset version: " + str(opset_version)) diff --git a/torch/onnx/utils.py b/torch/onnx/utils.py index b7b89c2..55fd38f 100644 --- a/torch/onnx/utils.py +++ b/torch/onnx/utils.py @@ -92,8 +92,10 @@ def export(model, args, f, export_params=True, verbose=False, training=False, OperatorExportTypes.RAW: export raw ir. opset_version (int, default is 9): by default we export the model to the opset version of the onnx submodule. Since ONNX's latest opset may - evolve before next stable release, we may want to export to some stable + evolve before next stable release, by default we export to one stable opset version. Right now, supported stable opset version is 9. + The opset_version must be _onnx_master_opset or in _onnx_stable_opsets + which are defined in torch/onnx/symbolic.py """ if aten or export_raw_ir: assert operator_export_type is None -- 2.7.4