From a42222f9deef0b0ef810f9bc8469c7c30d3dba31 Mon Sep 17 00:00:00 2001 From: Bowen Bao Date: Tue, 21 May 2019 09:52:41 -0700 Subject: [PATCH] bump onnx version & fix conv/pool tests (#1067) --- cgmanifest.json | 2 +- cmake/external/onnx | 2 +- .../test/providers/cpu/nn/conv_op_test.cc | 6 ++++-- .../test/providers/cpu/nn/pool_op_test.cc | 2 +- .../fusion/fuse-conv-add-mul-3d-2.onnx | Bin 50429 -> 50429 bytes .../fusion/fuse-conv-add-mul-3d.onnx | Bin 50136 -> 50136 bytes .../linux/docker/scripts/install_deps.sh | 3 ++- .../linux/docker/scripts/install_deps_x86.sh | 3 ++- 8 files changed, 11 insertions(+), 7 deletions(-) diff --git a/cgmanifest.json b/cgmanifest.json index 3e397eadd5..b7c8433f0a 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -49,7 +49,7 @@ "component":{ "type":"git", "git":{ - "commitHash":"7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef", + "commitHash":"5d0975f43c1224edce17177783b859fca4b8e2b1", "repositoryUrl":"https://github.com/onnx/onnx.git" } } diff --git a/cmake/external/onnx b/cmake/external/onnx index 7d7bc83d29..5d0975f43c 160000 --- a/cmake/external/onnx +++ b/cmake/external/onnx @@ -1 +1 @@ -Subproject commit 7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef +Subproject commit 5d0975f43c1224edce17177783b859fca4b8e2b1 diff --git a/onnxruntime/test/providers/cpu/nn/conv_op_test.cc b/onnxruntime/test/providers/cpu/nn/conv_op_test.cc index f7767cd1ad..8f317a27bc 100644 --- a/onnxruntime/test/providers/cpu/nn/conv_op_test.cc +++ b/onnxruntime/test/providers/cpu/nn/conv_op_test.cc @@ -179,7 +179,8 @@ TEST(ConvTest, Conv1D_Invalid_Input_Shape) { vector dummy_shape = {1, 1, 2}; auto dummy_vals = {0.0f, 0.0f}; TestConvOp(attrs, {X, dummy_vals}, {X_shape, dummy_shape}, dummy_vals, dummy_shape, true, true, - OpTester::ExpectResult::kExpectFailure, "Invalid input shape: {1}"); + OpTester::ExpectResult::kExpectFailure, "Node:node1 Output:Y [ShapeInferenceError] Can't merge shape info. " + "Both source and target dimension have values but they differ. Source=0 Target=2 Dimension=2"); } TEST(ConvTest, Conv2D_Invalid_Input_Shape) { @@ -197,7 +198,8 @@ TEST(ConvTest, Conv2D_Invalid_Input_Shape) { auto dummy_vals = {-0.0f, 0.0f, -0.0f, -0.0f, -0.0f, 0.0f, -0.0f, -0.0f}; TestConvOp(attrs, {X, dummy_vals}, {X_shape, dummy_shape}, dummy_vals, dummy_shape, true, true, - OpTester::ExpectResult::kExpectFailure, "Input channels C is not equal to kernel channels * group."); + OpTester::ExpectResult::kExpectFailure, "Node:node1 Output:Y [ShapeInferenceError] Can't merge shape info. " + "Both source and target dimension have values but they differ. Source=1 Target=2 Dimension=0"); } // Conv30 diff --git a/onnxruntime/test/providers/cpu/nn/pool_op_test.cc b/onnxruntime/test/providers/cpu/nn/pool_op_test.cc index 54f8e71eef..32b4466e57 100644 --- a/onnxruntime/test/providers/cpu/nn/pool_op_test.cc +++ b/onnxruntime/test/providers/cpu/nn/pool_op_test.cc @@ -214,7 +214,7 @@ TEST(PoolTest, MaxPool_10_Dilation_1d) { test.AddAttribute("auto_pad", ""); test.AddAttribute("strides", std::vector{1}); - test.AddAttribute("pads", vector{0, 0, 0, 0}); + test.AddAttribute("pads", vector{0, 0}); test.AddAttribute("kernel_shape", vector{3}); test.AddAttribute("dilations", vector{3}); diff --git a/onnxruntime/test/testdata/transform/fusion/fuse-conv-add-mul-3d-2.onnx b/onnxruntime/test/testdata/transform/fusion/fuse-conv-add-mul-3d-2.onnx index 3fe7832c88454a254b702c5db543316d0070e7dd..fc613b9d47ab6ca51419bd1161d795bc4aaebb73 100644 GIT binary patch delta 15 Wcmey{$^5sIdBcw*tlmyc0_*@jdIl;0 delta 15 Wcmey{$^5sIdBcw*tcFfZ0_*@i_y!OF diff --git a/onnxruntime/test/testdata/transform/fusion/fuse-conv-add-mul-3d.onnx b/onnxruntime/test/testdata/transform/fusion/fuse-conv-add-mul-3d.onnx index 20de2940c2820ebe91027d0f76bd89310b723c83..6145c08d25a40c5d9f9ce06815860214dbf8f84d 100644 GIT binary patch delta 15 Wcmcc7&U~YtdBf$ytlmyc0_*@eG6l8( delta 15 Wcmcc7&U~YtdBf$ytcFfZ0_*@dumzj| diff --git a/tools/ci_build/github/linux/docker/scripts/install_deps.sh b/tools/ci_build/github/linux/docker/scripts/install_deps.sh index ff1a243e08..e10bada7bf 100755 --- a/tools/ci_build/github/linux/docker/scripts/install_deps.sh +++ b/tools/ci_build/github/linux/docker/scripts/install_deps.sh @@ -39,7 +39,8 @@ else #bae6333e149a59a3faa9c4d9c44974373dcf5256 is v1.3.0 #9e55ace55aad1ada27516038dfbdc66a8a0763db is v1.4.1 #7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef is v1.5.0 - for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef"; do + #5d0975f43c1224edce17177783b859fca4b8e2b1 is master + for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef" "5d0975f43c1224edce17177783b859fca4b8e2b1"; do if [ -z ${lastest_onnx_version+x} ]; then echo "first pass"; else diff --git a/tools/ci_build/github/linux/docker/scripts/install_deps_x86.sh b/tools/ci_build/github/linux/docker/scripts/install_deps_x86.sh index 27e417f624..629c07cbc3 100755 --- a/tools/ci_build/github/linux/docker/scripts/install_deps_x86.sh +++ b/tools/ci_build/github/linux/docker/scripts/install_deps_x86.sh @@ -33,7 +33,8 @@ else #bae6333e149a59a3faa9c4d9c44974373dcf5256 is v1.3.0 #9e55ace55aad1ada27516038dfbdc66a8a0763db is v1.4.1 #7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef is v1.5.0 - for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef"; do + #5d0975f43c1224edce17177783b859fca4b8e2b1 is master + for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef" "5d0975f43c1224edce17177783b859fca4b8e2b1"; do if [ -z ${lastest_onnx_version+x} ]; then echo "first pass"; else