From c1c8657cf93f14a00f5b606310b9da1750433e0b Mon Sep 17 00:00:00 2001 From: Ilya Churaev Date: Wed, 4 Aug 2021 07:43:13 +0300 Subject: [PATCH] Use original onnx (#6673) * Merged ONNX editor and ONNX importer to the one folder * Try to migrate to original ONNX * Remove ONNX_BUILD_SHARED_LIBS * Update ONNX --- .gitmodules | 2 +- thirdparty/onnx/CMakeLists.txt | 1 - thirdparty/onnx/onnx | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index d3f72b54c4f9c5..8aae5ad4da3d6d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,7 +40,7 @@ ignore = dirty [submodule "thirdparty/onnx"] path = thirdparty/onnx/onnx - url = https://github.com/openvinotoolkit/onnx.git + url = https://github.com/onnx/onnx.git [submodule "thirdparty/protobuf"] path = thirdparty/protobuf/protobuf url = https://github.com/protocolbuffers/protobuf.git diff --git a/thirdparty/onnx/CMakeLists.txt b/thirdparty/onnx/CMakeLists.txt index 7915f5c4c71eae..8c9d8b6e8c60bb 100644 --- a/thirdparty/onnx/CMakeLists.txt +++ b/thirdparty/onnx/CMakeLists.txt @@ -19,7 +19,6 @@ macro(onnx_set_target_properties) target_include_directories(onnx_proto SYSTEM PRIVATE "${Protobuf_INCLUDE_DIRS}") ov_disable_all_warnings(onnx onnx_proto) - target_compile_definitions(onnx PUBLIC ONNX_BUILD_SHARED_LIBS) endmacro() set(ONNX_USE_PROTOBUF_SHARED_LIBS ${BUILD_SHARED_LIBS} CACHE BOOL "Use dynamic protobuf by ONNX library" FORCE) diff --git a/thirdparty/onnx/onnx b/thirdparty/onnx/onnx index 0807930c7f46f3..685898bc6f3fd6 160000 --- a/thirdparty/onnx/onnx +++ b/thirdparty/onnx/onnx @@ -1 +1 @@ -Subproject commit 0807930c7f46f3bac1f520c4a2e78710aa5d0af7 +Subproject commit 685898bc6f3fd6eb16ba129ea990f96330537e38