From 55ed561a21259caff444f41768c83bc282c406a5 Mon Sep 17 00:00:00 2001 From: Masahiro Masuda Date: Mon, 10 Jan 2022 13:44:11 +0900 Subject: [PATCH 1/2] [Docker] Update onnx to 1.10.2, ORT to 1.9 --- docker/install/ubuntu_install_onnx.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/install/ubuntu_install_onnx.sh b/docker/install/ubuntu_install_onnx.sh index d9ad7bb451a6..8fc8157e1b2c 100755 --- a/docker/install/ubuntu_install_onnx.sh +++ b/docker/install/ubuntu_install_onnx.sh @@ -27,8 +27,9 @@ set -o pipefail # https://github.com/onnx/onnx/pull/2834). When updating the CI image # to onnx>=1.9, onnxoptimizer should also be installed. pip3 install \ - onnx==1.8.1 \ - onnxruntime==1.7.0 + onnx==1.10.2 \ + onnxruntime==1.9.0 \ + onnxoptimizer==0.2.6 # torch depends on a number of other packages, but unhelpfully, does # not expose that in the wheel!!! From a203732d410f7a1eb2f487a02fa21979ee384e39 Mon Sep 17 00:00:00 2001 From: Masahiro Masuda Date: Tue, 11 Jan 2022 03:27:49 +0900 Subject: [PATCH 2/2] restore disabled tests This reverts commit b29a4438e217ed84f7ee8c40254756c604d90fa3. --- tests/python/frontend/onnx/test_forward.py | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/tests/python/frontend/onnx/test_forward.py b/tests/python/frontend/onnx/test_forward.py index 4fac42ad227c..701906e4be40 100644 --- a/tests/python/frontend/onnx/test_forward.py +++ b/tests/python/frontend/onnx/test_forward.py @@ -4967,11 +4967,38 @@ def verify_eyelike(indata): ) unsupported_onnx_tests = [ + "test_basic_convinteger", + "test_batchnorm_epsilon_training_mode", + "test_batchnorm_example_training_mode", + "test_bernoulli", + "test_bernoulli_expanded", + "test_bernoulli_double", + "test_bernoulli_double_expanded", + "test_bernoulli_seed", + "test_bernoulli_seed_expanded", "test_cast_BFLOAT16_to_FLOAT", "test_cast_DOUBLE_to_FLOAT16", "test_cast_FLOAT_to_BFLOAT16", "test_cast_FLOAT_to_STRING", "test_cast_STRING_to_FLOAT", + "test_castlike_BFLOAT16_to_FLOAT", + "test_castlike_BFLOAT16_to_FLOAT_expanded", + "test_castlike_DOUBLE_to_FLOAT", + "test_castlike_DOUBLE_to_FLOAT16", + "test_castlike_DOUBLE_to_FLOAT16_expanded", + "test_castlike_FLOAT16_to_DOUBLE", + "test_castlike_FLOAT16_to_FLOAT", + "test_castlike_FLOAT_to_BFLOAT16", + "test_castlike_FLOAT_to_BFLOAT16_expanded", + "test_castlike_FLOAT_to_DOUBLE", + "test_castlike_FLOAT_to_FLOAT16", + "test_castlike_FLOAT_to_STRING", + "test_castlike_FLOAT_to_STRING_expanded", + "test_castlike_STRING_to_FLOAT", + "test_castlike_STRING_to_FLOAT_expanded", + "test_convinteger_with_padding", + "test_convinteger_without_padding", + "test_convtranspose_autopad_same", "test_convtranspose_dilations", "test_convtranspose_output_shape", "test_cumsum_1d", @@ -4987,9 +5014,13 @@ def verify_eyelike(indata): "test_dropout_default_mask", "test_dropout_default_mask_ratio", "test_dropout_default_ratio", + "test_gru_batchwise", + "test_hardswish", + "test_identity_sequence", "test_if_seq", "test_loop11", "test_loop13_seq", + "test_lstm_batchwise", "test_matmulinteger", "test_maxpool_2d_same_lower", "test_maxpool_2d_same_upper", @@ -4999,6 +5030,10 @@ def verify_eyelike(indata): "test_mvn", # This test fails llvm with a lowering error: "test_nllloss_NCd1d2d3_none_no_weight_negative_ii_expanded", + "test_optional_has_element", + "test_optional_get_element", + "test_optional_get_element_sequence", + "test_optional_has_element_empty", "test_qlinearmatmul_3D", "test_range_float_type_positive_delta_expanded", "test_range_int32_type_negative_delta_expanded", @@ -5016,6 +5051,13 @@ def verify_eyelike(indata): "test_round", "test_sequence_insert_at_back", "test_sequence_insert_at_front", + "test_shape_end_1", + "test_shape_end_negative_1", + "test_shape_start_1", + "test_shape_start_1_end_2", + "test_shape_start_1_end_negative_1", + "test_shape_start_negative_1", + "test_simple_rnn_batchwise", "test_simple_rnn_defaults", "test_simple_rnn_with_initial_bias", "test_split_variable_parts_1d", @@ -5041,6 +5083,24 @@ def verify_eyelike(indata): "test_training_dropout_mask", "test_training_dropout_zero_ratio", "test_training_dropout_zero_ratio_mask", + "test_tril", + "test_tril_pos", + "test_tril_square", + "test_tril_square_neg", + "test_tril_neg", + "test_tril_one_row_neg", + "test_tril_out_neg", + "test_tril_out_pos", + "test_tril_zero", + "test_triu", + "test_triu_one_row", + "test_triu_out_neg_out", + "test_triu_out_pos", + "test_triu_neg", + "test_triu_pos", + "test_triu_square", + "test_triu_square_neg", + "test_triu_zero", # These unsqueeze tests work, but take 2+ hrs to run "test_unsqueeze_three_axes", "test_unsqueeze_two_axes",