Introduce dev_api for core component (#9571)
* Introduce dev_api for core component * Fixed CPU plugin for static build * Fixed comments
This commit is contained in:
Ilya Churaev
GitHub
parent
01689ee408
commit
e78ada1178
@ -65,6 +65,7 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
|
||||
# --------------- OpenVINO runtime library dev ------------------------------
|
||||
add_library(${TARGET_NAME}_dev INTERFACE)
|
||||
target_include_directories(${TARGET_NAME}_dev INTERFACE $<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/common/transformations/include>
|
||||
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/core/dev_api>
|
||||
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/inference/dev_api>
|
||||
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/common/low_precision_transformations/include>
|
||||
$<TARGET_PROPERTY:inference_engine_preproc,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
|
||||
@ -28,10 +28,6 @@ target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR}
|
||||
|
||||
add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
|
||||
|
||||
# Add include path to so_extension.hpp
|
||||
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/json_extension/json_config.cpp
|
||||
PROPERTIES INCLUDE_DIRECTORIES "${OpenVINO_SOURCE_DIR}/src/core/src/")
|
||||
|
||||
# developer package
|
||||
|
||||
openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME})
|
||||
|
||||
@ -46,6 +46,10 @@ set_source_files_properties(${MIXED_SRC}
|
||||
source_group("src" FILES ${LIBRARY_SRC})
|
||||
source_group("include" FILES ${PUBLIC_HEADERS})
|
||||
|
||||
# Create ov_core_dev library
|
||||
add_library(ov_core_dev INTERFACE)
|
||||
target_include_directories(ov_core_dev INTERFACE $<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/core/dev_api>)
|
||||
|
||||
# Create static or shared library depending on BUILD_SHARED_LIBS
|
||||
add_library(ngraph_obj OBJECT ${LIBRARY_SRC} ${PUBLIC_HEADERS} ${IE_SHARED_SRCS})
|
||||
|
||||
@ -57,7 +61,7 @@ ie_faster_build(ngraph_obj
|
||||
|
||||
addVersionDefines(src/version.cpp CI_BUILD_NUMBER)
|
||||
|
||||
target_link_libraries(ngraph_obj PRIVATE ngraph::builder ngraph::reference openvino::util pugixml::static ov_shape_inference)
|
||||
target_link_libraries(ngraph_obj PRIVATE ngraph::builder ngraph::reference openvino::util pugixml::static ov_shape_inference ov_core_dev)
|
||||
|
||||
ie_mark_target_as_cc(ngraph_obj)
|
||||
|
||||
|
||||
@ -411,10 +411,6 @@ set(SRC
|
||||
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/threading.cpp
|
||||
PROPERTIES INCLUDE_DIRECTORIES $<TARGET_PROPERTY:openvino::runtime::dev,INTERFACE_INCLUDE_DIRECTORIES>)
|
||||
|
||||
# Add include path to so_extension.hpp
|
||||
set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/extension.cpp
|
||||
APPEND PROPERTY INCLUDE_DIRECTORIES "${OpenVINO_SOURCE_DIR}/src/core/src/")
|
||||
|
||||
if(SUGGEST_OVERRIDE_SUPPORTED)
|
||||
set_source_files_properties(ov_tensor_test.cpp
|
||||
PROPERTIES COMPILE_OPTIONS -Wno-suggest-override)
|
||||
@ -581,8 +577,7 @@ target_link_libraries(ov_core_unit_tests PRIVATE ngraph_test_util
|
||||
${CMAKE_DL_LIBS}
|
||||
Threads::Threads
|
||||
openvino::conditional_compilation
|
||||
openvino::util
|
||||
frontend_common)
|
||||
openvino::runtime::dev)
|
||||
|
||||
# Protobuf-lite does not support parsing files from prototxt format
|
||||
# Since most of the onnx models are stored in this format it have to be disabled
|
||||
|
||||
@ -12,10 +12,6 @@ file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
|
||||
file(GLOB_RECURSE LIBRARY_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp)
|
||||
file(GLOB_RECURSE LIBRARY_PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp)
|
||||
|
||||
# Add include path to so_extension.hpp
|
||||
set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src/frontend.cpp
|
||||
APPEND PROPERTY INCLUDE_DIRECTORIES "${OpenVINO_SOURCE_DIR}/src/core/src/")
|
||||
|
||||
set(FRONTEND_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
|
||||
|
||||
source_group("src" FILES ${LIBRARY_SRC})
|
||||
@ -41,7 +37,7 @@ if(NOT BUILD_SHARED_LIBS)
|
||||
target_compile_definitions(${TARGET_NAME}_obj PUBLIC OPENVINO_STATIC_LIBRARY)
|
||||
endif()
|
||||
|
||||
target_link_libraries(${TARGET_NAME}_obj PRIVATE openvino::util)
|
||||
target_link_libraries(${TARGET_NAME}_obj PRIVATE openvino::util ov_core_dev)
|
||||
|
||||
set_property(SOURCE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/plugin_loader.cpp
|
||||
|
||||
@ -7,7 +7,3 @@ ov_add_frontend(NAME ir
|
||||
LINK_LIBRARIES pugixml::static
|
||||
# TODO: remove dependency below in CVS-69781
|
||||
openvino::runtime::dev)
|
||||
|
||||
# Add include path to so_extension.hpp
|
||||
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/frontend.cpp
|
||||
PROPERTIES INCLUDE_DIRECTORIES "${OpenVINO_SOURCE_DIR}/src/core/src/")
|
||||
|
||||
@ -12,10 +12,6 @@ file (GLOB LIBRARY_SRC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/cpp_interfaces/interface/*.cpp
|
||||
)
|
||||
|
||||
# Add include path to so_extension.hpp
|
||||
set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src/ie_core.cpp
|
||||
APPEND PROPERTY INCLUDE_DIRECTORIES "${OpenVINO_SOURCE_DIR}/src/core/src/")
|
||||
|
||||
# TODO: WA for OneHot pass usage in reshape
|
||||
set(LEGACY_SRC_ROOT "${OpenVINO_SOURCE_DIR}/src/common/legacy/src")
|
||||
set(LEGACY_LIBRARY_SHARED_SRCS
|
||||
@ -144,7 +140,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DI
|
||||
$<TARGET_PROPERTY:${TARGET_NAME}_transformations,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>)
|
||||
|
||||
target_link_libraries(${TARGET_NAME}_obj PRIVATE openvino::itt openvino::util)
|
||||
target_link_libraries(${TARGET_NAME}_obj PRIVATE openvino::itt openvino::util ov_core_dev)
|
||||
|
||||
set_ie_threading_interface_for(${TARGET_NAME}_obj)
|
||||
if (TBBBIND_2_5_FOUND)
|
||||
|
||||
@ -66,30 +66,31 @@ ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
|
||||
|
||||
# add test object library
|
||||
|
||||
add_library(${TARGET_NAME}_obj OBJECT ${SOURCES} ${HEADERS})
|
||||
link_system_libraries(${TARGET_NAME}_obj PUBLIC mkldnn)
|
||||
if(BUILD_SHARED_LIBS)
|
||||
add_library(${TARGET_NAME}_obj OBJECT ${SOURCES} ${HEADERS})
|
||||
link_system_libraries(${TARGET_NAME}_obj PUBLIC mkldnn)
|
||||
|
||||
target_include_directories(${TARGET_NAME}_obj PRIVATE $<TARGET_PROPERTY:inference_engine_preproc_s,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:openvino::runtime::dev,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:openvino::itt,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:ov_shape_inference,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:inference_engine_snippets,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||
$<TARGET_PROPERTY:openvino::conditional_compilation,INTERFACE_INCLUDE_DIRECTORIES>)
|
||||
target_include_directories(${TARGET_NAME}_obj PRIVATE $<TARGET_PROPERTY:inference_engine_preproc_s,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:openvino::runtime::dev,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:openvino::itt,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:ov_shape_inference,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:inference_engine_snippets,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||
$<TARGET_PROPERTY:openvino::conditional_compilation,INTERFACE_INCLUDE_DIRECTORIES>)
|
||||
|
||||
target_include_directories(${TARGET_NAME}_obj SYSTEM PUBLIC $<TARGET_PROPERTY:mkldnn,INCLUDE_DIRECTORIES>)
|
||||
target_include_directories(${TARGET_NAME}_obj SYSTEM PUBLIC $<TARGET_PROPERTY:mkldnn,INCLUDE_DIRECTORIES>)
|
||||
|
||||
set_ie_threading_interface_for(${TARGET_NAME}_obj)
|
||||
set_ie_threading_interface_for(${TARGET_NAME}_obj)
|
||||
|
||||
target_compile_definitions(${TARGET_NAME}_obj PRIVATE
|
||||
USE_STATIC_IE IMPLEMENT_INFERENCE_ENGINE_PLUGIN IMPLEMENT_INFERENCE_EXTENSION_API
|
||||
$<TARGET_PROPERTY:ngraph,INTERFACE_COMPILE_DEFINITIONS>
|
||||
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_COMPILE_DEFINITIONS>
|
||||
)
|
||||
target_compile_definitions(${TARGET_NAME}_obj PRIVATE
|
||||
USE_STATIC_IE IMPLEMENT_INFERENCE_ENGINE_PLUGIN IMPLEMENT_INFERENCE_EXTENSION_API
|
||||
$<TARGET_PROPERTY:ngraph,INTERFACE_COMPILE_DEFINITIONS>
|
||||
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_COMPILE_DEFINITIONS>
|
||||
)
|
||||
|
||||
set_target_properties(${TARGET_NAME}_obj PROPERTIES EXCLUDE_FROM_ALL ON)
|
||||
set_target_properties(${TARGET_NAME}_obj PROPERTIES EXCLUDE_FROM_ALL ON)
|
||||
|
||||
# LTO
|
||||
|
||||
set_target_properties(${TARGET_NAME} ${TARGET_NAME}_obj
|
||||
PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
|
||||
# LTO
|
||||
set_target_properties(${TARGET_NAME} ${TARGET_NAME}_obj
|
||||
PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
|
||||
endif()
|
||||
|
||||
@ -4,6 +4,10 @@
|
||||
|
||||
set(TARGET_NAME cpuUnitTests)
|
||||
|
||||
if(BUILD_SHARED_LIBS)
|
||||
set (OBJ_LIB $<TARGET_OBJECTS:ov_intel_cpu_plugin_obj>)
|
||||
endif()
|
||||
|
||||
addIeTargetTest(
|
||||
NAME ${TARGET_NAME}
|
||||
ROOT ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
@ -12,7 +16,7 @@ addIeTargetTest(
|
||||
$<TARGET_PROPERTY:ov_intel_cpu_plugin,SOURCE_DIR>/src/nodes
|
||||
$<TARGET_PROPERTY:openvino::conditional_compilation,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
OBJECT_FILES
|
||||
$<TARGET_OBJECTS:ov_intel_cpu_plugin_obj>
|
||||
${OBJ_LIB}
|
||||
LINK_LIBRARIES
|
||||
gtest
|
||||
gtest_main
|
||||
|
||||
Loading…
Reference in New Issue
Block a user