From 07e6dfa7ab93574303109fa3315cd1b4fcad50d6 Mon Sep 17 00:00:00 2001
From: Ashwini Khade <askhade@microsoft.com>
Date: Tue, 16 Apr 2019 09:43:17 -0700
Subject: [PATCH] update onnx and enable tests for qlinearconv (#840)

---
 cgmanifest.json                                          | 2 +-
 cmake/external/onnx                                      | 2 +-
 onnxruntime/test/providers/cpu/nn/qlinearconv_op_test.cc | 9 +++------
 .../ci_build/github/linux/docker/scripts/install_deps.sh | 5 ++---
 .../github/linux/docker/scripts/install_deps_x86.sh      | 4 ++--
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/cgmanifest.json b/cgmanifest.json
index b269b2988f..775719e7e8 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -49,7 +49,7 @@
          "component":{
             "type":"git",
             "git":{
-               "commitHash":"a80c3371a6514bd11664249e59cae958f45b3b59",
+               "commitHash":"3717dc617fa06e4eea326e85dc0ccfdcdf4f4ab5",
                "repositoryUrl":"https://github.com/onnx/onnx.git"
             }
          }
diff --git a/cmake/external/onnx b/cmake/external/onnx
index a80c3371a6..3717dc617f 160000
--- a/cmake/external/onnx
+++ b/cmake/external/onnx
@@ -1 +1 @@
-Subproject commit a80c3371a6514bd11664249e59cae958f45b3b59
+Subproject commit 3717dc617fa06e4eea326e85dc0ccfdcdf4f4ab5
diff --git a/onnxruntime/test/providers/cpu/nn/qlinearconv_op_test.cc b/onnxruntime/test/providers/cpu/nn/qlinearconv_op_test.cc
index 45fead9f24..5320c6cd41 100644
--- a/onnxruntime/test/providers/cpu/nn/qlinearconv_op_test.cc
+++ b/onnxruntime/test/providers/cpu/nn/qlinearconv_op_test.cc
@@ -8,9 +8,7 @@ namespace onnxruntime {
 namespace test {
 
 namespace {
-// There is a bug in onnx shapeinference for this op.
-// TODO Enable this test after bug fix
-/*
+
 void FindMinMax(const vector<float>& vec, float* min,
                 float* max) {
   *min = *max = 0;
@@ -104,7 +102,7 @@ TEST(ConvTest, QLinearConv2DTest) {
 
   test.AddOutput<uint8_t>("y", Y_shape, result_quantized);
 
-  //test.Run();
+  test.Run();
 }
 
 TEST(ConvTest, QLinearConv3DTest) {
@@ -175,9 +173,8 @@ TEST(ConvTest, QLinearConv3DTest) {
 
   test.AddOutput<uint8_t>("y", Y_shape, result_quantized);
 
-  //test.Run();
+  test.Run();
 }
-*/
 
 }  // namespace
 }  // namespace test
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 b38aeed4ef..98ba48a1ff 100755
--- a/tools/ci_build/github/linux/docker/scripts/install_deps.sh
+++ b/tools/ci_build/github/linux/docker/scripts/install_deps.sh
@@ -38,9 +38,8 @@ else
   #5af210ca8a1c73aa6bae8754c9346ec54d0a756e is v1.2.3
   #bae6333e149a59a3faa9c4d9c44974373dcf5256 is v1.3.0
   #9e55ace55aad1ada27516038dfbdc66a8a0763db is v1.4.1
-  #7a112a6f930aac375da5a38d744ccda93e37632c" is v1.4.1
-  #a80c3371a6514bd11664249e59cae958f45b3b59 latest  
-    for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "7a112a6f930aac375da5a38d744ccda93e37632c" "a80c3371a6514bd11664249e59cae958f45b3b59"; do
+  #3717dc617fa06e4eea326e85dc0ccfdcdf4f4ab5" is v1.4.1 latest
+    for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "3717dc617fa06e4eea326e85dc0ccfdcdf4f4ab5"; 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 7f370532e1..e17b23e7ca 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
-  #7a112a6f930aac375da5a38d744ccda93e37632c is v1.4.1 latest
-  for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "7a112a6f930aac375da5a38d744ccda93e37632c"; do
+  #3717dc617fa06e4eea326e85dc0ccfdcdf4f4ab5 is v1.4.1 latest
+  for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "3717dc617fa06e4eea326e85dc0ccfdcdf4f4ab5"; do
     if [ -z ${lastest_onnx_version+x} ]; then
       echo "first pass";
     else