diff --git a/WORKSPACE b/WORKSPACE index 1dc1401d..9fc1cbdc 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -43,10 +43,9 @@ new_git_repository( name="onnx_runtime", branch= "rel-1.14.0", build_file = "//bazel:onnxruntime.BUILD", - init_submodules= 1, - recursive_init_submodules= 1, remote= "https://github.com/microsoft/onnxruntime", patches=["//bazel:onnx.patch"], + patch_cmds= ["git submodule sync && git submodule foreach 'git fetch --tags' && git submodule update --init --remote"] ) new_git_repository( diff --git a/bazel/onnx.patch b/bazel/onnx.patch index 1afbddb2..121a941d 100644 --- a/bazel/onnx.patch +++ b/bazel/onnx.patch @@ -10,3 +10,31 @@ index 88b46890b7..d090499971 100644 list(POP_BACK __cmake_fcCurrentNameStack __cmake_contentNameLower __cmake_contentName + +diff --git a/.gitmodules b/.gitmodules +index 8e4217162b..bb63b7d9c5 100644 +--- .gitmodules ++++ .gitmodules +@@ -1,9 +1,11 @@ + [submodule "cmake/external/protobuf"] + path = cmake/external/protobuf + url = https://github.com/protocolbuffers/protobuf.git ++ branch = 22.x + [submodule "cmake/external/onnx"] + path = cmake/external/onnx + url = https://github.com/onnx/onnx.git ++ branch = rel-1.13.0 + [submodule "cmake/external/eigen"] + path = cmake/external/eigen + url = https://gitlab.com/libeigen/eigen.git +@@ -13,7 +15,8 @@ + [submodule "cmake/external/emsdk"] + path = cmake/external/emsdk + url = https://github.com/emscripten-core/emsdk.git +- branch = 3.1.19 ++ tag = 3.1.19 + [submodule "cmake/external/onnxruntime-extensions"] + path = cmake/external/onnxruntime-extensions + url = https://github.com/microsoft/onnxruntime-extensions.git ++ branch = rel-0.7 + diff --git a/cmake/onnx.patch b/cmake/onnx.patch index 1fb20095..070db79f 100644 --- a/cmake/onnx.patch +++ b/cmake/onnx.patch @@ -10,3 +10,33 @@ index 88b46890b7..d090499971 100644 list(POP_BACK __cmake_fcCurrentNameStack __cmake_contentNameLower __cmake_contentName + +diff --git a/.gitmodules b/.gitmodules +index 8e4217162b..bb63b7d9c5 100644 +--- a/.gitmodules ++++ b/.gitmodules +@@ -1,9 +1,11 @@ + [submodule "cmake/external/protobuf"] + path = cmake/external/protobuf + url = https://github.com/protocolbuffers/protobuf.git ++ branch = 22.x + [submodule "cmake/external/onnx"] + path = cmake/external/onnx + url = https://github.com/onnx/onnx.git ++ branch = rel-1.13.1 + [submodule "cmake/external/eigen"] + path = cmake/external/eigen + url = https://gitlab.com/libeigen/eigen.git +@@ -13,7 +15,8 @@ + [submodule "cmake/external/emsdk"] + path = cmake/external/emsdk + url = https://github.com/emscripten-core/emsdk.git +- branch = 3.1.19 ++ tag = 3.1.19 + [submodule "cmake/external/onnxruntime-extensions"] + path = cmake/external/onnxruntime-extensions + url = https://github.com/microsoft/onnxruntime-extensions.git ++ branch = rel-0.7 + + + diff --git a/cmake/onnxruntime.cmake b/cmake/onnxruntime.cmake index 20347b60..c1948d7a 100644 --- a/cmake/onnxruntime.cmake +++ b/cmake/onnxruntime.cmake @@ -12,7 +12,7 @@ ExternalProject_Add( GIT_REPOSITORY https://github.com/microsoft/onnxruntime GIT_TAG origin/rel-1.14.0 SOURCE_DIR ${DEP_ROOT_DIR}/${ONNX_NAME} - PATCH_COMMAND cd ${DEP_ROOT_DIR}/${ONNX_NAME} && git apply ${CMAKE_CURRENT_SOURCE_DIR}/cmake/onnx.patch || git apply ${CMAKE_CURRENT_SOURCE_DIR}/cmake/onnx.patch -R --check + PATCH_COMMAND cd ${DEP_ROOT_DIR}/${ONNX_NAME} && git apply ${CMAKE_CURRENT_SOURCE_DIR}/cmake/onnx.patch || git apply ${CMAKE_CURRENT_SOURCE_DIR}/cmake/onnx.patch -R --check && git submodule sync && git submodule foreach 'git fetch --tags' && git submodule update --init --remote BINARY_DIR ${DEP_ROOT_DIR}/${ONNX_NAME}-build CONFIGURE_COMMAND ${CMAKE_COMMAND} ${DEP_ROOT_DIR}/${ONNX_NAME}/cmake -B${DEP_ROOT_DIR}/${ONNX_NAME}-build -Donnxruntime_RUN_ONNX_TESTS=OFF -Donnxruntime_GENERATE_TEST_REPORTS=ON -Donnxruntime_USE_MIMALLOC=OFF -Donnxruntime_ENABLE_PYTHON=OFF -Donnxruntime_BUILD_CSHARP=OFF -Donnxruntime_BUILD_JAVA=OFF -Donnxruntime_BUILD_NODEJS=OFF -Donnxruntime_BUILD_OBJC=OFF -Donnxruntime_BUILD_SHARED_LIB=OFF -Donnxruntime_BUILD_APPLE_FRAMEWORK=OFF -Donnxruntime_USE_DNNL=OFF -Donnxruntime_USE_NNAPI_BUILTIN=OFF -Donnxruntime_USE_RKNPU=OFF -Donnxruntime_USE_LLVM=OFF -Donnxruntime_ENABLE_MICROSOFT_INTERNAL=OFF -Donnxruntime_USE_VITISAI=OFF -Donnxruntime_USE_TENSORRT=OFF -Donnxruntime_SKIP_AND_PERFORM_FILTERED_TENSORRT_TESTS=ON -Donnxruntime_USE_TENSORRT_BUILTIN_PARSER=OFF -Donnxruntime_TENSORRT_PLACEHOLDER_BUILDER=OFF -Donnxruntime_USE_TVM=OFF -Donnxruntime_TVM_CUDA_RUNTIME=OFF -Donnxruntime_TVM_USE_HASH=OFF -Donnxruntime_USE_MIGRAPHX=OFF -Donnxruntime_CROSS_COMPILING=OFF -Donnxruntime_DISABLE_CONTRIB_OPS=OFF -Donnxruntime_DISABLE_ML_OPS=OFF -Donnxruntime_DISABLE_RTTI=OFF -Donnxruntime_DISABLE_EXCEPTIONS=OFF -Donnxruntime_MINIMAL_BUILD=OFF -Donnxruntime_EXTENDED_MINIMAL_BUILD=OFF -Donnxruntime_MINIMAL_BUILD_CUSTOM_OPS=OFF -Donnxruntime_REDUCED_OPS_BUILD=OFF -Donnxruntime_ENABLE_LANGUAGE_INTEROP_OPS=OFF -Donnxruntime_USE_DML=OFF -Donnxruntime_USE_WINML=OFF -Donnxruntime_BUILD_MS_EXPERIMENTAL_OPS=OFF -Donnxruntime_USE_TELEMETRY=OFF -Donnxruntime_ENABLE_LTO=OFF -Donnxruntime_USE_ACL=OFF -Donnxruntime_USE_ACL_1902=OFF -Donnxruntime_USE_ACL_1905=OFF -Donnxruntime_USE_ACL_1908=OFF -Donnxruntime_USE_ACL_2002=OFF -Donnxruntime_USE_ARMNN=OFF -Donnxruntime_ARMNN_RELU_USE_CPU=ON -Donnxruntime_ARMNN_BN_USE_CPU=ON -Donnxruntime_ENABLE_NVTX_PROFILE=OFF -Donnxruntime_ENABLE_TRAINING=OFF -Donnxruntime_ENABLE_TRAINING_OPS=OFF -Donnxruntime_ENABLE_TRAINING_APIS=OFF -Donnxruntime_ENABLE_CPU_FP16_OPS=OFF -Donnxruntime_USE_NCCL=OFF -Donnxruntime_BUILD_BENCHMARKS=OFF -Donnxruntime_USE_ROCM=OFF -Donnxruntime_GCOV_COVERAGE=OFF -Donnxruntime_USE_MPI=ON -Donnxruntime_ENABLE_MEMORY_PROFILE=OFF -Donnxruntime_ENABLE_CUDA_LINE_NUMBER_INFO=OFF -Donnxruntime_BUILD_WEBASSEMBLY=OFF -Donnxruntime_BUILD_WEBASSEMBLY_STATIC_LIB=OFF -Donnxruntime_ENABLE_WEBASSEMBLY_EXCEPTION_CATCHING=ON -Donnxruntime_ENABLE_WEBASSEMBLY_API_EXCEPTION_CATCHING=OFF -Donnxruntime_ENABLE_WEBASSEMBLY_EXCEPTION_THROWING=ON -Donnxruntime_ENABLE_WEBASSEMBLY_THREADS=OFF -Donnxruntime_ENABLE_WEBASSEMBLY_DEBUG_INFO=OFF -Donnxruntime_ENABLE_WEBASSEMBLY_PROFILING=OFF -Donnxruntime_ENABLE_EAGER_MODE=OFF -Donnxruntime_ENABLE_LAZY_TENSOR=OFF -Donnxruntime_ENABLE_EXTERNAL_CUSTOM_OP_SCHEMAS=OFF -Donnxruntime_ENABLE_CUDA_PROFILING=OFF -Donnxruntime_ENABLE_ROCM_PROFILING=OFF -Donnxruntime_USE_XNNPACK=OFF -Donnxruntime_USE_CANN=OFF -DCMAKE_TLS_VERIFY=ON -DFETCHCONTENT_QUIET=OFF -Donnxruntime_PYBIND_EXPORT_OPSCHEMA=OFF -Donnxruntime_ENABLE_MEMLEAK_CHECKER=OFF -DCMAKE_BUILD_TYPE=Release BUILD_COMMAND ${CMAKE_COMMAND} --build ${DEP_ROOT_DIR}/${ONNX_NAME}-build --config Release -- -j8