From 638398e6757623d97c3d7e31a9fd64f3166ba44e Mon Sep 17 00:00:00 2001
From: Ke Zhang <kezhan@microsoft.com>
Date: Fri, 19 Jul 2019 13:19:09 -0700
Subject: [PATCH] sync onnx to get equal op with float support (#1432)

* sync onnx to get equal op with float support

* doc update

* fix test failure because of updated shape inference logic for roialign.

* filter consum test cases since it's not implemented yet.
---
 cgmanifest.json                                           | 2 +-
 cmake/external/onnx                                       | 2 +-
 .../test/providers/cpu/object_detection/roialign_test.cc  | 4 ++--
 onnxruntime/test/python/onnx_backend_test_series.py       | 8 +++++++-
 .../ci_build/github/linux/docker/scripts/install_onnx.sh  | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/cgmanifest.json b/cgmanifest.json
index d58baf95e4..2fd8a43254 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -49,7 +49,7 @@
          "component":{
             "type":"git",
             "git": {
-              "commitHash": "d94f99d21a9a0820d58966410ceaf525132f85f1",
+              "commitHash": "65b8e0f9979fbade16e3becbdfa69c0764946f72",
               "repositoryUrl": "https://github.com/onnx/onnx.git"
             }
          }
diff --git a/cmake/external/onnx b/cmake/external/onnx
index d94f99d21a..65b8e0f997 160000
--- a/cmake/external/onnx
+++ b/cmake/external/onnx
@@ -1 +1 @@
-Subproject commit d94f99d21a9a0820d58966410ceaf525132f85f1
+Subproject commit 65b8e0f9979fbade16e3becbdfa69c0764946f72
diff --git a/onnxruntime/test/providers/cpu/object_detection/roialign_test.cc b/onnxruntime/test/providers/cpu/object_detection/roialign_test.cc
index 250cc629c8..0c2660b7a0 100644
--- a/onnxruntime/test/providers/cpu/object_detection/roialign_test.cc
+++ b/onnxruntime/test/providers/cpu/object_detection/roialign_test.cc
@@ -258,7 +258,7 @@ TEST(RoiAlignTest, AvgModeNegativeInvalidNumRoiDims) {
                                          35.1354f,56.7708f,56.7708f,56.7708f,56.8021f,58.4375f,58.4375f,58.4375f,58.4688f,60.1042f,
                                          60.1042f,60.1042f,60.1354f});
 
-  test.Run(OpTester::ExpectResult::kExpectFailure, "[ShapeInferenceError] rois input tensor has wrong dimension");
+  test.Run(OpTester::ExpectResult::kExpectFailure, "[ShapeInferenceError] Input 1 expected to have rank 2 but has rank 3");
 }
 
 TEST(RoiAlignTest, AvgModeNegativeInvalidSecondRoiDims) {
@@ -341,7 +341,7 @@ TEST(RoiAlignTest, MismatchNumRois) {
                                          35.1354f,56.7708f,56.7708f,56.7708f,56.8021f,58.4375f,58.4375f,58.4375f,58.4688f,60.1042f,
                                          60.1042f,60.1042f,60.1354f});
 
-  test.Run(OpTester::ExpectResult::kExpectFailure, "First dimension (num_rois) of batch_indices and rois don't match");
+  test.Run(OpTester::ExpectResult::kExpectFailure, "[ShapeInferenceError] Dimension mismatch in unification between 4 and 5");
 }
 }  // namespace test
 }  // namespace onnxruntime
diff --git a/onnxruntime/test/python/onnx_backend_test_series.py b/onnxruntime/test/python/onnx_backend_test_series.py
index ae977e57b6..703a879fdc 100644
--- a/onnxruntime/test/python/onnx_backend_test_series.py
+++ b/onnxruntime/test/python/onnx_backend_test_series.py
@@ -103,7 +103,13 @@ def create_backend_test(testname=None):
                                  '^test_bitshift_left_uint32_cpu.*',
                                  '^test_bitshift_left_uint64_cpu.*',
                                  '^test_bitshift_left_uint8_cpu.*',
-                                 '^test_round_cpu.*'
+                                 '^test_round_cpu.*',
+                                 '^test_cumsum_1d_cpu.*',
+                                 '^test_cumsum_1d_exclusive_cpu.*',
+                                 '^test_cumsum_1d_reverse_cpu.*',
+                                 '^test_cumsum_1d_reverse_exclusive_cpu.*',
+                                 '^test_cumsum_2d_axis_0_cpu.*',
+                                 '^test_cumsum_2d_axis_1_cpu.*'
                                  )
 
         # Example of how to disable tests for a specific provider.
diff --git a/tools/ci_build/github/linux/docker/scripts/install_onnx.sh b/tools/ci_build/github/linux/docker/scripts/install_onnx.sh
index 36fb7fec10..a8495aff3a 100755
--- a/tools/ci_build/github/linux/docker/scripts/install_onnx.sh
+++ b/tools/ci_build/github/linux/docker/scripts/install_onnx.sh
@@ -13,7 +13,7 @@ version2tag=(5af210ca8a1c73aa6bae8754c9346ec54d0a756e-onnx123
              bae6333e149a59a3faa9c4d9c44974373dcf5256-onnx130
              9e55ace55aad1ada27516038dfbdc66a8a0763db-onnx141
              7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef-onnx150
-             d94f99d21a9a0820d58966410ceaf525132f85f1-onnxtip)
+             65b8e0f9979fbade16e3becbdfa69c0764946f72-onnxtip)
 for v2t in ${version2tag[*]}; do
   onnx_version="$(cut -d'-' -f1<<<${v2t})"
   onnx_tag="$(cut -d'-' -f2<<<${v2t})"