From f98cff8cfff3a9060203a9d99f9438ffce897141 Mon Sep 17 00:00:00 2001 From: take-cheeze Date: Mon, 1 Jun 2026 13:39:03 +0900 Subject: [PATCH 1/3] Bump up ONNX for scikit-build-core support Signed-off-by: take-cheeze --- CMakeLists.txt | 50 +++++++++++++++++++++++++----------------------- setup.py | 1 + third_party/onnx | 2 +- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b2474401..efcaafc8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,30 +79,32 @@ if(ONNX_BUILD_PYTHON) target_link_libraries(onnx_opt_cpp2py_export PRIVATE onnx_optimizer) endif() -include(GNUInstallDirs) - -install(DIRECTORY ${PROJECT_SOURCE_DIR}/onnxoptimizer - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h") - -configure_file( - ${PROJECT_SOURCE_DIR}/cmake/ONNXOptimizerConfigVersion.cmake.in - ${PROJECT_BINARY_DIR}/ONNXOptimizerConfigVersion.cmake - @ONLY) -configure_file( - ${PROJECT_SOURCE_DIR}/cmake/ONNXOptimizerConfig.cmake.in - ${PROJECT_BINARY_DIR}/ONNXOptimizerConfig.cmake - @ONLY) -install(FILES - ${PROJECT_BINARY_DIR}/ONNXOptimizerConfigVersion.cmake - ${PROJECT_BINARY_DIR}/ONNXOptimizerConfig.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ONNXOptimizer - COMPONENT dev) -install(EXPORT ONNXOptimizerTargets DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/ONNXOptimizer") -install(TARGETS - onnx_optimizer onnx_optimizer_c_api - EXPORT ONNXOptimizerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}) +if(ONNX_INSTALL) + include(GNUInstallDirs) + + install(DIRECTORY ${PROJECT_SOURCE_DIR}/onnxoptimizer + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h") + + configure_file( + ${PROJECT_SOURCE_DIR}/cmake/ONNXOptimizerConfigVersion.cmake.in + ${PROJECT_BINARY_DIR}/ONNXOptimizerConfigVersion.cmake + @ONLY) + configure_file( + ${PROJECT_SOURCE_DIR}/cmake/ONNXOptimizerConfig.cmake.in + ${PROJECT_BINARY_DIR}/ONNXOptimizerConfig.cmake + @ONLY) + install(FILES + ${PROJECT_BINARY_DIR}/ONNXOptimizerConfigVersion.cmake + ${PROJECT_BINARY_DIR}/ONNXOptimizerConfig.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ONNXOptimizer + COMPONENT dev) + install(EXPORT ONNXOptimizerTargets DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/ONNXOptimizer") + install(TARGETS + onnx_optimizer onnx_optimizer_c_api + EXPORT ONNXOptimizerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}) +endif() if(ONNX_BUILD_TESTS) enable_testing() diff --git a/setup.py b/setup.py index f48573709..eb7a9e472 100644 --- a/setup.py +++ b/setup.py @@ -163,6 +163,7 @@ def run(self): f"-DPython_EXECUTABLE={sys.executable}", "-DONNX_BUILD_PYTHON=ON", "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON", + "-DONNX_INSTALL=OFF", f"-DONNX_NAMESPACE={ONNX_NAMESPACE}", "-DONNX_OPT_USE_SYSTEM_PROTOBUF={}".format( "ON" if ONNX_OPT_USE_SYSTEM_PROTOBUF else "OFF" diff --git a/third_party/onnx b/third_party/onnx index 78925bf78..285ceb832 160000 --- a/third_party/onnx +++ b/third_party/onnx @@ -1 +1 @@ -Subproject commit 78925bf78b1bf61a3924b40bee652d4bcdba12f1 +Subproject commit 285ceb8322691a6034dd80a6e210b2c6564ec48e From 39ff23007ce96bcf35692a45624a4a6bcaf63212 Mon Sep 17 00:00:00 2001 From: take-cheeze Date: Mon, 1 Jun 2026 16:36:56 +0900 Subject: [PATCH 2/3] Bump and fix name Signed-off-by: take-cheeze --- tests/test_simple.cc | 2 +- third_party/onnx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_simple.cc b/tests/test_simple.cc index 649497d30..9572eeff9 100644 --- a/tests/test_simple.cc +++ b/tests/test_simple.cc @@ -20,7 +20,7 @@ TEST(OptimizerTest, NopReshape) { } )"; onnx::ModelProto model; - const onnx::Status status = onnx::OnnxParser::Parse(model, graph_str); + const onnx::Common::Status status = onnx::OnnxParser::Parse(model, graph_str); EXPECT_TRUE(status.IsOK()); auto optimized_model = onnx::optimization::Optimize(model, {"eliminate_nop_reshape", "eliminate_deadend"}); diff --git a/third_party/onnx b/third_party/onnx index 285ceb832..8847da48f 160000 --- a/third_party/onnx +++ b/third_party/onnx @@ -1 +1 @@ -Subproject commit 285ceb8322691a6034dd80a6e210b2c6564ec48e +Subproject commit 8847da48ff3bcf9314cdebb1a44114f723a8de4d From 8281b436ddab09c30387f4e0dfefd0219976ce0b Mon Sep 17 00:00:00 2001 From: take-cheeze Date: Mon, 1 Jun 2026 16:51:30 +0900 Subject: [PATCH 3/3] Fix header includes in tensor_util.cc Signed-off-by: take-cheeze --- onnxoptimizer/passes/tensor_util.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onnxoptimizer/passes/tensor_util.cc b/onnxoptimizer/passes/tensor_util.cc index 6f3849c2b..17c01eb3b 100644 --- a/onnxoptimizer/passes/tensor_util.cc +++ b/onnxoptimizer/passes/tensor_util.cc @@ -5,7 +5,7 @@ // ATTENTION: The code in this file is highly EXPERIMENTAL. // Adventurous users should note that the APIs will probably change. -#include +#include #include "onnx/common/platform_helpers.h" #include "onnxoptimizer/passes/tensor_util.h"