From 1d3fcc525a77cf96e4ba90d876dde966c8748a32 Mon Sep 17 00:00:00 2001
From: Hariharan Seshadri <shariharan91@gmail.com>
Date: Tue, 5 Mar 2019 12:03:16 -0800
Subject: [PATCH] deps: update onnx to a newer commit and update test
 exclusions (#542)

* Update onnx dep to a newer commit and update test exclusions

* Keeping shrink excuded in c++ tests

* More changes
---
 cgmanifest.json                                    |  2 +-
 cmake/external/onnx                                |  2 +-
 onnxruntime/test/onnx/main.cc                      | 14 ++++++++++++++
 .../test/python/onnx_backend_test_series.py        |  4 +++-
 .../github/linux/docker/scripts/install_deps.sh    |  4 ++--
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/cgmanifest.json b/cgmanifest.json
index 468c527cef..f219ba9375 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -49,7 +49,7 @@
          "component":{
             "type":"git",
             "git":{
-               "commitHash":"2896c77cfc628f18b6ca6b28e3a380807fa00f53",
+               "commitHash":"873ddbbc33c6e54d90c5628387edd391fb651dfc",
                "repositoryUrl":"https://github.com/onnx/onnx.git"
             }
          }
diff --git a/cmake/external/onnx b/cmake/external/onnx
index 2896c77cfc..873ddbbc33 160000
--- a/cmake/external/onnx
+++ b/cmake/external/onnx
@@ -1 +1 @@
-Subproject commit 2896c77cfc628f18b6ca6b28e3a380807fa00f53
+Subproject commit 873ddbbc33c6e54d90c5628387edd391fb651dfc
diff --git a/onnxruntime/test/onnx/main.cc b/onnxruntime/test/onnx/main.cc
index e18205c3ea..31b87098ed 100644
--- a/onnxruntime/test/onnx/main.cc
+++ b/onnxruntime/test/onnx/main.cc
@@ -259,6 +259,8 @@ int real_main(int argc, char* argv[]) {
       {"BatchNorm2d_momentum_eval", "disable reason"},
       {"BatchNorm3d_eval", "disable reason"},
       {"BatchNorm3d_momentum_eval", "disable reason"},
+      {"constantofshape_float_ones", "test data bug"},
+      {"constantofshape_int_zeros", "test data bug"},      
       {"GLU", "disable reason"},
       {"GLU_dim", "disable reason"},
       {"Linear", "disable reason"},
@@ -312,6 +314,18 @@ int real_main(int argc, char* argv[]) {
       {"scatter_without_axis", "opset 9 not supported yet"},
       {"scan_sum", "opset 9 not supported yet"},
       {"shrink", "opset 9 not supported yet"},
+      {"strnormalizer_export_monday_casesensintive_lower", "opset 10 not supported yet"},
+      {"strnormalizer_export_monday_casesensintive_nochangecase", "opset 10 not supported yet"},
+      {"strnormalizer_export_monday_casesensintive_upper", "opset 10 not supported yet"},
+      {"strnormalizer_export_monday_empty_output", "opset 10 not supported yet"},
+      {"strnormalizer_export_monday_insensintive_upper_twodim", "opset 10 not supported yet"},
+      {"strnormalizer_nostopwords_nochangecase", "opset 10 not supported yet"},
+      {"strnorm_model_monday_casesensintive_lower", "opset 10 not supported yet"},
+      {"strnorm_model_monday_casesensintive_nochangecase", "opset 10 not supported yet"},
+      {"strnorm_model_monday_casesensintive_upper", "opset 10 not supported yet"},
+      {"strnorm_model_monday_empty_output", "opset 10 not supported yet"},
+      {"strnorm_model_monday_insensintive_upper_twodim", "opset 10 not supported yet"},
+      {"strnorm_model_nostopwords_nochangecase", "opset 10 not supported yet"}, 
       {"cast_DOUBLE_to_FLOAT16", "Cast opset 9 not supported yet"},
       {"cast_DOUBLE_to_FLOAT", "Cast opset 9 not supported yet"},
       {"cast_FLOAT_to_DOUBLE", "Cast opset 9 not supported yet"},
diff --git a/onnxruntime/test/python/onnx_backend_test_series.py b/onnxruntime/test/python/onnx_backend_test_series.py
index e57873e43f..9204e87387 100644
--- a/onnxruntime/test/python/onnx_backend_test_series.py
+++ b/onnxruntime/test/python/onnx_backend_test_series.py
@@ -24,6 +24,7 @@ backend_test.exclude(r'('
 '|^test_cast_STRING_to_FLOAT_cpu.*'
 '|^test_convtranspose_1d_cpu.*'
 '|^test_convtranspose_3d_cpu.*'
+'|^test_constantofshape_*.*'
 '|^test_scatter_with_axis_cpu.*'
 '|^test_scatter_without_axis_cpu.*'
 '|^test_AvgPool1d_cpu.*'
@@ -48,6 +49,8 @@ backend_test.exclude(r'('
 '|^test_PReLU_3d_cpu.*'
 '|^test_PReLU_3d_multiparam_cpu.*'
 '|^test_PoissonNLLLLoss_no_reduce_cpu.*'
+'|^test_strnormalizer_*.*'
+'|^test_strnorm_*.*'
 '|^test_Softsign_cpu.*'
 '|^test_operator_add_broadcast_cpu.*'
 '|^test_operator_add_size1_broadcast_cpu.*'
@@ -60,7 +63,6 @@ backend_test.exclude(r'('
 '|^test_operator_non_float_params_cpu.*'
 '|^test_operator_params_cpu.*'
 '|^test_operator_pow_cpu.*'
-'|^test_shrink_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 0a30abf374..70af4da63a 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
-  #2896c77cfc628f18b6ca6b28e3a380807fa00f53 is v1.4.1 latest
-  for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "2896c77cfc628f18b6ca6b28e3a380807fa00f53"; do
+  #873ddbbc33c6e54d90c5628387edd391fb651dfc is v1.4.1 latest
+  for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "873ddbbc33c6e54d90c5628387edd391fb651dfc"; do
     if [ -z ${lastest_onnx_version+x} ]; then
       echo "first pass";
     else