From 7f2d25c547c0365a34e2c87558bda9b7d3f5ac4f Mon Sep 17 00:00:00 2001
From: Aaron Bockover <abock@microsoft.com>
Date: Tue, 10 Oct 2023 21:44:07 +0000
Subject: [PATCH] [ONNX] bump onnx submodule to rel-1.15.0 (#110663)

- onnx==1.15.0rc1
- onnxscript==0.1.0.dev20231006
- ort-nightly==1.17.0.dev20231005001
Pull Request resolved: https://github.com/pytorch/pytorch/pull/110663
Approved by: https://github.com/ezyang, https://github.com/thiagocrepaldi
---
 .ci/docker/common/install_onnx.sh |  8 ++++----
 third_party/onnx                  |  2 +-
 third_party/onnx.BUILD            | 23 ++---------------------
 3 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/.ci/docker/common/install_onnx.sh b/.ci/docker/common/install_onnx.sh
index fdbccd6cd9f3..6a1ccd57c11d 100755
--- a/.ci/docker/common/install_onnx.sh
+++ b/.ci/docker/common/install_onnx.sh
@@ -16,7 +16,7 @@ pip_install \
   mock==5.0.1 \
   ninja==1.10.2 \
   networkx==2.0 \
-  numpy==1.22.4
+  numpy==1.24.2
 
 # ONNXRuntime should be installed before installing
 # onnx-weekly. Otherwise, onnx-weekly could be
@@ -29,10 +29,10 @@ pip_install \
   transformers==4.32.1
 
 pip_install coloredlogs packaging
-retry pip_install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT-Nightly/pypi/simple/ --no-cache-dir --no-input ort-nightly==1.16.0.dev20230912006
+retry pip_install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT-Nightly/pypi/simple/ --no-cache-dir --no-input ort-nightly==1.17.0.dev20231005006
 
-pip_install onnx==1.14.1
-pip_install onnxscript==0.1.0.dev20230912 --no-deps
+pip_install -i https://test.pypi.org/simple/ onnx==1.15.0rc1
+pip_install onnxscript==0.1.0.dev20231006 --no-deps
 
 # Cache the transformers model to be used later by ONNX tests. We need to run the transformers
 # package to download the model. By default, the model is cached at ~/.cache/huggingface/hub/
diff --git a/third_party/onnx b/third_party/onnx
index 1014f41f17ec..0c296085f9f6 160000
--- a/third_party/onnx
+++ b/third_party/onnx
@@ -1 +1 @@
-Subproject commit 1014f41f17ecc778d63e760a994579d96ba471ff
+Subproject commit 0c296085f9f65f0f8ef7aec7b9eed55faf37dc40
diff --git a/third_party/onnx.BUILD b/third_party/onnx.BUILD
index e6aa9642a2a0..c4134e98d0fe 100644
--- a/third_party/onnx.BUILD
+++ b/third_party/onnx.BUILD
@@ -48,22 +48,7 @@ cc_library(
         [
             "onnx/*.cc",
             "onnx/common/*.cc",
-            "onnx/defs/*.cc",
-            "onnx/defs/controlflow/*.cc",
-            "onnx/defs/experiments/*.cc",
-            "onnx/defs/generator/*.cc",
-            "onnx/defs/logical/*.cc",
-            "onnx/defs/math/*.cc",
-            "onnx/defs/nn/*.cc",
-            "onnx/defs/object_detection/*.cc",
-            "onnx/defs/optional/*.cc",
-            "onnx/defs/quantization/*.cc",
-            "onnx/defs/reduction/*.cc",
-            "onnx/defs/rnn/*.cc",
-            "onnx/defs/sequence/*.cc",
-            "onnx/defs/tensor/*.cc",
-            "onnx/defs/traditionalml/*.cc",
-            "onnx/defs/training/defs.cc",
+            "onnx/defs/**/*.cc",
             "onnx/shape_inference/*.cc",
             "onnx/version_converter/*.cc",
         ],
@@ -75,11 +60,7 @@ cc_library(
         "onnx/*.h",
         "onnx/version_converter/*.h",
         "onnx/common/*.h",
-        "onnx/defs/*.h",
-        "onnx/defs/math/*.h",
-        "onnx/defs/controlflow/*.h",
-        "onnx/defs/reduction/*.h",
-        "onnx/defs/tensor/*.h",
+        "onnx/defs/**/*.h",
         "onnx/shape_inference/*.h",
         "onnx/version_converter/adapters/*.h",
     ]) + [