IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed explicit linkage to protobuf in ONNX (#18650)

Browse Source
This commit is contained in:
Ilya Lavrenov 2023-07-19 21:41:28 +04:00 committed by GitHub
parent 61504bbfc2
commit 9cd39455fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/frontends/onnx/onnx_common/CMakeLists.txt
View File

@ -23,18 +23,15 @@ set_target_properties(${TARGET_NAME} PROPERTIES
set(ONNX_COMMON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
set(ONNX_COMMON_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${ONNX_COMMON_INCLUDE_DIR}>
$<INSTALL_INTERFACE:${FRONTEND_INSTALL_INCLUDE}>)
target_include_directories(${TARGET_NAME}
PUBLIC $<BUILD_INTERFACE:${ONNX_COMMON_INCLUDE_DIR}>
$<INSTALL_INTERFACE:${FRONTEND_INSTALL_INCLUDE}>
PRIVATE ${ONNX_COMMON_SRC_DIR})
target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime)
if(ONNX_USE_LITE_PROTO)
link_system_libraries(${TARGET_NAME} PUBLIC onnx_proto onnx protobuf::libprotobuf-lite)
else()
link_system_libraries(${TARGET_NAME} PUBLIC onnx_proto onnx protobuf::libprotobuf)
endif()
link_system_libraries(${TARGET_NAME} PUBLIC onnx_proto onnx)
target_include_directories(${TARGET_NAME} PRIVATE ${ONNX_COMMON_SRC_DIR})
add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})
ov_install_static_lib(${TARGET_NAME} ${OV_CPACK_COMP_CORE})

2
src/frontends/onnx/onnx_common/src/utils.cpp
View File

@ -65,7 +65,7 @@ const std::map<element::Type_t, TensorProto_DataType> NG_2_ONNX_TYPES = {
{element::Type_t::boolean, TensorProto_DataType::TensorProto_DataType_BOOL}};
} // namespace
element::Type_t onnx_to_ng_data_type(const TensorProto_DataType& onnx_type) {
element::Type_t onnx_to_ng_data_type(const ONNX_NAMESPACE::TensorProto_DataType& onnx_type) {
const auto result =
std::find_if(NG_2_ONNX_TYPES.begin(),
NG_2_ONNX_TYPES.end(),

4
thirdparty/dependencies.cmake vendored
View File

@ -409,7 +409,9 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
if(ENABLE_SYSTEM_PROTOBUF)
# Note: Debian / Ubuntu / RHEL libprotobuf.a can only be used with -DBUILD_SHARED_LIBS=OFF
# because they are compiled without -fPIC
set(Protobuf_USE_STATIC_LIBS ON)
if(NOT DEFINED Protobuf_USE_STATIC_LIBS)
set(Protobuf_USE_STATIC_LIBS ON)
endif()
if(CMAKE_VERBOSE_MAKEFILE)
set(Protobuf_DEBUG ON)
endif()