Skip to content

Bump up ONNX for scikit-build-core support #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
take-cheeze wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Bump up ONNX for scikit-build-core support #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f98cff8
Bump up ONNX for scikit-build-core support
take-cheeze Jun 1, 2026
39ff230
Bump and fix name
take-cheeze Jun 1, 2026
8281b43
Fix header includes in tensor_util.cc
take-cheeze Jun 1, 2026
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
50 changes: 26 additions & 24 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion onnxoptimizer/passes/tensor_util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// ATTENTION: The code in this file is highly EXPERIMENTAL.
// Adventurous users should note that the APIs will probably change.

#include <algorithm>
#include <numeric>

#include "onnx/common/platform_helpers.h"
#include "onnxoptimizer/passes/tensor_util.h"
Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tests/test_simple.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Copy Markdown
Member

@justinchuby justinchuby Jun 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems strange. onnx::Status seems to be the right name we should expose. Was there anything that was changed or need fixing in onnx?

Copy link
Copy Markdown
Member Author

@take-cheeze take-cheeze Jun 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be caused by https://github.com/onnx/onnx/pull/7622/changes#diff-c2cee98ca3f270d79c2ef075c84960941a092b896dbfae881092a0c79b1b0d7eL20
cpplint seems to warn it: https://github.com/cpplint/cpplint/blob/fa09262f61706cad2aacc0a0e1f1f3bf06a3b042/cpplint.py#L6213

EXPECT_TRUE(status.IsOK());
auto optimized_model = onnx::optimization::Optimize(model, {"eliminate_nop_reshape", "eliminate_deadend"});

Expand Down
2 changes: 1 addition & 1 deletion third_party/onnx
Open in desktop
Submodule onnx updated 1049 files
Loading