From d78c340eac0dc251c1e96378fc1dab6e6cf8fdcc Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Fri, 19 Apr 2019 10:52:47 -0700 Subject: [PATCH] update onnx (#861) * update onnx * ignore some tests --- cgmanifest.json | 2 +- cmake/external/onnx | 2 +- onnxruntime/test/python/onnx_backend_test_series.py | 3 +++ tools/ci_build/github/linux/docker/scripts/install_deps.sh | 4 ++-- .../ci_build/github/linux/docker/scripts/install_deps_x86.sh | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cgmanifest.json b/cgmanifest.json index 3870222f38..0d0877b6c7 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -49,7 +49,7 @@ "component":{ "type":"git", "git":{ - "commitHash":"ad7313470a9119d7e1afda7edf1d654497ee80ab", + "commitHash":"83dd62659fc07d5b7fa93b5d1c1879f93509c7db", "repositoryUrl":"https://github.com/onnx/onnx.git" } } diff --git a/cmake/external/onnx b/cmake/external/onnx index ad7313470a..83dd62659f 160000 --- a/cmake/external/onnx +++ b/cmake/external/onnx @@ -1 +1 @@ -Subproject commit ad7313470a9119d7e1afda7edf1d654497ee80ab +Subproject commit 83dd62659fc07d5b7fa93b5d1c1879f93509c7db diff --git a/onnxruntime/test/python/onnx_backend_test_series.py b/onnxruntime/test/python/onnx_backend_test_series.py index 8582506e8d..877f5ad9c8 100644 --- a/onnxruntime/test/python/onnx_backend_test_series.py +++ b/onnxruntime/test/python/onnx_backend_test_series.py @@ -92,6 +92,9 @@ backend_test.exclude(r'(' '|^test_resize_nearest_cpu.*' '|^test_resize_upsample_linear_cpu.*' '|^test_resize_upsample_nearest_cpu.*' +'|^test_isinf_cpu.*' +'|^test_isinf_negative_cpu.*' +'|^test_isinf_positive_cpu.*' ')') # import all test cases at global scope to make 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 0ab1651577..7e3f98fc58 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 - #ad7313470a9119d7e1afda7edf1d654497ee80ab is v1.4.1 latest - for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "ad7313470a9119d7e1afda7edf1d654497ee80ab"; do + #83dd62659fc07d5b7fa93b5d1c1879f93509c7db is v1.4.1 latest + for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "83dd62659fc07d5b7fa93b5d1c1879f93509c7db"; 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 31067994e2..da8c8192d7 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 - #ad7313470a9119d7e1afda7edf1d654497ee80ab is v1.4.1 latest - for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "ad7313470a9119d7e1afda7edf1d654497ee80ab"; do + #83dd62659fc07d5b7fa93b5d1c1879f93509c7db is v1.4.1 latest + for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "83dd62659fc07d5b7fa93b5d1c1879f93509c7db"; do if [ -z ${lastest_onnx_version+x} ]; then echo "first pass"; else