saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-06-06 00:03:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bump onnx version & fix conv/pool tests (#1067)

Browse source
This commit is contained in:
Bowen Bao 2019-05-21 09:52:41 -07:00 committed by GitHub
parent 3209204ef2
commit a42222f9de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cgmanifest.json
View file

@ -49,7 +49,7 @@
"component":{
"type":"git",
"git":{
"commitHash":"7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef",
"commitHash":"5d0975f43c1224edce17177783b859fca4b8e2b1",
"repositoryUrl":"https://github.com/onnx/onnx.git"
}
}

2
cmake/external/onnx vendored

@ -1 +1 @@
Subproject commit 7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef
Subproject commit 5d0975f43c1224edce17177783b859fca4b8e2b1

6
onnxruntime/test/providers/cpu/nn/conv_op_test.cc
View file

@ -179,7 +179,8 @@ TEST(ConvTest, Conv1D_Invalid_Input_Shape) {
vector<int64_t> 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

2
onnxruntime/test/providers/cpu/nn/pool_op_test.cc
View file

@ -214,7 +214,7 @@ TEST(PoolTest, MaxPool_10_Dilation_1d) {
test.AddAttribute("auto_pad", "");
test.AddAttribute("strides", std::vector<int64_t>{1});
test.AddAttribute("pads", vector<int64_t>{0, 0, 0, 0});
test.AddAttribute("pads", vector<int64_t>{0, 0});
test.AddAttribute("kernel_shape", vector<int64_t>{3});
test.AddAttribute("dilations", vector<int64_t>{3});

BIN
onnxruntime/test/testdata/transform/fusion/fuse-conv-add-mul-3d-2.onnx vendored
View file

Binary file not shown.

BIN
onnxruntime/test/testdata/transform/fusion/fuse-conv-add-mul-3d.onnx vendored
View file

Binary file not shown.

3
tools/ci_build/github/linux/docker/scripts/install_deps.sh
View file

@ -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

3
tools/ci_build/github/linux/docker/scripts/install_deps_x86.sh
View file

@ -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