From ed0c86cd90b021f9b9491e4755888e8b8413e396 Mon Sep 17 00:00:00 2001 From: Bowen Bao Date: Thu, 18 Apr 2019 14:52:48 -0700 Subject: [PATCH] update onnx to fix matmul shape inference (#847) * update onnx to fix matmul shape inference * update onnx submodule hash in cgmanifest.json and ci scripts --- cgmanifest.json | 2 +- cmake/external/onnx | 2 +- tools/ci_build/github/linux/docker/scripts/install_deps.sh | 4 ++-- .../ci_build/github/linux/docker/scripts/install_deps_x86.sh | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cgmanifest.json b/cgmanifest.json index 775719e7e8..a05e435ebe 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -49,7 +49,7 @@ "component":{ "type":"git", "git":{ - "commitHash":"3717dc617fa06e4eea326e85dc0ccfdcdf4f4ab5", + "commitHash":"ad7313470a9119d7e1afda7edf1d654497ee80ab", "repositoryUrl":"https://github.com/onnx/onnx.git" } } diff --git a/cmake/external/onnx b/cmake/external/onnx index 3717dc617f..ad7313470a 160000 --- a/cmake/external/onnx +++ b/cmake/external/onnx @@ -1 +1 @@ -Subproject commit 3717dc617fa06e4eea326e85dc0ccfdcdf4f4ab5 +Subproject commit ad7313470a9119d7e1afda7edf1d654497ee80ab 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 98ba48a1ff..3674c64234 100755 --- a/tools/ci_build/github/linux/docker/scripts/install_deps.sh +++ b/tools/ci_build/github/linux/docker/scripts/install_deps.sh @@ -38,8 +38,8 @@ else #5af210ca8a1c73aa6bae8754c9346ec54d0a756e is v1.2.3 #bae6333e149a59a3faa9c4d9c44974373dcf5256 is v1.3.0 #9e55ace55aad1ada27516038dfbdc66a8a0763db is v1.4.1 - #3717dc617fa06e4eea326e85dc0ccfdcdf4f4ab5" is v1.4.1 latest - for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "3717dc617fa06e4eea326e85dc0ccfdcdf4f4ab5"; do + #ad7313470a9119d7e1afda7edf1d654497ee80ab is v1.4.1 latest + for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "ad7313470a9119d7e1afda7edf1d654497ee80ab"; 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 e17b23e7ca..dbe2b570e1 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 @@ -32,8 +32,8 @@ else #5af210ca8a1c73aa6bae8754c9346ec54d0a756e is v1.2.3 #bae6333e149a59a3faa9c4d9c44974373dcf5256 is v1.3.0 #9e55ace55aad1ada27516038dfbdc66a8a0763db is v1.4.1 - #3717dc617fa06e4eea326e85dc0ccfdcdf4f4ab5 is v1.4.1 latest - for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "3717dc617fa06e4eea326e85dc0ccfdcdf4f4ab5"; do + #ad7313470a9119d7e1afda7edf1d654497ee80ab is v1.4.1 latest + for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "ad7313470a9119d7e1afda7edf1d654497ee80ab"; do if [ -z ${lastest_onnx_version+x} ]; then echo "first pass"; else