diff --git a/cmake/deps.txt b/cmake/deps.txt index 7b243ff15cd80..bf76753c1b3c0 100644 --- a/cmake/deps.txt +++ b/cmake/deps.txt @@ -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 diff --git a/cmake/external/onnxruntime_external_deps.cmake b/cmake/external/onnxruntime_external_deps.cmake index f32350ca755ea..b6a741d8b0fe7 100644 --- a/cmake/external/onnxruntime_external_deps.cmake +++ b/cmake/external/onnxruntime_external_deps.cmake @@ -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() diff --git a/cmake/patches/onnx/avoid_regenerating_proto_files.patch b/cmake/patches/onnx/avoid_regenerating_proto_files.patch deleted file mode 100644 index 804dfeb8f59c2..0000000000000 --- a/cmake/patches/onnx/avoid_regenerating_proto_files.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 479955793..cc3ef1400 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -321,7 +321,7 @@ function(RELATIVE_PROTOBUF_GENERATE_CPP SRCS) - set(${SRCS}) - - set(GEN_PROTO_PY "${ONNX_ROOT}/onnx/gen_proto.py") -- set(GENERATED_FILE_TARGETS) -+ set(GENERATED_FILES) - foreach(INFILE ${ARGN}) - set(ABS_FILE "${ONNX_ROOT}/${INFILE}") - get_filename_component(FILE_DIR ${ABS_FILE} DIRECTORY) -@@ -371,12 +371,11 @@ function(RELATIVE_PROTOBUF_GENERATE_CPP SRCS) - list(APPEND GEN_PROTO_ARGS "${ONNX_PROTOC_EXECUTABLE}") - endif() - -- add_custom_target("${GENERATED_FILE_WE}_proto_file" -- COMMAND ${ONNX_PYTHON_INTERPRETER} "${GEN_PROTO_PY}" ${GEN_PROTO_ARGS} -- BYPRODUCTS "${GENERATED_PROTO}" -- DEPENDS ${INFILE} -- COMMENT "Running gen_proto.py on ${INFILE}" -- ) -+ # Use add_custom_command to avoid re-generate of PROTO files -+ add_custom_command(OUTPUT "${GENERATED_PROTO}" -+ COMMAND ${ONNX_PYTHON_INTERPRETER} "${GEN_PROTO_PY}" ${GEN_PROTO_ARGS} -+ DEPENDS ${INFILE} -+ COMMENT "Running gen_proto.py on ${INFILE}") - message("Generated: ${GENERATED_PROTO}") - - set(PROTOC_ARGS -@@ -393,11 +392,10 @@ function(RELATIVE_PROTOBUF_GENERATE_CPP SRCS) - list(APPEND PROTOC_ARGS ${CMAKE_CURRENT_BINARY_DIR}) - endif() - endif() -- list(APPEND GENERATED_FILE_TARGETS ${GENERATED_FILE_WE}_proto_file) -- add_custom_target(${GENERATED_FILE_WE}_src -+ list(APPEND GENERATED_FILES "${GENERATED_PROTO}") -+ add_custom_command(OUTPUT "${OUTPUT_PB_SRC}" - COMMAND "${ONNX_PROTOC_EXECUTABLE}" ${PROTOC_ARGS} -- BYPRODUCTS "${OUTPUT_PB_SRC}" -- DEPENDS ${GENERATED_FILE_TARGETS} -+ DEPENDS ${GENERATED_FILES} - COMMENT "Running C++ protocol buffer compiler on ${GENERATED_PROTO}") - endforeach() - diff --git a/cmake/patches/onnx/onnx.patch b/cmake/patches/onnx/onnx.patch index e8ae766062d08..047cb527bb4da 100644 --- a/cmake/patches/onnx/onnx.patch +++ b/cmake/patches/onnx/onnx.patch @@ -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) @@ -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}) @@ -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 $ $) @@ -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() @@ -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 { diff --git a/cmake/vcpkg-ports/onnx/avoid_regenerating_proto_files.patch b/cmake/vcpkg-ports/onnx/avoid_regenerating_proto_files.patch deleted file mode 100644 index 804dfeb8f59c2..0000000000000 --- a/cmake/vcpkg-ports/onnx/avoid_regenerating_proto_files.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 479955793..cc3ef1400 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -321,7 +321,7 @@ function(RELATIVE_PROTOBUF_GENERATE_CPP SRCS) - set(${SRCS}) - - set(GEN_PROTO_PY "${ONNX_ROOT}/onnx/gen_proto.py") -- set(GENERATED_FILE_TARGETS) -+ set(GENERATED_FILES) - foreach(INFILE ${ARGN}) - set(ABS_FILE "${ONNX_ROOT}/${INFILE}") - get_filename_component(FILE_DIR ${ABS_FILE} DIRECTORY) -@@ -371,12 +371,11 @@ function(RELATIVE_PROTOBUF_GENERATE_CPP SRCS) - list(APPEND GEN_PROTO_ARGS "${ONNX_PROTOC_EXECUTABLE}") - endif() - -- add_custom_target("${GENERATED_FILE_WE}_proto_file" -- COMMAND ${ONNX_PYTHON_INTERPRETER} "${GEN_PROTO_PY}" ${GEN_PROTO_ARGS} -- BYPRODUCTS "${GENERATED_PROTO}" -- DEPENDS ${INFILE} -- COMMENT "Running gen_proto.py on ${INFILE}" -- ) -+ # Use add_custom_command to avoid re-generate of PROTO files -+ add_custom_command(OUTPUT "${GENERATED_PROTO}" -+ COMMAND ${ONNX_PYTHON_INTERPRETER} "${GEN_PROTO_PY}" ${GEN_PROTO_ARGS} -+ DEPENDS ${INFILE} -+ COMMENT "Running gen_proto.py on ${INFILE}") - message("Generated: ${GENERATED_PROTO}") - - set(PROTOC_ARGS -@@ -393,11 +392,10 @@ function(RELATIVE_PROTOBUF_GENERATE_CPP SRCS) - list(APPEND PROTOC_ARGS ${CMAKE_CURRENT_BINARY_DIR}) - endif() - endif() -- list(APPEND GENERATED_FILE_TARGETS ${GENERATED_FILE_WE}_proto_file) -- add_custom_target(${GENERATED_FILE_WE}_src -+ list(APPEND GENERATED_FILES "${GENERATED_PROTO}") -+ add_custom_command(OUTPUT "${OUTPUT_PB_SRC}" - COMMAND "${ONNX_PROTOC_EXECUTABLE}" ${PROTOC_ARGS} -- BYPRODUCTS "${OUTPUT_PB_SRC}" -- DEPENDS ${GENERATED_FILE_TARGETS} -+ DEPENDS ${GENERATED_FILES} - COMMENT "Running C++ protocol buffer compiler on ${GENERATED_PROTO}") - endforeach() - diff --git a/cmake/vcpkg-ports/onnx/binskim.patch b/cmake/vcpkg-ports/onnx/binskim.patch index e8ae766062d08..047cb527bb4da 100644 --- a/cmake/vcpkg-ports/onnx/binskim.patch +++ b/cmake/vcpkg-ports/onnx/binskim.patch @@ -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) @@ -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}) @@ -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 $ $) @@ -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() @@ -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 { diff --git a/cmake/vcpkg-ports/onnx/portfile.cmake b/cmake/vcpkg-ports/onnx/portfile.cmake index 27f5ea5fadd79..882850963a0c0 100644 --- a/cmake/vcpkg-ports/onnx/portfile.cmake +++ b/cmake/vcpkg-ports/onnx/portfile.cmake @@ -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 ) diff --git a/cmake/vcpkg-ports/onnx/vcpkg.json b/cmake/vcpkg-ports/onnx/vcpkg.json index 350db2e35061a..ad0d1aaf15f51 100644 --- a/cmake/vcpkg-ports/onnx/vcpkg.json +++ b/cmake/vcpkg-ports/onnx/vcpkg.json @@ -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", diff --git a/docs/How_To_Update_ONNX_Dev_Notes.md b/docs/How_To_Update_ONNX_Dev_Notes.md index 8da19ddc51cb7..8c1280431c384 100644 --- a/docs/How_To_Update_ONNX_Dev_Notes.md +++ b/docs/How_To_Update_ONNX_Dev_Notes.md @@ -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): diff --git a/onnxruntime/test/onnx/TestCase.cc b/onnxruntime/test/onnx/TestCase.cc index 6df98ff505fa1..cbb25bb9b629e 100644 --- a/onnxruntime/test/onnx/TestCase.cc +++ b/onnxruntime/test/onnx/TestCase.cc @@ -1435,9 +1435,22 @@ std::unique_ptr> 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 diff --git a/onnxruntime/test/onnx/main.cc b/onnxruntime/test/onnx/main.cc index b6f2cb2683677..463634b370d4c 100644 --- a/onnxruntime/test/onnx/main.cc +++ b/onnxruntime/test/onnx/main.cc @@ -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"), diff --git a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc index f5f6a3ae3bc39..0558d008a2275 100644 --- a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc +++ b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc @@ -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 @@ -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 diff --git a/tools/ci_build/github/linux/docker/inference/aarch64/python/cpu/scripts/requirements.txt b/tools/ci_build/github/linux/docker/inference/aarch64/python/cpu/scripts/requirements.txt index bae6f4cb51816..1b1dadeaf8db2 100644 --- a/tools/ci_build/github/linux/docker/inference/aarch64/python/cpu/scripts/requirements.txt +++ b/tools/ci_build/github/linux/docker/inference/aarch64/python/cpu/scripts/requirements.txt @@ -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 diff --git a/tools/ci_build/github/linux/docker/scripts/lort/requirements.txt b/tools/ci_build/github/linux/docker/scripts/lort/requirements.txt index 2871f5cab2ea2..dc394ff50f4f9 100644 --- a/tools/ci_build/github/linux/docker/scripts/lort/requirements.txt +++ b/tools/ci_build/github/linux/docker/scripts/lort/requirements.txt @@ -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 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 381d42831e715..2d89aece56340 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>=68.2.2 wheel -onnx==1.19.0 +onnx==1.19.1 protobuf==4.25.1 sympy==1.14 flatbuffers diff --git a/tools/ci_build/github/linux/docker/scripts/requirements.txt b/tools/ci_build/github/linux/docker/scripts/requirements.txt index 4cc94f9148656..2fc034d9c5ca2 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==78.1.1 wheel==0.45.1 -onnx==1.19.0 +onnx==1.19.1 argparse sympy==1.14 flatbuffers diff --git a/tools/ci_build/github/linux/python/requirements.txt b/tools/ci_build/github/linux/python/requirements.txt index d48fb66194f2a..293aa49823d48 100644 --- a/tools/ci_build/github/linux/python/requirements.txt +++ b/tools/ci_build/github/linux/python/requirements.txt @@ -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 diff --git a/tools/ci_build/github/windows/python/requirements.txt b/tools/ci_build/github/windows/python/requirements.txt index 6ab2ab2b7b61f..b48f6c3c2784d 100644 --- a/tools/ci_build/github/windows/python/requirements.txt +++ b/tools/ci_build/github/windows/python/requirements.txt @@ -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