From fcb74b8c729127ec9e14777d68a37fde43a375c2 Mon Sep 17 00:00:00 2001 From: Liqun Fu Date: Thu, 12 Oct 2023 11:34:45 -0700 Subject: [PATCH 01/10] to use onnx 1.15.0rc1 Signed-off-by: Liqun Fu --- cmake/deps.txt | 2 +- .../github/azure-pipelines/templates/download-deps.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/deps.txt b/cmake/deps.txt index 7cf49f02333a4..cdc242287cf22 100644 --- a/cmake/deps.txt +++ b/cmake/deps.txt @@ -24,7 +24,7 @@ microsoft_gsl;https://github.com/microsoft/GSL/archive/refs/tags/v4.0.0.zip;cf36 microsoft_wil;https://github.com/microsoft/wil/archive/refs/tags/v1.0.230629.1.zip;e4a542a323c070376f7c2d1973d0f7ddbc1d2fa5 mimalloc;https://github.com/microsoft/mimalloc/archive/refs/tags/v2.1.1.zip;d5ee7d34223d0567892db5179849939c8769dc41 mp11;https://github.com/boostorg/mp11/archive/refs/tags/boost-1.82.0.zip;9bc9e01dffb64d9e0773b2e44d2f22c51aace063 -onnx;https://github.com/onnx/onnx/archive/14303de049144035dfd94ace5f7a3b44773b1aad.zip;250eab9690392b248d75b56e605fb49eca373442 +onnx;https://github.com/onnx/onnx/archive/0c296085f9f65f0f8ef7aec7b9eed55faf37dc40.zip;01ca9e955a03a9183e3d278e96f975f1a762cef1 #use the commit of supporting all the plugins and TRT 8.6-GA (https://github.com/onnx/onnx-tensorrt/commit/0462dc31ae78f48744b6141ae376df1f96d3f459) onnx_tensorrt;https://github.com/onnx/onnx-tensorrt/archive/0462dc31ae78f48744b6141ae376df1f96d3f459.zip;5ff086361956cceb81ed17453a1fd8db2aa4328d protobuf;https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.12.zip;7cf2733949036c7d52fda017badcab093fe73bfa 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 cf73691a5eecc..d3c47d25ce380 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.90 + version: 1.0.94 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.90 + version: 1.0.94 downloadPath: $(Build.BinariesDirectory)/deps # You can add more ADO accounts at here. From 1b696b26dae1305670ef950a62eb17a3967ed3e4 Mon Sep 17 00:00:00 2001 From: Liqun Fu Date: Thu, 12 Oct 2023 12:00:37 -0700 Subject: [PATCH 02/10] update external/onnx and cgmanifest.json Signed-off-by: Liqun Fu --- cgmanifests/generated/cgmanifest.json | 40 ++++++++++++++++++++------- cmake/external/onnx | 2 +- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/cgmanifests/generated/cgmanifest.json b/cgmanifests/generated/cgmanifest.json index 08ca90d7c3b7f..da7993cab853d 100644 --- a/cgmanifests/generated/cgmanifest.json +++ b/cgmanifests/generated/cgmanifest.json @@ -2,6 +2,36 @@ "$schema": "https://json.schemastore.org/component-detection-manifest.json", "Version": 1, "Registrations": [ + { + "component": { + "type": "git", + "git": { + "commitHash": "a896e3d066448b3530dbcaa48869fafefd738f57", + "repositoryUrl": "https://github.com/emscripten-core/emsdk.git" + }, + "comments": "git submodule at cmake/external/emsdk" + } + }, + { + "component": { + "type": "git", + "git": { + "commitHash": "7a2ed51a6b682a83e345ff49fc4cfd7ca47550db", + "repositoryUrl": "https://github.com/google/libprotobuf-mutator.git" + }, + "comments": "git submodule at cmake/external/libprotobuf-mutator" + } + }, + { + "component": { + "type": "git", + "git": { + "commitHash": "0c296085f9f65f0f8ef7aec7b9eed55faf37dc40", + "repositoryUrl": "https://github.com/onnx/onnx.git" + }, + "comments": "git submodule at cmake/external/onnx" + } + }, { "component": { "type": "git", @@ -162,16 +192,6 @@ "comments": "mp11" } }, - { - "component": { - "type": "git", - "git": { - "commitHash": "fdefbe85ed9c362b95b9b401cd19db068a76141f", - "repositoryUrl": "https://github.com/onnx/onnx.git" - }, - "comments": "onnx" - } - }, { "component": { "type": "git", diff --git a/cmake/external/onnx b/cmake/external/onnx index e2525550194ce..0c296085f9f65 160000 --- a/cmake/external/onnx +++ b/cmake/external/onnx @@ -1 +1 @@ -Subproject commit e2525550194ce3d8a2c4a3af451c9d9b3ae6650e +Subproject commit 0c296085f9f65f0f8ef7aec7b9eed55faf37dc40 From b81227cdca293caa5949466218f81c0954b02833 Mon Sep 17 00:00:00 2001 From: Liqun Fu Date: Thu, 12 Oct 2023 12:37:03 -0700 Subject: [PATCH 03/10] update js doc Signed-off-by: Liqun Fu --- js/web/docs/webgl-operators.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/js/web/docs/webgl-operators.md b/js/web/docs/webgl-operators.md index de84134ddbb3f..7c129b66bfa3d 100644 --- a/js/web/docs/webgl-operators.md +++ b/js/web/docs/webgl-operators.md @@ -12,6 +12,7 @@ See [Compatibility](../README.md#Compatibility) for a list of the supported plat | [Acos](https://github.com/onnx/onnx/blob/main/docs/Operators.md#Acos) | [7+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Acos-7) | | [Acosh](https://github.com/onnx/onnx/blob/main/docs/Operators.md#Acosh) | | | [Add](https://github.com/onnx/onnx/blob/main/docs/Operators.md#Add) | [7-12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Add-7), [13](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Add-13), [14+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Add-14) | +| [AffineGrid](https://github.com/onnx/onnx/blob/main/docs/Operators.md#AffineGrid) | | | [And](https://github.com/onnx/onnx/blob/main/docs/Operators.md#And) | [7+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#And-7) | | [ArgMax](https://github.com/onnx/onnx/blob/main/docs/Operators.md#ArgMax) | | | [ArgMin](https://github.com/onnx/onnx/blob/main/docs/Operators.md#ArgMin) | | @@ -67,6 +68,7 @@ See [Compatibility](../README.md#Compatibility) for a list of the supported plat | [Gather](https://github.com/onnx/onnx/blob/main/docs/Operators.md#Gather) | [1-10](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Gather-1), [11-12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Gather-11), [13+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Gather-13) | | [GatherElements](https://github.com/onnx/onnx/blob/main/docs/Operators.md#GatherElements) | | | [GatherND](https://github.com/onnx/onnx/blob/main/docs/Operators.md#GatherND) | | +| [Gelu](https://github.com/onnx/onnx/blob/main/docs/Operators.md#Gelu) | | | [Gemm](https://github.com/onnx/onnx/blob/main/docs/Operators.md#Gemm) | [7-8](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Gemm-7), [9-10](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Gemm-9), [11-12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Gemm-11), [13+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Gemm-13) | | [GlobalAveragePool](https://github.com/onnx/onnx/blob/main/docs/Operators.md#GlobalAveragePool) | [1+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#GlobalAveragePool-1) | | [GlobalLpPool](https://github.com/onnx/onnx/blob/main/docs/Operators.md#GlobalLpPool) | | @@ -82,6 +84,7 @@ See [Compatibility](../README.md#Compatibility) for a list of the supported plat | [Hardmax](https://github.com/onnx/onnx/blob/main/docs/Operators.md#Hardmax) | | | [Identity](https://github.com/onnx/onnx/blob/main/docs/Operators.md#Identity) | [1-12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Identity-1), [13](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Identity-13), [14-15](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Identity-14), [16-18](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Identity-16), [19+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Identity-19) | | [If](https://github.com/onnx/onnx/blob/main/docs/Operators.md#If) | | +| [ImageDecoder](https://github.com/onnx/onnx/blob/main/docs/Operators.md#ImageDecoder) | | | [InstanceNormalization](https://github.com/onnx/onnx/blob/main/docs/Operators.md#InstanceNormalization) | [6+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#InstanceNormalization-6) | | [IsInf](https://github.com/onnx/onnx/blob/main/docs/Operators.md#IsInf) | | | [IsNaN](https://github.com/onnx/onnx/blob/main/docs/Operators.md#IsNaN) | | @@ -137,12 +140,13 @@ See [Compatibility](../README.md#Compatibility) for a list of the supported plat | [ReduceL2](https://github.com/onnx/onnx/blob/main/docs/Operators.md#ReduceL2) | | | [ReduceLogSum](https://github.com/onnx/onnx/blob/main/docs/Operators.md#ReduceLogSum) | [1-10](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceLogSum-1), [11-12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceLogSum-11), [13-17](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceLogSum-13), [18+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceLogSum-18) | | [ReduceLogSumExp](https://github.com/onnx/onnx/blob/main/docs/Operators.md#ReduceLogSumExp) | | -| [ReduceMax](https://github.com/onnx/onnx/blob/main/docs/Operators.md#ReduceMax) | [1-10](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMax-1), [11](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMax-11), [12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMax-12), [13-17](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMax-13), [18+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMax-18) | +| [ReduceMax](https://github.com/onnx/onnx/blob/main/docs/Operators.md#ReduceMax) | [1-10](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMax-1), [11](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMax-11), [12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMax-12), [13-17](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMax-13), [18-19](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMax-18), [20+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMax-20) | | [ReduceMean](https://github.com/onnx/onnx/blob/main/docs/Operators.md#ReduceMean) | [1-10](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMean-1), [11-12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMean-11), [13-17](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMean-13), [18+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMean-18) | -| [ReduceMin](https://github.com/onnx/onnx/blob/main/docs/Operators.md#ReduceMin) | [1-10](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMin-1), [11](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMin-11), [12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMin-12), [13-17](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMin-13), [18+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMin-18) | +| [ReduceMin](https://github.com/onnx/onnx/blob/main/docs/Operators.md#ReduceMin) | [1-10](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMin-1), [11](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMin-11), [12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMin-12), [13-17](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMin-13), [18-19](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMin-18), [20+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceMin-20) | | [ReduceProd](https://github.com/onnx/onnx/blob/main/docs/Operators.md#ReduceProd) | [1-10](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceProd-1), [11-12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceProd-11), [13-17](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceProd-13), [18+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceProd-18) | | [ReduceSum](https://github.com/onnx/onnx/blob/main/docs/Operators.md#ReduceSum) | [1-10](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceSum-1), [11-12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceSum-11) | | [ReduceSumSquare](https://github.com/onnx/onnx/blob/main/docs/Operators.md#ReduceSumSquare) | [1-10](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceSumSquare-1), [11-12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceSumSquare-11), [13-17](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceSumSquare-13), [18+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#ReduceSumSquare-18) | +| [RegexFullMatch](https://github.com/onnx/onnx/blob/main/docs/Operators.md#RegexFullMatch) | | | [Relu](https://github.com/onnx/onnx/blob/main/docs/Operators.md#Relu) | [6-12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Relu-6), [13](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Relu-13), [14+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Relu-14) | | [Reshape](https://github.com/onnx/onnx/blob/main/docs/Operators.md#Reshape) | [5-12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Reshape-5), [13](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Reshape-13), [14-18](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Reshape-14), [19+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Reshape-19) | | [Resize](https://github.com/onnx/onnx/blob/main/docs/Operators.md#Resize) | [10](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Resize-10), [11-12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Resize-11), [13-17](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Resize-13), [18](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Resize-18), [19+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Resize-19) | @@ -179,7 +183,9 @@ See [Compatibility](../README.md#Compatibility) for a list of the supported plat | [SplitToSequence](https://github.com/onnx/onnx/blob/main/docs/Operators.md#SplitToSequence) | | | [Sqrt](https://github.com/onnx/onnx/blob/main/docs/Operators.md#Sqrt) | [6-12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Sqrt-6), [13+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Sqrt-13) | | [Squeeze](https://github.com/onnx/onnx/blob/main/docs/Operators.md#Squeeze) | [1-10](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Squeeze-1), [11-12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Squeeze-11), [13+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Squeeze-13) | +| [StringConcat](https://github.com/onnx/onnx/blob/main/docs/Operators.md#StringConcat) | | | [StringNormalizer](https://github.com/onnx/onnx/blob/main/docs/Operators.md#StringNormalizer) | | +| [StringSplit](https://github.com/onnx/onnx/blob/main/docs/Operators.md#StringSplit) | | | [Sub](https://github.com/onnx/onnx/blob/main/docs/Operators.md#Sub) | [7-12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Sub-7), [13](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Sub-13), [14+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Sub-14) | | [Sum](https://github.com/onnx/onnx/blob/main/docs/Operators.md#Sum) | [6-7](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Sum-6), [8-12](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Sum-8), [13+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Sum-13) | | [Tan](https://github.com/onnx/onnx/blob/main/docs/Operators.md#Tan) | [7+](https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Tan-7) | From 6e91d46f6f3f33679574927fd6819acbac6206dc Mon Sep 17 00:00:00 2001 From: Liqun Fu Date: Thu, 12 Oct 2023 14:17:52 -0700 Subject: [PATCH 04/10] skip tests new in rc1 Signed-off-by: Liqun Fu --- onnxruntime/test/onnx/TestCase.cc | 3 +++ .../onnx_backend_test_series_filters.jsonc | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/onnxruntime/test/onnx/TestCase.cc b/onnxruntime/test/onnx/TestCase.cc index cb9633ff049a5..9f34b1ac86186 100644 --- a/onnxruntime/test/onnx/TestCase.cc +++ b/onnxruntime/test/onnx/TestCase.cc @@ -1338,7 +1338,10 @@ std::unique_ptr> GetBrokenTests(const std::string& provider broken_tests->insert({"sce_sum_log_prob_expanded", "result differs"}); broken_tests->insert({"gridsample_reflection_padding", "result differs"}); broken_tests->insert({"spacetodepth", "result differs"}); + broken_tests->insert({"gridsample_volumetric_nearest_align_corners_0", "result differs"}); + broken_tests->insert({"gridsample_volumetric_nearest_align_corners_1", "result differs"}); } + #ifdef DISABLE_CONTRIB_OPS broken_tests->insert({"coreml_SqueezeNet_ImageNet", "This model uses contrib ops."}); broken_tests->insert({"keras2coreml_Permute_ImageNet", "This model uses contrib ops."}); diff --git a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc index c142106ed506c..a9cf4ad3b5ba5 100644 --- a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc +++ b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc @@ -290,7 +290,19 @@ "^test_isnan", "^test_isnan_float16", "^test_reduce_max_bool_inputs", - "^test_reduce_min_bool_inputs" + "^test_reduce_min_bool_inputs", + "^test_reduce_min_empty_set", + "^test_reduce_l1_empty_set", + "^test_reduce_l1_empty_set_expanded", + "^test_reduce_l2_empty_set", + "^test_reduce_l2_empty_set_expanded", + "^test_reduce_log_sum_empty_set", + "^test_reduce_log_sum_empty_set_expanded", + "^test_reduce_log_sum_exp_empty_set", + "^test_reduce_log_sum_exp_empty_set_expanded", + "^test_reduce_prod_empty_set", + "^test_reduce_sum_square_empty_set", + "^test_reduce_sum_square_empty_set_expanded" ], "current_failing_tests_x86": [ "^test_vgg19", From e5d550d75102e45a6022ec7bebd7bf47c1cad53d Mon Sep 17 00:00:00 2001 From: Liqun Fu Date: Thu, 12 Oct 2023 21:21:56 -0700 Subject: [PATCH 05/10] skip reduce_empty_set tests Signed-off-by: Liqun Fu --- onnxruntime/test/onnx/TestCase.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/onnxruntime/test/onnx/TestCase.cc b/onnxruntime/test/onnx/TestCase.cc index 9f34b1ac86186..525e01623f1e3 100644 --- a/onnxruntime/test/onnx/TestCase.cc +++ b/onnxruntime/test/onnx/TestCase.cc @@ -1340,6 +1340,17 @@ std::unique_ptr> GetBrokenTests(const std::string& provider broken_tests->insert({"spacetodepth", "result differs"}); broken_tests->insert({"gridsample_volumetric_nearest_align_corners_0", "result differs"}); broken_tests->insert({"gridsample_volumetric_nearest_align_corners_1", "result differs"}); + broken_tests->insert({"reduce_l1_empty_set", "unknown version"}); + broken_tests->insert({"reduce_l1_empty_set_expanded", "unknown version"}); + broken_tests->insert({"reduce_l2_empty_set", "unknown version"}); + broken_tests->insert({"reduce_l2_empty_set_expanded", "unknown version"}); + broken_tests->insert({"reduce_log_sum_empty_set", "unknown version"}); + broken_tests->insert({"reduce_log_sum_empty_set_expanded", "unknown version"}); + broken_tests->insert({"reduce_log_sum_exp_empty_set", "unknown version"}); + broken_tests->insert({"reduce_log_sum_exp_empty_set_expanded", "unknown version"}); + broken_tests->insert({"reduce_prod_empty_set", "unknown version"}); + broken_tests->insert({"reduce_sum_square_empty_set", "unknown version"}); + broken_tests->insert({"reduce_sum_square_empty_set_expanded", "unknown version"}); } #ifdef DISABLE_CONTRIB_OPS From 93838657de4b6c91b2c07d53ff9f82abdf204ef4 Mon Sep 17 00:00:00 2001 From: Liqun Fu Date: Fri, 13 Oct 2023 08:13:00 -0700 Subject: [PATCH 06/10] brocken tests Signed-off-by: Liqun Fu --- onnxruntime/test/onnx/TestCase.cc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/onnxruntime/test/onnx/TestCase.cc b/onnxruntime/test/onnx/TestCase.cc index 525e01623f1e3..efb506f8b0a94 100644 --- a/onnxruntime/test/onnx/TestCase.cc +++ b/onnxruntime/test/onnx/TestCase.cc @@ -944,6 +944,19 @@ std::unique_ptr> GetBrokenTests(const std::string& provider {"simple_rnn_batchwise", "type error", {}}, {"mod_float_mixed_sign_example", "fmod attribute must be true for floating point types", {}}, {"col2im_pads", "result mismatch", {"opset18"}}, + {"gridsample_volumetric_nearest_align_corners_0", "result differs", {}}, + {"gridsample_volumetric_nearest_align_corners_1", "result differs", {}}, + {"reduce_l1_empty_set", "unknown version", {}}, + {"reduce_l1_empty_set_expanded", "unknown version", {}}, + {"reduce_l2_empty_set", "unknown version", {}}, + {"reduce_l2_empty_set_expanded", "unknown version", {}}, + {"reduce_log_sum_empty_set", "unknown version", {}}, + {"reduce_log_sum_empty_set_expanded", "unknown version", {}}, + {"reduce_log_sum_exp_empty_set", "unknown version", {}}, + {"reduce_log_sum_exp_empty_set_expanded", "unknown version", {}}, + {"reduce_prod_empty_set", "unknown version", {}}, + {"reduce_sum_square_empty_set", "unknown version", {}}, + {"reduce_sum_square_empty_set_expanded", "unknown version", {}}, #ifdef ENABLE_TRAINING_CORE {"adagrad", "not a registered function/op", {}}, // Op not registered. {"adagrad_multiple", "not a registered function/op", {}}, // Op not registered. @@ -1338,19 +1351,6 @@ std::unique_ptr> GetBrokenTests(const std::string& provider broken_tests->insert({"sce_sum_log_prob_expanded", "result differs"}); broken_tests->insert({"gridsample_reflection_padding", "result differs"}); broken_tests->insert({"spacetodepth", "result differs"}); - broken_tests->insert({"gridsample_volumetric_nearest_align_corners_0", "result differs"}); - broken_tests->insert({"gridsample_volumetric_nearest_align_corners_1", "result differs"}); - broken_tests->insert({"reduce_l1_empty_set", "unknown version"}); - broken_tests->insert({"reduce_l1_empty_set_expanded", "unknown version"}); - broken_tests->insert({"reduce_l2_empty_set", "unknown version"}); - broken_tests->insert({"reduce_l2_empty_set_expanded", "unknown version"}); - broken_tests->insert({"reduce_log_sum_empty_set", "unknown version"}); - broken_tests->insert({"reduce_log_sum_empty_set_expanded", "unknown version"}); - broken_tests->insert({"reduce_log_sum_exp_empty_set", "unknown version"}); - broken_tests->insert({"reduce_log_sum_exp_empty_set_expanded", "unknown version"}); - broken_tests->insert({"reduce_prod_empty_set", "unknown version"}); - broken_tests->insert({"reduce_sum_square_empty_set", "unknown version"}); - broken_tests->insert({"reduce_sum_square_empty_set_expanded", "unknown version"}); } #ifdef DISABLE_CONTRIB_OPS From 00ec58daf1d1fcc68fe01fbca206f404423873ca Mon Sep 17 00:00:00 2001 From: Liqun Fu Date: Wed, 18 Oct 2023 11:37:01 -0700 Subject: [PATCH 07/10] use onnx 1.15.0rc2 Signed-off-by: Liqun Fu --- cmake/deps.txt | 2 +- .../github/azure-pipelines/templates/download-deps.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/deps.txt b/cmake/deps.txt index cdc242287cf22..26fd35075c4b9 100644 --- a/cmake/deps.txt +++ b/cmake/deps.txt @@ -24,7 +24,7 @@ microsoft_gsl;https://github.com/microsoft/GSL/archive/refs/tags/v4.0.0.zip;cf36 microsoft_wil;https://github.com/microsoft/wil/archive/refs/tags/v1.0.230629.1.zip;e4a542a323c070376f7c2d1973d0f7ddbc1d2fa5 mimalloc;https://github.com/microsoft/mimalloc/archive/refs/tags/v2.1.1.zip;d5ee7d34223d0567892db5179849939c8769dc41 mp11;https://github.com/boostorg/mp11/archive/refs/tags/boost-1.82.0.zip;9bc9e01dffb64d9e0773b2e44d2f22c51aace063 -onnx;https://github.com/onnx/onnx/archive/0c296085f9f65f0f8ef7aec7b9eed55faf37dc40.zip;01ca9e955a03a9183e3d278e96f975f1a762cef1 +onnx;https://github.com/onnx/onnx/archive/6a20ba82b439ea1fd650da4d389e96b60a1dd828.zip;179a22ad4cd67109c60031ae4b6cf2f434d8bd7e #use the commit of supporting all the plugins and TRT 8.6-GA (https://github.com/onnx/onnx-tensorrt/commit/0462dc31ae78f48744b6141ae376df1f96d3f459) onnx_tensorrt;https://github.com/onnx/onnx-tensorrt/archive/0462dc31ae78f48744b6141ae376df1f96d3f459.zip;5ff086361956cceb81ed17453a1fd8db2aa4328d protobuf;https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.12.zip;7cf2733949036c7d52fda017badcab093fe73bfa 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 d3c47d25ce380..9ca4a45ffcec4 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.94 + version: 1.0.95 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.94 + version: 1.0.95 downloadPath: $(Build.BinariesDirectory)/deps # You can add more ADO accounts at here. From 08d5b06798a6c586197a8d05489b629dbb239aa3 Mon Sep 17 00:00:00 2001 From: Liqun Fu Date: Wed, 18 Oct 2023 12:51:27 -0700 Subject: [PATCH 08/10] skip test_reduce_sum_empty_set and test_reduce_sum_empty_set_non_reduced_axis_zero Signed-off-by: Liqun Fu --- .../test/testdata/onnx_backend_test_series_filters.jsonc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc index a9cf4ad3b5ba5..b3161a42bb3e5 100644 --- a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc +++ b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc @@ -301,6 +301,8 @@ "^test_reduce_log_sum_exp_empty_set", "^test_reduce_log_sum_exp_empty_set_expanded", "^test_reduce_prod_empty_set", + "^test_reduce_sum_empty_set", + "^test_reduce_sum_empty_set_non_reduced_axis_zero", "^test_reduce_sum_square_empty_set", "^test_reduce_sum_square_empty_set_expanded" ], From c25e72708f5019151d527df5d7ae2e4ba6d9b298 Mon Sep 17 00:00:00 2001 From: Liqun Fu Date: Wed, 18 Oct 2023 15:02:15 -0700 Subject: [PATCH 09/10] update onnx hash and cgmanifest.json Signed-off-by: Liqun Fu --- cgmanifests/generated/cgmanifest.json | 10 ++++++++++ cmake/external/onnx | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cgmanifests/generated/cgmanifest.json b/cgmanifests/generated/cgmanifest.json index da7993cab853d..f9f2fbdab7b10 100644 --- a/cgmanifests/generated/cgmanifest.json +++ b/cgmanifests/generated/cgmanifest.json @@ -192,6 +192,16 @@ "comments": "mp11" } }, + { + "component": { + "type": "git", + "git": { + "commitHash": "6a20ba82b439ea1fd650da4d389e96b60a1dd828", + "repositoryUrl": "https://github.com/onnx/onnx.git" + }, + "comments": "onnx" + } + }, { "component": { "type": "git", diff --git a/cmake/external/onnx b/cmake/external/onnx index 0c296085f9f65..6a20ba82b439e 160000 --- a/cmake/external/onnx +++ b/cmake/external/onnx @@ -1 +1 @@ -Subproject commit 0c296085f9f65f0f8ef7aec7b9eed55faf37dc40 +Subproject commit 6a20ba82b439ea1fd650da4d389e96b60a1dd828 From 869bdff96b1b7dcb9896f54989aff218eb99dda3 Mon Sep 17 00:00:00 2001 From: Liqun Fu Date: Wed, 18 Oct 2023 18:30:19 -0700 Subject: [PATCH 10/10] reduce_sum_empty_set Signed-off-by: Liqun Fu --- onnxruntime/test/onnx/TestCase.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/onnxruntime/test/onnx/TestCase.cc b/onnxruntime/test/onnx/TestCase.cc index 0b830c1766f36..47c3798721679 100644 --- a/onnxruntime/test/onnx/TestCase.cc +++ b/onnxruntime/test/onnx/TestCase.cc @@ -955,6 +955,7 @@ std::unique_ptr> GetBrokenTests(const std::string& provider {"reduce_log_sum_exp_empty_set", "unknown version", {}}, {"reduce_log_sum_exp_empty_set_expanded", "unknown version", {}}, {"reduce_prod_empty_set", "unknown version", {}}, + {"reduce_sum_empty_set", "unknown version", {}}, {"reduce_sum_square_empty_set", "unknown version", {}}, {"reduce_sum_square_empty_set_expanded", "unknown version", {}}, #ifdef ENABLE_TRAINING_CORE