Skip to content

Commit a33152e

Browse files
committed
Remove nanobind and protobuf from git submodule and use onnx's
1 parent 63b3f5e commit a33152e

File tree

4 files changed

+2
-10
lines changed

4 files changed

+2
-10
lines changed

.gitmodules

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
[submodule "third_party/onnx"]
22
path = third_party/onnx
33
url = https://github.com/onnx/onnx.git
4-
[submodule "third_party/protobuf"]
5-
path = third_party/protobuf
6-
url = https://github.com/protocolbuffers/protobuf.git
7-
[submodule "third_party/nanobind"]
8-
path = third_party/nanobind
9-
url = https://github.com/wjakob/nanobind.git

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ option(ONNX_OPT_USE_SYSTEM_PROTOBUF "" OFF)
2727
if(NOT ONNX_OPT_USE_SYSTEM_PROTOBUF)
2828
option(protobuf_BUILD_TESTS "" OFF)
2929
option(protobuf_MSVC_STATIC_RUNTIME "" ${ONNX_USE_MSVC_STATIC_RUNTIME})
30-
add_subdirectory_if_no_target(${PROJECT_SOURCE_DIR}/third_party/protobuf libprotobuf)
30+
set(protobuf_FORCE_FETCH_DEPENDENCIES ON)
31+
set(ONNX_BUILD_CUSTOM_PROTOBUF ON)
3132
endif()
3233

3334

@@ -71,7 +72,6 @@ if(ONNX_BUILD_PYTHON)
7172
Python 3
7273
REQUIRED COMPONENTS Interpreter Development.Module
7374
OPTIONAL_COMPONENTS Development.SABIModule)
74-
add_subdirectory(third_party/nanobind EXCLUDE_FROM_ALL)
7575
nanobind_add_module(onnx_opt_cpp2py_export "onnxoptimizer/cpp2py_export.cc" STABLE_ABI)
7676
target_link_libraries(onnx_opt_cpp2py_export PRIVATE onnx_optimizer)
7777
endif()

third_party/nanobind

Lines changed: 0 additions & 1 deletion
This file was deleted.

third_party/protobuf

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)