diff --git a/ports/onnx-optimizer/fix-cmakelists.patch b/ports/onnx-optimizer/fix-cmake.patch similarity index 82% rename from ports/onnx-optimizer/fix-cmakelists.patch rename to ports/onnx-optimizer/fix-cmake.patch index b87000f690..386913fbcd 100644 --- a/ports/onnx-optimizer/fix-cmakelists.patch +++ b/ports/onnx-optimizer/fix-cmake.patch @@ -1,23 +1,22 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0063385..f1522bc 100644 +index 710288a8..91d5579b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -10,6 +10,10 @@ project(onnx_optimizer C CXX) +@@ -10,6 +10,9 @@ project(onnx_optimizer C CXX) set(CMAKE_CXX_STANDARD 17) +function(add_msvc_runtime_flag lib) -+ # Dummy function to mock embedded ONNX project build. Let CMake decide /MT, /MD, /MTd, /MDd, etc. +endfunction() + set(CMAKE_POSITION_INDEPENDENT_CODE ON) include(cmake/utils.cmake) -@@ -23,12 +32,10 @@ option(ONNX_OPT_USE_SYSTEM_PROTOBUF "" OFF) +@@ -27,12 +30,10 @@ option(ONNX_OPT_USE_SYSTEM_PROTOBUF "" OFF) if(NOT ONNX_OPT_USE_SYSTEM_PROTOBUF) option(protobuf_BUILD_TESTS "" OFF) option(protobuf_MSVC_STATIC_RUNTIME "" ${ONNX_USE_MSVC_STATIC_RUNTIME}) -- add_subdirectory_if_no_target(${PROJECT_SOURCE_DIR}/third_party/protobuf/cmake libprotobuf) +- add_subdirectory_if_no_target(${PROJECT_SOURCE_DIR}/third_party/protobuf libprotobuf) endif() - @@ -28,7 +27,7 @@ index 0063385..f1522bc 100644 file(READ "${PROJECT_SOURCE_DIR}/VERSION_NUMBER" ONNX_OPTIMIZER_VERSION) string(STRIP "${ONNX_OPTIMIZER_VERSION}" ONNX_OPTIMIZER_VERSION) -@@ -41,7 +48,7 @@ file(GLOB onnx_opt_srcs "onnxoptimizer/*.cc" +@@ -45,7 +46,7 @@ file(GLOB onnx_opt_srcs CONFIGURE_DEPENDS "onnxoptimizer/*.cc" list(REMOVE_ITEM onnx_opt_srcs "${PROJECT_SOURCE_DIR}/onnxoptimizer/cpp2py_export.cc") onnxopt_add_library(onnx_optimizer ${onnx_opt_srcs}) @@ -37,27 +36,31 @@ index 0063385..f1522bc 100644 target_include_directories(onnx_optimizer PUBLIC $ $ -diff --git a/cmake/utils.cmake b/cmake/utils.cmake -index 6cca9f3..9d79f1a 100644 ---- a/cmake/utils.cmake -+++ b/cmake/utils.cmake -@@ -1,5 +1,3 @@ --include(${PROJECT_SOURCE_DIR}/third_party/onnx/cmake/Utils.cmake) -- - # Poor man's FetchContent - function(add_subdirectory_if_no_target dir target) - if (NOT TARGET ${target}) diff --git a/cmake/ONNXOptimizerConfig.cmake.in b/cmake/ONNXOptimizerConfig.cmake.in -index 72dcc88..c5639c8 100644 +index 72dcc88d..2af23cba 100644 --- a/cmake/ONNXOptimizerConfig.cmake.in +++ b/cmake/ONNXOptimizerConfig.cmake.in -@@ -3,6 +3,9 @@ +@@ -3,6 +3,10 @@ # ONNX_OPTIMIZER_INCLUDE_DIRS - include directories for onnx optimizer # as well as ONNX Optimizer targets for other cmake libraries to use. +include(CMakeFindDependencyMacro) +find_dependency(protobuf CONFIG) +find_dependency(ONNX CONFIG) ++ # library version information set(ONNX_OPTIMIZER_VERSION "@ONNX_OPTIMIZER_VERSION@") +diff --git a/cmake/utils.cmake b/cmake/utils.cmake +index 075f55f5..d351cd6f 100644 +--- a/cmake/utils.cmake ++++ b/cmake/utils.cmake +@@ -2,8 +2,6 @@ + # + # SPDX-License-Identifier: Apache-2.0 + +-include(${PROJECT_SOURCE_DIR}/third_party/onnx/cmake/Utils.cmake) +- + # Poor man's FetchContent + function(add_subdirectory_if_no_target dir target) + if (NOT TARGET ${target}) diff --git a/ports/onnx-optimizer/fix-pr-201.patch b/ports/onnx-optimizer/fix-pr-201.patch deleted file mode 100644 index c7772ab9c8..0000000000 --- a/ports/onnx-optimizer/fix-pr-201.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5f2b5d6..0db568b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,7 +40,7 @@ find_package(ONNX CONFIG REQUIRED) - file(READ "${PROJECT_SOURCE_DIR}/VERSION_NUMBER" ONNX_OPTIMIZER_VERSION) - string(STRIP "${ONNX_OPTIMIZER_VERSION}" ONNX_OPTIMIZER_VERSION) - --file(GLOB onnx_opt_srcs "onnxoptimizer/*.cc" -+file(GLOB onnx_opt_srcs CONFIGURE_DEPENDS "onnxoptimizer/*.cc" - "onnxoptimizer/*.h" - "onnxoptimizer/passes/*.cc" - "onnxoptimizer/passes/*.h" -@@ -58,7 +58,7 @@ onnxopt_add_executable(onnx_optimizer_exec examples/onnx_optimizer_exec.cpp) - target_link_libraries(onnx_optimizer_exec onnx_optimizer) - - --file(GLOB onnx_opt_c_api_srcs "onnxoptimizer/c_api/*.cc" -+file(GLOB onnx_opt_c_api_srcs CONFIGURE_DEPENDS "onnxoptimizer/c_api/*.cc" - "onnxoptimizer/c_api/*.h" - ) - -diff --git a/onnxoptimizer/pass_registry.h b/onnxoptimizer/pass_registry.h -index b8dc26f..e8f0faa 100644 ---- a/onnxoptimizer/pass_registry.h -+++ b/onnxoptimizer/pass_registry.h -@@ -9,6 +9,7 @@ - - #include - #include -+#include - - #include "onnx/common/ir.h" - #include "onnx/common/ir_pb_converter.h" -diff --git a/onnxoptimizer/passes/fuse_add_bias_into_conv.h b/onnxoptimizer/passes/fuse_add_bias_into_conv.h -index b4696b5..dea0369 100644 ---- a/onnxoptimizer/passes/fuse_add_bias_into_conv.h -+++ b/onnxoptimizer/passes/fuse_add_bias_into_conv.h -@@ -134,7 +134,7 @@ struct FuseAddBiasIntoConv final : public PredicateBasedPass { - t.elem_type() = TensorProto_DataType_INT64; - Symbol sym = Symbol("value"); - constant->t_(sym, t); -- std::vector s = {1}; -+ std::vector s{Dimension{1}}; - constant->output()->setSizes(s); - constant->output()->setElemType(TensorProto_DataType_INT64); - constant->insertBefore(orig_conv->node()); diff --git a/ports/onnx-optimizer/portfile.cmake b/ports/onnx-optimizer/portfile.cmake index d19e92a2b2..93bdbda77c 100644 --- a/ports/onnx-optimizer/portfile.cmake +++ b/ports/onnx-optimizer/portfile.cmake @@ -4,11 +4,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onnx/optimizer REF "v${VERSION}" - SHA512 552d6fa261c3ce2db2e0938a5b5261676335bce9bd828b46a1e2631f3b362c748ae9a6cfe7d62072fc3774b3f506bc54aa5827b52241e6f48d78a08dea1d9316 + SHA512 ed9844c3ff30406e28dd06fe8a2ed202f301aacdc2c489b5a77dfa7ce6f33647939a00a059a47a5d474797aca6396ceb28c403d4054ff3714c2f6388a34279bf HEAD_REF master PATCHES - fix-pr-201.patch # https://github.com/onnx/optimizer/pull/201 - fix-cmakelists.patch + fix-cmake.patch ) vcpkg_cmake_configure( diff --git a/ports/onnx-optimizer/vcpkg.json b/ports/onnx-optimizer/vcpkg.json index bb7d23f24d..c0022284cd 100644 --- a/ports/onnx-optimizer/vcpkg.json +++ b/ports/onnx-optimizer/vcpkg.json @@ -1,7 +1,6 @@ { "name": "onnx-optimizer", - "version-semver": "0.3.19", - "port-version": 2, + "version-semver": "0.4.2", "description": "Actively maintained ONNX Optimizer", "homepage": "https://github.com/onnx/optimizer", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index e2bc6c2782..597aedaf42 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7173,8 +7173,8 @@ "port-version": 0 }, "onnx-optimizer": { - "baseline": "0.3.19", - "port-version": 2 + "baseline": "0.4.2", + "port-version": 0 }, "onnxruntime": { "baseline": "1.23.2", diff --git a/versions/o-/onnx-optimizer.json b/versions/o-/onnx-optimizer.json index c2164745c5..40a5956e8a 100644 --- a/versions/o-/onnx-optimizer.json +++ b/versions/o-/onnx-optimizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35120e84574f3f7e98d5d318cf61eed45caef56d", + "version-semver": "0.4.2", + "port-version": 0 + }, { "git-tree": "046da6d30651c088a30d19ea72e5494c14f30edb", "version-semver": "0.3.19",