Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/deps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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/refs/tags/v1.19.0.zip;4c798b73e131438c196e6dcb9f3393968a8936f1
onnx;https://github.com/onnx/onnx/archive/refs/tags/v1.19.1.zip;c5215b5697dcdfd71799f001b8c4054a6bba6b09
# Use the latest commit of 10.9-GA
onnx_tensorrt;https://github.com/onnx/onnx-tensorrt/archive/d5dce67db7c2e64b07e055571f5ec06f7f254de2.zip;01114d3b67650857281fa50faa2e412130a63b69
protobuf;https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.12.zip;7cf2733949036c7d52fda017badcab093fe73bfa
Expand Down
8 changes: 1 addition & 7 deletions cmake/external/onnxruntime_external_deps.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -498,13 +498,7 @@ else()
endif()

if(Patch_FOUND)
set(ONNXRUNTIME_ONNX_PATCH_COMMAND
${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/onnx/onnx.patch &&
# Patch changes from https://github.com/onnx/onnx/pull/7253 to avoid unnecessary rebuilding.
# This change should be included in ONNX 1.19.1.
${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 <
${PROJECT_SOURCE_DIR}/patches/onnx/avoid_regenerating_proto_files.patch
)
set(ONNXRUNTIME_ONNX_PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/onnx/onnx.patch)
else()
set(ONNXRUNTIME_ONNX_PATCH_COMMAND "")
endif()
Expand Down
46 changes: 0 additions & 46 deletions cmake/patches/onnx/avoid_regenerating_proto_files.patch

This file was deleted.

12 changes: 6 additions & 6 deletions cmake/patches/onnx/onnx.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47995579..6cc439f6 100644
index cc3ef140..f70312ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,6 +57,7 @@ option(ONNX_USE_LITE_PROTO "Use lite protobuf instead of full." OFF)
Expand All @@ -10,7 +10,7 @@ index 47995579..6cc439f6 100644
if(WIN32)
option(ONNX_USE_MSVC_STATIC_RUNTIME "Build with MSVC static runtime" OFF)
endif()
@@ -411,14 +412,28 @@ relative_protobuf_generate_cpp(ONNX_PROTO_SRCS
@@ -409,14 +410,28 @@ relative_protobuf_generate_cpp(ONNX_PROTO_SRCS

add_library(onnx_proto ${ONNX_PROTO_SRCS})

Expand Down Expand Up @@ -47,7 +47,7 @@ index 47995579..6cc439f6 100644

# Hide all symbols we don't need
set_target_properties(onnx_proto PROPERTIES CXX_VISIBILITY_PRESET hidden)
@@ -440,19 +455,6 @@ add_onnx_global_defines(onnx_proto)
@@ -438,19 +453,6 @@ add_onnx_global_defines(onnx_proto)
target_include_directories(onnx_proto PUBLIC
$<BUILD_INTERFACE:${ONNX_ROOT}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
Expand All @@ -68,10 +68,10 @@ index 47995579..6cc439f6 100644
if(CMAKE_SYSTEM_NAME STREQUAL "AIX")
# whole-archive linker option not available on AIX.
diff --git a/onnx/defs/nn/old.cc b/onnx/defs/nn/old.cc
index 40635f97..44770774 100644
index ad6dd0c1..50259f32 100644
--- a/onnx/defs/nn/old.cc
+++ b/onnx/defs/nn/old.cc
@@ -4090,7 +4090,6 @@ ONNX_OPERATOR_SET_SCHEMA(
@@ -4091,7 +4091,6 @@ ONNX_OPERATOR_SET_SCHEMA(
GroupNormalization,
18,
OpSchema()
Expand All @@ -80,7 +80,7 @@ index 40635f97..44770774 100644
.Attr("epsilon", "The epsilon value to use to avoid division by zero.", AttributeProto::FLOAT, 1e-5f)
.Attr(
diff --git a/onnx/defs/schema.h b/onnx/defs/schema.h
index ddd95454..34647987 100644
index 7e9bc27f..4b87c5a5 100644
--- a/onnx/defs/schema.h
+++ b/onnx/defs/schema.h
@@ -999,7 +999,7 @@ class OpSchemaRegistry final : public ISchemaRegistry {
Expand Down
46 changes: 0 additions & 46 deletions cmake/vcpkg-ports/onnx/avoid_regenerating_proto_files.patch

This file was deleted.

12 changes: 6 additions & 6 deletions cmake/vcpkg-ports/onnx/binskim.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47995579..6cc439f6 100644
index cc3ef140..f70312ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,6 +57,7 @@ option(ONNX_USE_LITE_PROTO "Use lite protobuf instead of full." OFF)
Expand All @@ -10,7 +10,7 @@ index 47995579..6cc439f6 100644
if(WIN32)
option(ONNX_USE_MSVC_STATIC_RUNTIME "Build with MSVC static runtime" OFF)
endif()
@@ -411,14 +412,28 @@ relative_protobuf_generate_cpp(ONNX_PROTO_SRCS
@@ -409,14 +410,28 @@ relative_protobuf_generate_cpp(ONNX_PROTO_SRCS

add_library(onnx_proto ${ONNX_PROTO_SRCS})

Expand Down Expand Up @@ -47,7 +47,7 @@ index 47995579..6cc439f6 100644

# Hide all symbols we don't need
set_target_properties(onnx_proto PROPERTIES CXX_VISIBILITY_PRESET hidden)
@@ -440,19 +455,6 @@ add_onnx_global_defines(onnx_proto)
@@ -438,19 +453,6 @@ add_onnx_global_defines(onnx_proto)
target_include_directories(onnx_proto PUBLIC
$<BUILD_INTERFACE:${ONNX_ROOT}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
Expand All @@ -68,10 +68,10 @@ index 47995579..6cc439f6 100644
if(CMAKE_SYSTEM_NAME STREQUAL "AIX")
# whole-archive linker option not available on AIX.
diff --git a/onnx/defs/nn/old.cc b/onnx/defs/nn/old.cc
index 40635f97..44770774 100644
index ad6dd0c1..50259f32 100644
--- a/onnx/defs/nn/old.cc
+++ b/onnx/defs/nn/old.cc
@@ -4090,7 +4090,6 @@ ONNX_OPERATOR_SET_SCHEMA(
@@ -4091,7 +4091,6 @@ ONNX_OPERATOR_SET_SCHEMA(
GroupNormalization,
18,
OpSchema()
Expand All @@ -80,7 +80,7 @@ index 40635f97..44770774 100644
.Attr("epsilon", "The epsilon value to use to avoid division by zero.", AttributeProto::FLOAT, 1e-5f)
.Attr(
diff --git a/onnx/defs/schema.h b/onnx/defs/schema.h
index ddd95454..34647987 100644
index 7e9bc27f..4b87c5a5 100644
--- a/onnx/defs/schema.h
+++ b/onnx/defs/schema.h
@@ -999,7 +999,7 @@ class OpSchemaRegistry final : public ISchemaRegistry {
Expand Down
5 changes: 1 addition & 4 deletions cmake/vcpkg-ports/onnx/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO onnx/onnx
REF "v${VERSION}"
SHA512 e6f7b5782a43a91783607549e4d0f0a9cbd46dfb67a602f81aaffc7bcdd8f450fe9c225f0bc314704f2923e396f0df5b03ea91af4a7887203c0b8372bc2749d0
SHA512 cf6ff4c0bb6cc16ce5f4d6267480d35f3c7a5fde94d10e1358928ff6e4ec6d756a7c5d34a500e60bbd8eb1912c8af21aa763719321b330f56a0eb6b9b810ef60
PATCHES
fix-cmakelists.patch
# Patch changes from https://github.com/onnx/onnx/pull/7253 to avoid unnecessary rebuilding.
# This change should be included in ONNX 1.19.1.
avoid_regenerating_proto_files.patch
fix-dependency-protobuf.patch
binskim.patch
)
Expand Down
2 changes: 1 addition & 1 deletion cmake/vcpkg-ports/onnx/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "onnx",
"version-semver": "1.19.0",
"version-semver": "1.19.1",
"port-version": 1,
"description": "Open standard for machine learning interoperability",
"homepage": "https://onnx.ai",
Expand Down
2 changes: 1 addition & 1 deletion docs/How_To_Update_ONNX_Dev_Notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ git add onnx
1. Modify [cmake/vcpkg-ports/onnx/binskim.patch](/cmake/vcpkg-ports/onnx/binskim.patch) to be the same as [cmake/patches/onnx/onnx.patch](/cmake/patches/onnx/onnx.patch).
2. The other patches are required/created by vcpkg repository to build ONNX. We just need to re-run diff to makes sure the patches can be applied in the updated ONNX version.
3. Update [cmake/vcpkg-ports/onnx/portfile.cmake](/cmake/vcpkg-ports/onnx/portfile.cmake) with the correct commit id and SHA512. (alternatively, build it with the wrong SHA and ORT should tell you the expected one.)
4. Upload your package: [Follow the instructions](https://microsoft.sharepoint.com/teams/ONNX2/_layouts/15/Doc.aspx?sourcedoc={170774be-e1c6-4f8b-a3ae-984f211fe410}&action=edit&wd=target%28Development.)one%7C63d3ab47-51d1-4a62-9965-66882234bd44%2FAdd%20or%20Update%20a%20C%2B%2B%20dependency%7Cb6ae6a97-94fc-4436-8fc6-08c21ae895da%2F%29&wdorigin=NavigationUrl
4. Upload your package: [Follow the instructions](https://microsoft.sharepoint.com/:o:/r/teams/ONNX2/_layouts/15/Doc.aspx?sourcedoc=%7B170774BE-E1C6-4F8B-A3AE-984F211FE410%7D&wd=target(Development.one%7C63D3AB47-51D1-4A62-9965-66882234BD44%2FUpdate%20a%20VCPKG%20package%7CB6AE6A97-94FC-4436-8FC6-08C21AE895DA%2F)&wdpartid=%7BB5CF19CC-40FE-0EC7-32B6-8119B427B32A%7D%7B1%7D&wdsectionfileid=%7B9DD25660-A195-48EA-B9E0-DF8B902AFDD7%7D&ovuser=72f988bf-86f1-41af-91ab-2d7cd011db47%2Ctitaiwang%40microsoft.com&clickparams=eyJBcHBOYW1lIjoiVGVhbXMtRGVza3RvcCIsIkFwcFZlcnNpb24iOiI0OS8yNTA5MTExNjAxNiIsIkhhc0ZlZGVyYXRlZFVzZXIiOmZhbHNlfQ%3D%3D&CID=fb9dcaa1-c0b5-1000-5597-c19e3adf468c&cidOR=SPO)one%7C63d3ab47-51d1-4a62-9965-66882234bd44%2FAdd%20or%20Update%20a%20C%2B%2B%20dependency%7Cb6ae6a97-94fc-4436-8fc6-08c21ae895da%2F%29&wdorigin=NavigationUrl

Alternatively, directly run Terrapin to upload ONNX package (need SHA512):

Expand Down
17 changes: 15 additions & 2 deletions onnxruntime/test/onnx/TestCase.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1435,9 +1435,22 @@ std::unique_ptr<std::set<BrokenTest>> GetBrokenTests(const std::string& provider
broken_tests->insert({"scatter_elements_with_negative_indices", "unknown version"});
// Fails since ONNX==1.19.0
broken_tests->insert({"l2normalization_axis_0", "unknown version"});
broken_tests->insert({"attention_3d_gqa", "unknown version"});
broken_tests->insert({"attention_3d_gqa_attn_mask", "unknown version"});
broken_tests->insert({"attention_3d_gqa_causal", "unknown version"});
broken_tests->insert({"attention_3d_gqa_scaled", "unknown version"});
broken_tests->insert({"attention_3d_gqa_softcap", "unknown version"});
broken_tests->insert({"attention_3d_gqa_with_past_and_present", "unknown version"});
broken_tests->insert({"attention_4d_gqa", "unknown version"});
broken_tests->insert({"attention_4d_gqa_attn_mask", "unknown version"});
broken_tests->insert({"attention_4d_gqa_causal", "unknown version"});
broken_tests->insert({"attention_4d_gqa_scaled", "unknown version"});
broken_tests->insert({"attention_4d_gqa_softcap", "unknown version"});
broken_tests->insert({"attention_4d_gqa_with_past_and_present", "unknown version"});
broken_tests->insert({"attention_4d_gqa_with_past_and_present_fp16", "unknown version"});
broken_tests->insert({"attention_4d_with_past_and_present_qk_matmul_bias_3d_mask_causal", "unknown version"});
broken_tests->insert({"attention_4d_with_past_and_present_qk_matmul_bias_4d_mask_causal", "unknown version"});
broken_tests->insert({"attention_4d_diff_heads_mask4d_padded_kv", "need nonpad_kv_seqlen "});
broken_tests->insert({"attention_4d_with_past_and_present_qk_matmul_bias_3d_mask_causal", "attention op implementation is wrong"});
broken_tests->insert({"attention_4d_with_past_and_present_qk_matmul_bias_4d_mask_causal", "attention op implementation is wrong"});
}

#ifdef DISABLE_CONTRIB_OPS
Expand Down
18 changes: 0 additions & 18 deletions onnxruntime/test/onnx/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -795,24 +795,6 @@ select from 'TF8', 'TF16', 'UINT8', 'FLOAT', 'ITENSOR'. \n)");
// Please make no more changes to the list
static const ORTCHAR_T* immutable_broken_tests[] =
{
// pending ONNX update
ORT_TSTR("attention_3d_gqa"),
ORT_TSTR("attention_3d_gqa_attn_mask"),
ORT_TSTR("attention_3d_gqa_causal"),
ORT_TSTR("attention_3d_gqa_scaled"),
ORT_TSTR("attention_3d_gqa_softcap"),
ORT_TSTR("attention_3d_gqa_with_past_and_present"),
ORT_TSTR("attention_4d_gqa"),
ORT_TSTR("attention_4d_gqa_attn_mask"),
ORT_TSTR("attention_4d_gqa_causal"),
ORT_TSTR("attention_4d_gqa_scaled"),
ORT_TSTR("attention_4d_gqa_softcap"),
ORT_TSTR("attention_4d_gqa_with_past_and_present"),
ORT_TSTR("attention_4d_diff_heads_mask4d_padded_kv"),
ORT_TSTR("attention_4d_gqa_with_past_and_present_fp16"),
ORT_TSTR("attention_4d_with_past_and_present_qk_matmul_bias_3d_mask_causal"),
ORT_TSTR("attention_4d_with_past_and_present_qk_matmul_bias_4d_mask_causal"),
// unsupported case
ORT_TSTR("AvgPool1d"),
ORT_TSTR("AvgPool1d_stride"),
ORT_TSTR("AvgPool2d"),
Expand Down
29 changes: 7 additions & 22 deletions onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,12 @@
"current_failing_tests": [
"^test_adagrad",
"^test_adagrad_multiple",
"^test_attention_4d_diff_heads_mask4d_padded_kv*", // pending onnx update
"^test_attention_3d_gqa*", // pending onnx update
"^test_attention_3d_gqa_causal", // pending onnx update
"^test_attention_3d_gqa_scaled", // pending onnx update
"^test_attention_3d_gqa_softcap", // pending onnx update
"^test_attention_3d_gqa_with_past_and_present", // pending onnx update
"^test_attention_4d_gqa*", // pending onnx update
"^test_attention_4d_gqa_causal", // pending onnx update
"^test_attention_4d_gqa_scaled", // pending onnx update
"^test_attention_4d_gqa_softcap", // pending onnx update
"^test_attention_4d_gqa_with_past_and_present", // pending onnx update
"^test_attention_*causal*", // pending onnx update
"^test_attention_4d_with_past_and_present_qk_matmul_bias_3d_mask_causal*", // pending onnx update
"^test_attention_4d_with_past_and_present_qk_matmul_bias_4d_mask_causal*", // pending onnx update
"^test_attention_4d_attn_mask_3d_causal_expanded*", // pending onnx update
"^test_attention_4d_fp16*", // precision issue: 1 / 192 mismatched elements
"^test_attention_4d_fp16_expanded*", // precision issue: 3 / 192 mismatched elements
"^test_attention_4d_gqa_with_past_and_present_fp16_expanded*", // webgpu mismatched elements 38 / 576
"^test_attention_4d_with_past_and_present_qk_matmul_bias_3d_mask_causal_expanded*", // webgpu
"^test_attention_4d_attn_mask_3d_causal_expanded*", // webgpu
"^test_attention_4d_diff_heads_mask4d_padded_kv*", // Need nonpad_kv_seqlen
"^test_l2normalization*", // LpNormalization(22) not implemented
"^test_l1normalization*", // LpNormalization(22) not implemented
"^test_lpnormalization*", // LpNormalization(22) not implemented
Expand Down Expand Up @@ -123,13 +112,9 @@
"^test_if_opt",
"^test_loop16_seq_none",
"^test_identity_opt",
// rotary dim should be fixed in onnx==1.19.1
"^test_rotary_embedding_no_position_ids_rotary_dim",
"^test_rotary_embedding_with_interleaved_rotary_dim",
"^test_rotary_embedding_with_rotary_dim",
"^test_rotary_embedding_3d_input_expanded",
"^test_rotary_embedding_interleaved_expanded",
"^test_rotary_embedding_no_position_ids_interleaved_expanded",
"^test_rotary_embedding_3d_input_expanded", // win cuda fail
"^test_rotary_embedding_interleaved_expanded", // win cuda fail
"^test_rotary_embedding_no_position_ids_interleaved_expanded", // win cuda fail
"^test_rotary_embedding_expanded", //webgpu
"^test_rotary_embedding_no_position_ids_expanded", //webgpu
// Following tests are for opset 16 ops and are not yet implemented in ORT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ mypy
pytest
setuptools>=68.2.2
wheel
onnx==1.19.0
onnx==1.19.1
protobuf==4.25.8
sympy==1.14
flatbuffers
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ beartype==0.15.0
flatbuffers
cerberus
h5py
onnx==1.19.0
onnx==1.19.1
# Python dependencies required for pytorch development
astunparse
expecttest!=0.2.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ mypy
pytest
setuptools>=68.2.2
wheel
onnx==1.19.0
onnx==1.19.1
protobuf==4.25.1
sympy==1.14
flatbuffers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ mypy
pytest
setuptools==78.1.1
wheel==0.45.1
onnx==1.19.0
onnx==1.19.1
argparse
sympy==1.14
flatbuffers
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/linux/python/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ mypy
pytest
setuptools>=68.2.2
wheel
onnx==1.19.0
onnx==1.19.1
protobuf==4.25.1
sympy==1.14
flatbuffers
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/windows/python/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ mypy
pytest
setuptools>=68.2.2
wheel
onnx==1.19.0
onnx==1.19.1
protobuf==4.25.1
sympy==1.14
flatbuffers
Expand Down
Loading