From 70a31e047a79882ed45f22f142e537eaada8bccd Mon Sep 17 00:00:00 2001 From: Chun-Wei Chen Date: Thu, 2 Mar 2023 14:57:35 -0800 Subject: [PATCH] Consume ONNX 1.13.1 in ONNX Runtime (#14812) ### Description Consume ONNX 1.13.1 in ONNX Runtime. (ONNX 1.13.0 to ONNX 1.13.1) ### Motivation and Context ONNX 1.13.1 patch was just released yesterday. This PR is making ORT's ONNX submodule consistent with the latest released ONNX. Not sure whether this PR is really needed, but let me make it ready. Previous PR for testing ONNX 1.13.1rc2 : https://github.com/microsoft/onnxruntime/pull/14634. Fixed [AB#13174](https://aiinfra.visualstudio.com/6a833879-cd9b-44a4-a9de-adc2d818f13c/_workitems/edit/13174) . --- cgmanifests/generated/cgmanifest.json | 2 +- cmake/deps.txt | 2 +- .../test/testdata/onnx_backend_test_series_filters.jsonc | 2 +- .../github/azure-pipelines/templates/download-deps.yml | 4 ++-- .../github/linux/docker/scripts/manylinux/requirements.txt | 2 +- tools/ci_build/github/linux/docker/scripts/requirements.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cgmanifests/generated/cgmanifest.json b/cgmanifests/generated/cgmanifest.json index cf89f37758..953a1948d2 100644 --- a/cgmanifests/generated/cgmanifest.json +++ b/cgmanifests/generated/cgmanifest.json @@ -302,7 +302,7 @@ "component": { "type": "git", "git": { - "commitHash": "1ba785612a79fe749aa1e478336e534743372639", + "commitHash": "ad834eb73ee0cd9b6fa9ea892caeed5fa17d7dc0", "repositoryUrl": "https://github.com/onnx/onnx.git" }, "comments": "onnx" diff --git a/cmake/deps.txt b/cmake/deps.txt index dcf0294d2c..9d91eb97d2 100644 --- a/cmake/deps.txt +++ b/cmake/deps.txt @@ -23,7 +23,7 @@ microsoft_gsl;https://github.com/microsoft/GSL/archive/refs/tags/v4.0.0.zip;cf36 microsoft_wil;https://github.com/microsoft/wil/archive/5f4caba4e7a9017816e47becdd918fcc872039ba.zip;fd119887d0d17c37adf1fc227b054befa28158ad mimalloc;https://github.com/microsoft/mimalloc/archive/refs/tags/v2.0.3.zip;e4f37b93b2da78a5816c2495603a4188d316214b mp11;https://github.com/boostorg/mp11/archive/refs/tags/boost-1.79.0.zip;c8f04e378535ededbe5af52c8f969d2dedbe73d5 -onnx;https://github.com/onnx/onnx/archive/refs/tags/v1.13.0.zip;8dda5079cdb5a134b08b0c73f4592a6404fc2dc6 +onnx;https://github.com/onnx/onnx/archive/refs/tags/v1.13.1.zip;7a2517d3e7442109d540de2c86f29cd76d34cf28 #use the commit where it's several commits after 8.5-GA branch (https://github.com/onnx/onnx-tensorrt/commit/369d6676423c2a6dbf4a5665c4b5010240d99d3c) onnx_tensorrt;https://github.com/onnx/onnx-tensorrt/archive/369d6676423c2a6dbf4a5665c4b5010240d99d3c.zip;62119892edfb78689061790140c439b111491275 protobuf;https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.20.2.zip;9f71dad95fb83438e88822a9969fc93773fd8c48 diff --git a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc index 7a9f09c185..d64dbfb7d2 100644 --- a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc +++ b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc @@ -133,7 +133,7 @@ "^test_softplus_example_expanded_cuda", "^test_softplus_expanded_cuda", - // TODO: Recover these real model tests from onnx + // TODO(https://github.com/onnx/onnx/issues/4885): remove these tests after they are deprecated in onnx "^test_vgg19", "^test_zfnet512", "^test_bvlc_alexnet", diff --git a/tools/ci_build/github/azure-pipelines/templates/download-deps.yml b/tools/ci_build/github/azure-pipelines/templates/download-deps.yml index 0a414440e6..f5e35a3899 100644 --- a/tools/ci_build/github/azure-pipelines/templates/download-deps.yml +++ b/tools/ci_build/github/azure-pipelines/templates/download-deps.yml @@ -11,7 +11,7 @@ steps: packageType: upack feed: '/7424c8e4-5c62-490e-95c4-79446f31017c' definition: '517c4f6f-5437-4392-a70d-4f15ec5be2f0' - version: 1.0.31 + version: 1.0.32 downloadPath: $(Build.BinariesDirectory)/deps # The private ADO project @@ -22,7 +22,7 @@ steps: packageType: upack feed: '/4c7631f5-24c0-4307-8822-1aa8f180c325' definition: 'fd9dd5ad-b73e-4678-890e-edcf680dbc1a' - version: 1.0.31 + version: 1.0.32 downloadPath: $(Build.BinariesDirectory)/deps # You can add more ADO accounts at here. 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 cc0513c270..12f6207aa0 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 -onnx==1.13.0 +onnx==1.13.1 protobuf==3.20.2 sympy==1.10.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 813b97d6c8..6a52358d22 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 -onnx==1.13.0 +onnx==1.13.1 argparse sympy==1.10.1 flatbuffers