From 88ed461a9a17500b5727219f99c29121ca23a9c7 Mon Sep 17 00:00:00 2001 From: Gary Miguel Date: Thu, 26 May 2022 22:39:46 +0000 Subject: [PATCH] Update ONNX to 1.12 Fixes #11640 --- cgmanifests/generated/cgmanifest.json | 14 +++++++------- cmake/external/onnx | 2 +- js/web/docs/operators.md | 8 ++++++++ .../docker/scripts/manylinux/requirements.txt | 2 +- .../github/linux/docker/scripts/requirements.txt | 2 +- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/cgmanifests/generated/cgmanifest.json b/cgmanifests/generated/cgmanifest.json index 4f05575171e5..3943f461ab67 100644 --- a/cgmanifests/generated/cgmanifest.json +++ b/cgmanifests/generated/cgmanifest.json @@ -225,7 +225,7 @@ "type": "git", "git": { "commitHash": "db78ac1d7716f56fc9f1b030b715f872f93964e4", - "repositoryUrl": "https://github.com/nlohmann/json.git" + "repositoryUrl": "https://github.com/nlohmann/json" }, "comments": "git submodule at cmake/external/json" } @@ -265,7 +265,7 @@ "type": "git", "git": { "commitHash": "436617053d0f39a1019a371c3a9aa599b3cb2cea", - "repositoryUrl": "https://github.com/google/nsync.git" + "repositoryUrl": "https://github.com/google/nsync" }, "comments": "git submodule at cmake/external/nsync" } @@ -274,8 +274,8 @@ "component": { "type": "git", "git": { - "commitHash": "850a81b0b77786bf99ea90580242b084f86a6235", - "repositoryUrl": "https://github.com/onnx/onnx.git" + "commitHash": "f81558d4b24e910cbd05990f09e4ae78b7452560", + "repositoryUrl": "https://github.com/onnx/onnx" }, "comments": "git submodule at cmake/external/onnx" } @@ -284,7 +284,7 @@ "component": { "type": "git", "git": { - "commitHash": "e776aa0275e293707b6a0901e0e8d8a8a3679508", + "commitHash": "0d98dba29d66e93259db7daa53a9327df767a415", "repositoryUrl": "https://github.com/google/benchmark.git" }, "comments": "git submodule at cmake/external/onnx/third_party/benchmark" @@ -294,7 +294,7 @@ "component": { "type": "git", "git": { - "commitHash": "59a2ac2745d8a57ac94c6accced73620d59fb844", + "commitHash": "ffa346860b306c9bbfb341aed9c14c067751feb8", "repositoryUrl": "https://github.com/pybind/pybind11.git" }, "comments": "git submodule at cmake/external/onnx/third_party/pybind11" @@ -425,7 +425,7 @@ "type": "git", "git": { "commitHash": "e8c599bca6c56c44b6730ad93f6abbc9ecd60fc1", - "repositoryUrl": "https://github.com/microsoft/wil.git" + "repositoryUrl": "https://github.com/microsoft/wil" }, "comments": "git submodule at cmake/external/wil" } diff --git a/cmake/external/onnx b/cmake/external/onnx index 850a81b0b777..f81558d4b24e 160000 --- a/cmake/external/onnx +++ b/cmake/external/onnx @@ -1 +1 @@ -Subproject commit 850a81b0b77786bf99ea90580242b084f86a6235 +Subproject commit f81558d4b24e910cbd05990f09e4ae78b7452560 diff --git a/js/web/docs/operators.md b/js/web/docs/operators.md index 356603402259..731547ddffdc 100644 --- a/js/web/docs/operators.md +++ b/js/web/docs/operators.md @@ -23,6 +23,7 @@ See [Compatibility](../README.md#Compatibility) for a list of the supported plat | [BatchNormalization](https://github.com/onnx/onnx/blob/master/docs/Operators.md#BatchNormalization) | [7-8](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#BatchNormalization-7), [9-13](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#BatchNormalization-9), [14](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#BatchNormalization-14), [15+](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#BatchNormalization-15) | | [Bernoulli](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Bernoulli) | | | [BitShift](https://github.com/onnx/onnx/blob/master/docs/Operators.md#BitShift) | | +| [BlackmanWindow](https://github.com/onnx/onnx/blob/master/docs/Operators.md#BlackmanWindow) | | | [Cast](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Cast) | [6-8](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Cast-6), [9-12](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Cast-9), [13+](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Cast-13) | | [CastLike](https://github.com/onnx/onnx/blob/master/docs/Operators.md#CastLike) | | | [Ceil](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Ceil) | [6-12](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Ceil-6), [13+](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Ceil-13) | @@ -39,6 +40,7 @@ See [Compatibility](../README.md#Compatibility) for a list of the supported plat | [Cos](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Cos) | [7+](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Cos-7) | | [Cosh](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Cosh) | | | [CumSum](https://github.com/onnx/onnx/blob/master/docs/Operators.md#CumSum) | | +| [DFT](https://github.com/onnx/onnx/blob/master/docs/Operators.md#DFT) | | | [DepthToSpace](https://github.com/onnx/onnx/blob/master/docs/Operators.md#DepthToSpace) | [1-10](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#DepthToSpace-1), [11-12](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#DepthToSpace-11), [13+](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#DepthToSpace-13) | | [DequantizeLinear](https://github.com/onnx/onnx/blob/master/docs/Operators.md#DequantizeLinear) | | | [Det](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Det) | | @@ -65,6 +67,8 @@ See [Compatibility](../README.md#Compatibility) for a list of the supported plat | [Greater](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Greater) | [7-8](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Greater-7), [9-12](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Greater-9), [13+](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Greater-13) | | [GreaterOrEqual](https://github.com/onnx/onnx/blob/master/docs/Operators.md#GreaterOrEqual) | | | [GridSample](https://github.com/onnx/onnx/blob/master/docs/Operators.md#GridSample) | | +| [HammingWindow](https://github.com/onnx/onnx/blob/master/docs/Operators.md#HammingWindow) | | +| [HannWindow](https://github.com/onnx/onnx/blob/master/docs/Operators.md#HannWindow) | | | [HardSigmoid](https://github.com/onnx/onnx/blob/master/docs/Operators.md#HardSigmoid) | | | [HardSwish](https://github.com/onnx/onnx/blob/master/docs/Operators.md#HardSwish) | | | [Hardmax](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Hardmax) | | @@ -75,6 +79,7 @@ See [Compatibility](../README.md#Compatibility) for a list of the supported plat | [IsNaN](https://github.com/onnx/onnx/blob/master/docs/Operators.md#IsNaN) | | | [LRN](https://github.com/onnx/onnx/blob/master/docs/Operators.md#LRN) | | | [LSTM](https://github.com/onnx/onnx/blob/master/docs/Operators.md#LSTM) | | +| [LayerNormalization](https://github.com/onnx/onnx/blob/master/docs/Operators.md#LayerNormalization) | | | [LeakyRelu](https://github.com/onnx/onnx/blob/master/docs/Operators.md#LeakyRelu) | [6-15](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#LeakyRelu-6), [16+](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#LeakyRelu-16) | | [Less](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Less) | [7-8](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Less-7), [9-12](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Less-9), [13+](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Less-13) | | [LessOrEqual](https://github.com/onnx/onnx/blob/master/docs/Operators.md#LessOrEqual) | | @@ -91,6 +96,7 @@ See [Compatibility](../README.md#Compatibility) for a list of the supported plat | [MaxUnpool](https://github.com/onnx/onnx/blob/master/docs/Operators.md#MaxUnpool) | | | [Mean](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Mean) | | | [MeanVarianceNormalization](https://github.com/onnx/onnx/blob/master/docs/Operators.md#MeanVarianceNormalization) | | +| [MelWeightMatrix](https://github.com/onnx/onnx/blob/master/docs/Operators.md#MelWeightMatrix) | | | [Min](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Min) | | | [Mod](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Mod) | | | [Mul](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Mul) | [7-12](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Mul-7), [13](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Mul-13), [14+](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Mul-14) | @@ -134,6 +140,7 @@ See [Compatibility](../README.md#Compatibility) for a list of the supported plat | [ReverseSequence](https://github.com/onnx/onnx/blob/master/docs/Operators.md#ReverseSequence) | | | [RoiAlign](https://github.com/onnx/onnx/blob/master/docs/Operators.md#RoiAlign) | | | [Round](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Round) | | +| [STFT](https://github.com/onnx/onnx/blob/master/docs/Operators.md#STFT) | | | [Scan](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Scan) | | | [Scatter](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Scatter) | | | [ScatterElements](https://github.com/onnx/onnx/blob/master/docs/Operators.md#ScatterElements) | | @@ -145,6 +152,7 @@ See [Compatibility](../README.md#Compatibility) for a list of the supported plat | [SequenceErase](https://github.com/onnx/onnx/blob/master/docs/Operators.md#SequenceErase) | | | [SequenceInsert](https://github.com/onnx/onnx/blob/master/docs/Operators.md#SequenceInsert) | | | [SequenceLength](https://github.com/onnx/onnx/blob/master/docs/Operators.md#SequenceLength) | | +| [SequenceMap](https://github.com/onnx/onnx/blob/master/docs/Operators.md#SequenceMap) | | | [Shape](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Shape) | [1-12](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Shape-1), [13-14](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Shape-13), [15+](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Shape-15) | | [Shrink](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Shrink) | | | [Sigmoid](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Sigmoid) | [6-12](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Sigmoid-6), [13+](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Sigmoid-13) | diff --git a/tools/ci_build/github/linux/docker/scripts/manylinux/requirements.txt b/tools/ci_build/github/linux/docker/scripts/manylinux/requirements.txt index d06e9120017c..5f3237732fe6 100644 --- a/tools/ci_build/github/linux/docker/scripts/manylinux/requirements.txt +++ b/tools/ci_build/github/linux/docker/scripts/manylinux/requirements.txt @@ -3,7 +3,7 @@ mypy pytest setuptools>=41.4.0 wheel -git+http://github.com/onnx/onnx.git@be76ca7148396176784ba8733133b9fb1186ea0d#egg=onnx +git+http://github.com/onnx/onnx.git@f81558d4b24e910cbd05990f09e4ae78b7452560#egg=onnx protobuf==3.18.1 sympy==1.1.1 flatbuffers diff --git a/tools/ci_build/github/linux/docker/scripts/requirements.txt b/tools/ci_build/github/linux/docker/scripts/requirements.txt index c716f7262013..e9b756a22d3e 100644 --- a/tools/ci_build/github/linux/docker/scripts/requirements.txt +++ b/tools/ci_build/github/linux/docker/scripts/requirements.txt @@ -4,7 +4,7 @@ mypy pytest setuptools>=41.4.0 wheel>=0.35.1 -git+http://github.com/onnx/onnx.git@be76ca7148396176784ba8733133b9fb1186ea0d#egg=onnx +git+http://github.com/onnx/onnx.git@f81558d4b24e910cbd05990f09e4ae78b7452560#egg=onnx argparse sympy==1.1.1 flatbuffers