diff --git a/ports/onnx/fix-cmakelists.patch b/ports/onnx/fix-cmakelists.patch index 984e09843124be..bc2f9ed68ec2f3 100644 --- a/ports/onnx/fix-cmakelists.patch +++ b/ports/onnx/fix-cmakelists.patch @@ -1,15 +1,19 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8b5af30..6836651 100644 +index 044996e1b..f97b7a293 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -668,6 +668,10 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/onnx - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h") -+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/onnx DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -+ FILES_MATCHING PATTERN "*.proto") -+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/onnx DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -+ FILES_MATCHING PATTERN "*.proto3") +@@ -491,6 +491,14 @@ if(ONNX_INSTALL) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h") ++ install(DIRECTORY ${ONNX_ROOT}/onnx ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ++ FILES_MATCHING ++ PATTERN "*.proto") ++ install(DIRECTORY ${ONNX_ROOT}/onnx ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ++ FILES_MATCHING ++ PATTERN "*.proto3") + endif() configure_file( - ${PROJECT_SOURCE_DIR}/cmake/ONNXConfigVersion.cmake.in diff --git a/ports/onnx/fix-pr-7390.patch b/ports/onnx/fix-pr-7390.patch deleted file mode 100644 index c9477059e479a6..00000000000000 --- a/ports/onnx/fix-pr-7390.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/onnx/defs/schema.h b/onnx/defs/schema.h -index acf3aac..adae2d5 100644 ---- a/onnx/defs/schema.h -+++ b/onnx/defs/schema.h -@@ -979,8 +979,10 @@ class OpSchemaRegistry final : public ISchemaRegistry { - - class OpSchemaRegisterOnce final { - public: -- // Export to cpp custom register macro -- explicit OpSchemaRegisterOnce( -+ // Export to cpp custom register macro. -+ // DO NOT decorate the constructor as "explicit" because that breaks the macro ONNX_OPERATOR_SCHEMA_UNIQ. -+ // NOLINTNEXTLINE(google-explicit-constructor) -+ OpSchemaRegisterOnce( // NOSONAR - OpSchema op_schema, - int opset_version_to_load = 0, - bool fail_duplicate_schema = true) { -@@ -1311,9 +1313,9 @@ size_t ReplaceAll(std::string& s, const char* from, const char* to); - // Legacy macros to register schema at static initialization - #define ONNX_OPERATOR_SCHEMA(name) ONNX_OPERATOR_SCHEMA_UNIQ_HELPER(__COUNTER__, name) - #define ONNX_OPERATOR_SCHEMA_UNIQ_HELPER(Counter, name) ONNX_OPERATOR_SCHEMA_UNIQ(Counter, name) --#define ONNX_OPERATOR_SCHEMA_UNIQ(Counter, name) \ -- static ONNX_NAMESPACE::OpSchemaRegistry::OpSchemaRegisterOnce(op_schema_register_once##name##Counter) ONNX_UNUSED = \ -- OpSchema(#name, __FILE__, __LINE__) -+#define ONNX_OPERATOR_SCHEMA_UNIQ(Counter, name) \ -+ static ONNX_NAMESPACE::OpSchemaRegistry::OpSchemaRegisterOnce op_schema_register_once##name##Counter ONNX_UNUSED = \ -+ ONNX_NAMESPACE::OpSchema(#name, __FILE__, __LINE__) - - // Helper function - size_t ReplaceAll(std::string& s, const char* from, const char* to); diff --git a/ports/onnx/portfile.cmake b/ports/onnx/portfile.cmake index 9a34e56dedd403..ffc3f93996e5ac 100644 --- a/ports/onnx/portfile.cmake +++ b/ports/onnx/portfile.cmake @@ -4,10 +4,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onnx/onnx REF "v${VERSION}" - SHA512 e6f7b5782a43a91783607549e4d0f0a9cbd46dfb67a602f81aaffc7bcdd8f450fe9c225f0bc314704f2923e396f0df5b03ea91af4a7887203c0b8372bc2749d0 + SHA512 3cee4c0fbc9e260e360a62a59e324e0b127a5749f958e0704989b407a4c1179c637ef86e41a406e7868537a62a11a821e3433005eb0725f979145f8d514926bd PATCHES fix-cmakelists.patch - fix-pr-7390.patch # part of https://github.com/onnx/onnx PR 7390 ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME) @@ -38,6 +37,7 @@ vcpkg_cmake_configure( -DONNX_USE_MSVC_STATIC_RUNTIME=${USE_STATIC_RUNTIME} -DONNX_BUILD_TESTS=OFF -DONNX_BUILD_CUSTOM_PROTOBUF=OFF + -DONNX_DISABLE_STATIC_REGISTRATION=ON MAYBE_UNUSED_VARIABLES ONNX_USE_MSVC_STATIC_RUNTIME Python_EXECUTABLE diff --git a/ports/onnx/vcpkg.json b/ports/onnx/vcpkg.json index 8fecf50e6d625a..c9511afbba5a77 100644 --- a/ports/onnx/vcpkg.json +++ b/ports/onnx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "onnx", - "version-semver": "1.19.0", + "version-semver": "1.21.0", "description": "Open standard for machine learning interoperability", "homepage": "https://onnx.ai", "license": "Apache-2.0", diff --git a/ports/onnxruntime/portfile.cmake b/ports/onnxruntime/portfile.cmake index 9d8304d3aecc38..e3baf57ef87c26 100644 --- a/ports/onnxruntime/portfile.cmake +++ b/ports/onnxruntime/portfile.cmake @@ -11,10 +11,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/onnxruntime REF "v${VERSION}" - SHA512 373c51575ada457b8aead5d195a5f3eba62fb747b6370a2a9889fff875c40ea30af8fd49104d58cc86f79247410e829086b0979f37ca8635c6dd34960e9cc424 + SHA512 53b3aed02e085c83aa3c7e1faffeae7f70675d6770bc44d148085ded47940f29471eef76e0c4565bbb471f0f814610e0d1892ce9305c63d011fe851a22b1f7ab PATCHES - fix-cmake.patch # .framework install, external library workarounds(abseil-cpp, eigen3) - fix-cmake-cuda.patch + # fix-cmake.patch # .framework install, external library workarounds(abseil-cpp, eigen3) + # fix-cmake-cuda.patch ) find_program(PROTOC NAMES protoc PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf" REQUIRED NO_DEFAULT_PATH NO_CMAKE_PATH) diff --git a/ports/onnxruntime/vcpkg.json b/ports/onnxruntime/vcpkg.json index 563db03cece509..49f83294ef976c 100644 --- a/ports/onnxruntime/vcpkg.json +++ b/ports/onnxruntime/vcpkg.json @@ -1,6 +1,6 @@ { "name": "onnxruntime", - "version-semver": "1.23.2", + "version-semver": "1.24.4", "description": "ONNX Runtime: cross-platform, high performance ML inferencing and training accelerator", "homepage": "https://github.com/microsoft/onnxruntime", "license": "MIT", @@ -65,6 +65,10 @@ } ], "features": { + "coreml": { + "description": "Build CoreML support", + "supports": "osx | ios" + }, "cuda": { "description": "Build with CUDA support", "supports": "(x64 & windows & !static) | (x64 & linux)", @@ -75,10 +79,21 @@ "nvidia-cutlass" ] }, + "directml": { + "description": "Build DirectML support", + "supports": "windows" + }, "framework": { "description": "Build a macOS/iOS framework, Objective-C library", "supports": "osx | ios" }, + "kleidiai": { + "description": "Build kleidiai support", + "supports": "arm64", + "dependencies": [ + "kleidiai" + ] + }, "openvino": { "description": "Build with OpenVINO support", "supports": "!(osx | ios | android | emscripten)", @@ -105,6 +120,16 @@ ] } ] + }, + "winml": { + "description": "Build WinML support", + "supports": "windows" + }, + "xnnpack": { + "description": "Build xnnpack support", + "dependencies": [ + "xnnpack" + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 0f5afb1c386617..4c98ee82df2593 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7221,7 +7221,7 @@ "port-version": 0 }, "onnx": { - "baseline": "1.19.0", + "baseline": "1.21.0", "port-version": 0 }, "onnx-optimizer": { @@ -7229,7 +7229,7 @@ "port-version": 0 }, "onnxruntime": { - "baseline": "1.23.2", + "baseline": "1.24.4", "port-version": 0 }, "onnxruntime-gpu": { diff --git a/versions/o-/onnx.json b/versions/o-/onnx.json index 51c676203bd06f..dbc17c60abdad0 100644 --- a/versions/o-/onnx.json +++ b/versions/o-/onnx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "613e00a01012aaa58fb531d4e7f131b9c4bbd047", + "version-semver": "1.21.0", + "port-version": 0 + }, { "git-tree": "84490e57e9b50a233ec36469c49f064cb3f90822", "version-semver": "1.19.0", diff --git a/versions/o-/onnxruntime.json b/versions/o-/onnxruntime.json index 50037726b00ca3..30a40f936bb7aa 100644 --- a/versions/o-/onnxruntime.json +++ b/versions/o-/onnxruntime.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19de51b2f50df9c38ae948880b093fbaa6fd8f46", + "version-semver": "1.24.4", + "port-version": 0 + }, { "git-tree": "7391737791bbf21b648ab4e95521f31fdf502d59", "version-semver": "1.23.2",