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

Renamed / removed legacy cmake targets (#22307) 

* Removed legacy cmake targets

* Renamed ngraph_obj

* Rename onference_engine targets
This commit is contained in:
Ilya Lavrenov 2024-01-22 22:18:08 +04:00 committed by GitHub
parent f4ecee2d2f
commit ef1632d035
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
24 changed files with 87 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -82,13 +82,10 @@ if(NOT OV_GLIBC_VERSION VERSION_EQUAL 0.0)
endif()
# remove file with exported targets to force its regeneration
file(REMOVE "${CMAKE_BINARY_DIR}/ngraphTargets.cmake")
file(REMOVE "${CMAKE_BINARY_DIR}/InferenceEngineTargets.cmake")
file(REMOVE "${CMAKE_BINARY_DIR}/OpenVINOTargets.cmake")
# remove exported developer targets files to force its regeneration
macro(ov_clean_developer_package_targets)
file(REMOVE "${CMAKE_BINARY_DIR}/inference_engine_developer_package_targets.cmake")
file(REMOVE "${CMAKE_BINARY_DIR}/openvino_developer_package_targets.cmake")
unset(_OPENVINO_DEVELOPER_PACKAGE_TARGETS CACHE)
unset(openvino_installed_targets CACHE)

2
cmake/developer_package/frontends/frontends.cmake
View File

@ -73,7 +73,7 @@ function(ov_generate_frontends_hpp)
endif()
endforeach()
# add dependency on header file generation for all inference_engine source files
# add dependency on header file generation for all openvino_frontend_common_obj source files
set_source_files_properties(${all_sources} PROPERTIES OBJECT_DEPENDS ${ov_frontends_hpp})
endfunction()

8
cmake/developer_package/plugins/plugins.cmake
View File

@ -323,8 +323,8 @@ function(ov_generate_plugins_hpp)
# add plugins to libraries including ov_plugins.hpp
ov_target_link_plugins(openvino)
if(TARGET inference_engine_s)
ov_target_link_plugins(inference_engine_s)
if(TARGET openvino_runtime_s)
ov_target_link_plugins(openvino_runtime_s)
endif()
if(OV_GENERATOR_MULTI_CONFIG AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.20)
@ -352,7 +352,7 @@ function(ov_generate_plugins_hpp)
VERBATIM)
# for some reason dependency on source files does not work
# so, we have to use explicit target and make it dependency for inference_engine_obj
# so, we have to use explicit target and make it dependency for openvino_runtime_obj
add_custom_target(_ov_plugins_hpp DEPENDS ${ov_plugins_hpp})
add_dependencies(inference_engine_obj _ov_plugins_hpp)
add_dependencies(openvino_runtime_obj _ov_plugins_hpp)
endfunction()

4
cmake/extra_modules.cmake
View File

@ -177,9 +177,9 @@ endfunction()
# since it's generated after modules are configured
ov_generate_dev_package_config()
# extra modules must be registered after inference_engine library
# extra modules must be registered after openvino_runtime library
# and all other OpenVINO Core libraries are creared
# because '_ov_register_extra_modules' creates fake InferenceEngineDeveloperPackageConfig.cmake
# because '_ov_register_extra_modules' creates fake OpenVINODeveloperPackageConfig.cmake
# with all imported developer targets
_ov_register_extra_modules()

2
cmake/packaging/debian.cmake
View File

@ -307,8 +307,6 @@ macro(ov_cpack_settings)
ov_debian_add_lintian_suppression(${python_component}
# usr/lib/python3/dist-packages/requirements.txt
"unknown-file-in-python-module-directory"
# usr/lib/python3/dist-packages/openvino/inference_engine/__init__.py
"executable-not-elf-or-script"
# all directories
"non-standard-dir-perm"
# usr/bin/benchmark_app

24
src/cmake/openvino.cmake
View File

@ -19,13 +19,13 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
endif()
add_library(${TARGET_NAME}
$<TARGET_OBJECTS:ngraph_obj>
$<TARGET_OBJECTS:ngraph_obj_version>
$<TARGET_OBJECTS:openvino_core_obj>
$<TARGET_OBJECTS:openvino_core_obj_version>
$<TARGET_OBJECTS:openvino_frontend_common_obj>
$<TARGET_OBJECTS:inference_engine_obj>
$<TARGET_OBJECTS:inference_engine_obj_version>
$<TARGET_OBJECTS:inference_engine_transformations_obj>
$<TARGET_OBJECTS:inference_engine_lp_transformations_obj>
$<TARGET_OBJECTS:openvino_runtime_obj>
$<TARGET_OBJECTS:openvino_runtime_obj_version>
$<TARGET_OBJECTS:openvino_transformations_obj>
$<TARGET_OBJECTS:openvino_lp_transformations_obj>
$<$<TARGET_EXISTS:openvino_proxy_plugin_obj>:$<TARGET_OBJECTS:openvino_proxy_plugin_obj>>)
add_library(openvino::runtime ALIAS ${TARGET_NAME})
@ -106,17 +106,23 @@ add_library(openvino_runtime_dev INTERFACE)
add_library(openvino::runtime::dev ALIAS openvino_runtime_dev)
target_include_directories(openvino_runtime_dev INTERFACE
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/inference/dev_api>
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/common/low_precision_transformations/include>)
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/inference/dev_api>)
target_link_libraries(openvino_runtime_dev INTERFACE ${TARGET_NAME} openvino::core::dev)
ov_set_threading_interface_for(openvino_runtime_dev)
set_target_properties(openvino_runtime_dev PROPERTIES EXPORT_NAME runtime::dev)
ov_developer_package_export_targets(TARGET openvino::runtime::dev
ov_developer_package_export_targets(TARGET openvino_runtime_dev
INSTALL_INCLUDE_DIRECTORIES "${OpenVINO_SOURCE_DIR}/src/inference/dev_api/")
file(GLOB_RECURSE dev_api_src "${CMAKE_CURRENT_SOURCE_DIR}/OpenVINO_SOURCE_DIR}/src/inference/dev_api/openvino/*.hpp")
ov_add_clang_format_target(openvino_runtime_dev_clang FOR_SOURCES ${plugin_api_src})
ov_ncc_naming_style(FOR_TARGET openvino_runtime_dev
SOURCE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/src/inference/dev_api/openvino"
ADDITIONAL_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:openvino::runtime,INTERFACE_INCLUDE_DIRECTORIES>)
# Install static libraries for case BUILD_SHARED_LIBS=OFF
ov_install_static_lib(openvino_runtime_dev ${OV_CPACK_COMP_CORE})

2
src/cmake/ov_parallel.cmake
View File

@ -274,7 +274,7 @@ function(ov_set_threading_interface_for TARGET_NAME)
set(LINK_TYPE "PRIVATE")
set(COMPILE_DEF_TYPE "PRIVATE")
elseif(target_type STREQUAL "STATIC_LIBRARY")
# Affected libraries: inference_engine_s
# Affected libraries: openvino_runtime_s
# they don't have TBB in public headers => PRIVATE
set(LINK_TYPE "PRIVATE")
set(COMPILE_DEF_TYPE "PUBLIC")

14
src/common/low_precision_transformations/CMakeLists.txt
View File

@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
#
set (TARGET_NAME "inference_engine_lp_transformations")
set (TARGET_NAME "openvino_lp_transformations")
set(PUBLIC_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
@ -27,8 +27,7 @@ ov_build_target_faster(${TARGET_NAME}_obj UNITY)
target_link_libraries(${TARGET_NAME}_obj PRIVATE openvino::itt openvino::core::dev)
target_include_directories(${TARGET_NAME}_obj PRIVATE $<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}>
$<BUILD_INTERFACE:$<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>>)
target_include_directories(${TARGET_NAME}_obj PRIVATE $<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}>)
add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}_obj)
@ -38,15 +37,6 @@ if(NOT BUILD_SHARED_LIBS)
target_compile_definitions(${TARGET_NAME}_obj PUBLIC OPENVINO_STATIC_LIBRARY)
endif()
# INTERFACE library for BW compatibility
add_library(${TARGET_NAME} INTERFACE)
target_link_libraries(${TARGET_NAME} INTERFACE openvino::runtime)
target_include_directories(${TARGET_NAME} INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:$<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>>)
# LTO
set_target_properties(${TARGET_NAME}_obj PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})

2
src/common/transformations/CMakeLists.txt
View File

@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
#
set(TARGET_NAME "inference_engine_transformations")
set(TARGET_NAME "openvino_transformations")
set(PUBLIC_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")

2
src/common/transformations/tests/CMakeLists.txt
View File

@ -19,8 +19,6 @@ ov_add_test_target(
sharedTestClasses
ov_lpt_models
ADD_CLANG_FORMAT
INCLUDES
$<TARGET_PROPERTY:inference_engine_obj,SOURCE_DIR>/src
LABELS
OV UNIT TRANSFORMATIONS
)

72
src/core/CMakeLists.txt
View File

@ -18,15 +18,20 @@ file(GLOB_RECURSE DEV_HEADERS ${OV_CORE_DEV_API_PATH}/*.hpp)
add_subdirectory(reference)
add_subdirectory(shape_inference)
set(MIXED_SRC
"${CMAKE_CURRENT_SOURCE_DIR}/src/runtime/allocator.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/runtime/itensor.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/runtime/ov_tensor.cpp")
# TODO: remove with InferenceEngine::Blob removal
if(ON)
set(MIXED_SRC
"${CMAKE_CURRENT_SOURCE_DIR}/src/runtime/allocator.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/runtime/itensor.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/runtime/ov_tensor.cpp")
set_property(SOURCE ${MIXED_SRC}
APPEND PROPERTY INCLUDE_DIRECTORIES
$<TARGET_PROPERTY:inference_engine_obj,SOURCE_DIR>/src
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>)
set_property(SOURCE ${MIXED_SRC}
APPEND PROPERTY INCLUDE_DIRECTORIES
$<TARGET_PROPERTY:openvino_runtime_obj,SOURCE_DIR>/src
$<TARGET_PROPERTY:openvino_runtime_obj,SOURCE_DIR>/dev_api
$<TARGET_PROPERTY:openvino_runtime_obj,SOURCE_DIR>/include
$<TARGET_PROPERTY:openvino_runtime_obj,SOURCE_DIR>/include/ie)
endif()
# Create named folders for the sources within the .vcproj
# Empty name lists them directly under the .vcproj
@ -45,7 +50,8 @@ target_include_directories(openvino_core_dev INTERFACE
$<BUILD_INTERFACE:${OV_CORE_INCLUDE_PATH}>
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/core/dev_api>
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/frontends/common/include>
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/common/transformations/include>)
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/common/transformations/include>
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/common/low_precision_transformations/include>)
target_link_libraries(openvino_core_dev INTERFACE openvino::itt openvino::util)
@ -71,44 +77,44 @@ endif()
# Create static or shared library depending on BUILD_SHARED_LIBS
#
add_library(ngraph_obj OBJECT ${LIBRARY_SRC} ${PUBLIC_HEADERS})
add_library(openvino_core_obj OBJECT ${LIBRARY_SRC} ${PUBLIC_HEADERS})
if(ENABLE_SYSTEM_PUGIXML)
# system pugixml has /usr/include as include directories
# we cannot use them as system ones, leads to compilation errors
set_target_properties(ngraph_obj PROPERTIES NO_SYSTEM_FROM_IMPORTED ON)
set_target_properties(openvino_core_obj PROPERTIES NO_SYSTEM_FROM_IMPORTED ON)
endif()
target_compile_definitions(ngraph_obj PRIVATE IMPLEMENT_OPENVINO_API)
target_compile_definitions(openvino_core_obj PRIVATE IMPLEMENT_OPENVINO_API)
ov_build_target_faster(ngraph_obj
ov_build_target_faster(openvino_core_obj
UNITY
PCH PRIVATE "src/precomp.hpp")
ov_add_version_defines(src/version.cpp ngraph_obj)
ov_add_version_defines(src/version.cpp openvino_core_obj)
target_link_libraries(ngraph_obj PRIVATE openvino::reference openvino::util
target_link_libraries(openvino_core_obj PRIVATE openvino::reference openvino::util
openvino::pugixml openvino::shape_inference openvino::core::dev)
ov_mark_target_as_cc(ngraph_obj)
ov_mark_target_as_cc(openvino_core_obj)
# ngraph is public API => need to mark this library as important for ABI free
ov_abi_free_target(ngraph_obj)
# openvino_core is public API => need to mark this library as important for ABI free
ov_abi_free_target(openvino_core_obj)
ov_ncc_naming_style(FOR_TARGET ngraph_obj
ov_ncc_naming_style(FOR_TARGET openvino_core_obj
SOURCE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include")
ov_add_clang_format_target(ngraph_clang FOR_SOURCES ${LIBRARY_SRC} ${PUBLIC_HEADERS} ${DEV_HEADERS})
ov_add_clang_format_target(openvino_core_clang FOR_SOURCES ${LIBRARY_SRC} ${PUBLIC_HEADERS} ${DEV_HEADERS})
if(NOT BUILD_SHARED_LIBS)
target_compile_definitions(ngraph_obj PUBLIC OPENVINO_STATIC_LIBRARY)
target_compile_definitions(openvino_core_obj PUBLIC OPENVINO_STATIC_LIBRARY)
endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
# ngraph is linked against openvino::reference, openvino::shape_inference static libraries
# which include ngraph headers with dllimport attribute. Linker complains about it
# openvino_core is linked against openvino::reference, openvino::shape_inference static libraries
# which include openvino_core headers with dllimport attribute. Linker complains about it
# but no way to fix this: linking with no attribute defaults to dllexport and we have
# multiple defitions for ngraph symbols.
# multiple defitions for openvino_core symbols.
#
# The possible way is to use object libraries for openvino::reference
# but it's not convinient since these libraries are exported from build tree
@ -119,10 +125,11 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(link_type PUBLIC)
endif()
target_link_options(ngraph_obj ${link_type} "/IGNORE:4217,4286")
target_link_options(openvino_core_obj ${link_type} "/IGNORE:4217,4286")
endif()
# some sources are located in ngraph, while headers are in inference_engine_transformations
# TODO: try to remove this and move smart reshape to transformations
# some sources are located in openvino_core, while headers are in openvino_transformations
file(GLOB_RECURSE smart_reshape_srcs ${CMAKE_CURRENT_SOURCE_DIR}/src/pass/smart_reshape/*.cpp)
file(GLOB_RECURSE rt_info_srcs ${CMAKE_CURRENT_SOURCE_DIR}/src/pass/rt_info/*.cpp)
set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/src/pass/convert_precision.cpp"
@ -133,18 +140,11 @@ set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/src/pass/convert_precis
"${CMAKE_CURRENT_SOURCE_DIR}/src/preprocess/preprocess_steps_impl.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/model.cpp" # for SmartReshape
${smart_reshape_srcs} ${rt_info_srcs}
PROPERTIES INCLUDE_DIRECTORIES $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>)
PROPERTIES INCLUDE_DIRECTORIES $<TARGET_PROPERTY:openvino::core::dev,INTERFACE_INCLUDE_DIRECTORIES>)
# Defines macro in C++ to load backend plugin
target_include_directories(ngraph_obj PUBLIC $<BUILD_INTERFACE:${OV_CORE_INCLUDE_PATH}>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
add_library(ngraph INTERFACE)
target_link_libraries(ngraph INTERFACE openvino::runtime)
# Add an alias so that library can be used inside the build tree, e.g. when testing
add_library(openvino::core ALIAS ngraph)
target_include_directories(ngraph INTERFACE $<BUILD_INTERFACE:${OV_CORE_INCLUDE_PATH}>)
target_include_directories(openvino_core_obj PUBLIC $<BUILD_INTERFACE:${OV_CORE_INCLUDE_PATH}>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
#-----------------------------------------------------------------------------------------------
# Installation logic...

5
src/core/tests/CMakeLists.txt
View File

@ -13,7 +13,7 @@ add_definitions(-DSERIALIZED_ZOO=\"${TEST_MODEL_ZOO}/core/models\")
# For type relaxed types
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/threading.cpp
PROPERTIES INCLUDE_DIRECTORIES $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>)
PROPERTIES INCLUDE_DIRECTORIES $<TARGET_PROPERTY:openvino::core::dev,INTERFACE_INCLUDE_DIRECTORIES>)
if(SUGGEST_OVERRIDE_SUPPORTED)
set_source_files_properties(ov_tensor_test.cpp
@ -49,8 +49,7 @@ ov_add_test_target(
OV UNIT CORE
)
get_target_property(OV_CORE_SRC_DIR ngraph_obj SOURCE_DIR)
target_include_directories(${TARGET_NAME} PRIVATE ${OV_CORE_SRC_DIR}/src
target_include_directories(${TARGET_NAME} PRIVATE $<TARGET_PROPERTY:openvino_core_obj,SOURCE_DIR>/src
${CMAKE_CURRENT_SOURCE_DIR})
target_compile_definitions(${TARGET_NAME}

2
src/frontends/common/CMakeLists.txt
View File

@ -73,7 +73,7 @@ ov_abi_free_target(${TARGET_NAME}_obj)
ov_ncc_naming_style(FOR_TARGET ${TARGET_NAME}_obj
SOURCE_DIRECTORIES "${FRONTEND_INCLUDE_DIR}"
ADDITIONAL_INCLUDE_DIRECTORIES
$<TARGET_PROPERTY:ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
$<TARGET_PROPERTY:openvino::core::dev,INTERFACE_INCLUDE_DIRECTORIES>)
# Installation rules header files

47
src/inference/CMakeLists.txt
View File

@ -2,10 +2,10 @@
# SPDX-License-Identifier: Apache-2.0
#
set (TARGET_NAME "inference_engine")
set (TARGET_NAME "openvino_runtime")
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
# TODO: Add IMPLEMENT_OPENVINO_API to inference_engine_obj
# TODO: Add IMPLEMENT_OPENVINO_API to openvino_runtime_obj
ov_add_compiler_flags(/wd4273)
endif()
@ -80,29 +80,6 @@ file (GLOB_RECURSE PUBLIC_HEADERS
source_group("src" FILES ${LIBRARY_SRC})
source_group("include" FILES ${LIBRARY_HEADERS} ${PUBLIC_HEADERS})
# Plugin API library
add_library(${TARGET_NAME}_plugin_api INTERFACE)
target_include_directories(${TARGET_NAME}_plugin_api INTERFACE
$<TARGET_PROPERTY:openvino::core::dev,INTERFACE_INCLUDE_DIRECTORIES>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/dev_api>
$<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}>
$<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}/ie>)
target_link_libraries(${TARGET_NAME}_plugin_api INTERFACE openvino::pugixml openvino::itt openvino::util)
ov_set_threading_interface_for(${TARGET_NAME}_plugin_api)
file(GLOB_RECURSE plugin_api_src "${CMAKE_CURRENT_SOURCE_DIR}/dev_api/*.hpp"
"${CMAKE_CURRENT_SOURCE_DIR}/dev_api/*.h")
ov_add_clang_format_target(${TARGET_NAME}_plugin_api_clang FOR_SOURCES ${plugin_api_src})
ov_ncc_naming_style(FOR_TARGET ${TARGET_NAME}_plugin_api
SOURCE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/dev_api/openvino"
ADDITIONAL_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
# Create object library
add_library(${TARGET_NAME}_obj OBJECT
@ -123,23 +100,19 @@ ov_build_target_faster(${TARGET_NAME}_obj
target_compile_definitions(${TARGET_NAME}_obj PRIVATE
IMPLEMENT_INFERENCE_ENGINE_API
$<$<TARGET_EXISTS:openvino_proxy_plugin_obj>:PROXY_PLUGIN_ENABLED>
$<TARGET_PROPERTY:ngraph,INTERFACE_COMPILE_DEFINITIONS>)
$<$<TARGET_EXISTS:openvino_proxy_plugin_obj>:PROXY_PLUGIN_ENABLED>)
target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE
$<TARGET_PROPERTY:ngraph,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:openvino::pugixml,INTERFACE_INCLUDE_DIRECTORIES>
$<$<TARGET_EXISTS:openvino_proxy_plugin_obj>:$<TARGET_PROPERTY:openvino_proxy_plugin_obj,INTERFACE_INCLUDE_DIRECTORIES>>
$<$<TARGET_EXISTS:xbyak::xbyak>:$<TARGET_PROPERTY:xbyak::xbyak,INTERFACE_INCLUDE_DIRECTORIES>>)
target_include_directories(${TARGET_NAME}_obj PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/src"
$<TARGET_PROPERTY:openvino::runtime::dev,INTERFACE_INCLUDE_DIRECTORIES>
"${CMAKE_CURRENT_SOURCE_DIR}/include/ie" # TODO: remove in 2024.0
$<$<TARGET_EXISTS:openvino_proxy_plugin_obj>:$<TARGET_PROPERTY:openvino_proxy_plugin_obj,INTERFACE_INCLUDE_DIRECTORIES>>
# for ov_plugins.hpp
$<IF:$<AND:$<BOOL:${OV_GENERATOR_MULTI_CONFIG}>,$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.20>>,${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>,${CMAKE_CURRENT_BINARY_DIR}>
# for ie_ir_version.hpp
"${OpenVINO_SOURCE_DIR}/src/plugins/intel_gna/legacy/include"
$<TARGET_PROPERTY:${TARGET_NAME}_transformations,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>)
$<IF:$<AND:$<BOOL:${OV_GENERATOR_MULTI_CONFIG}>,$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.20>>,${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>,${CMAKE_CURRENT_BINARY_DIR}>)
target_link_libraries(${TARGET_NAME}_obj PRIVATE openvino::itt openvino::util openvino::core::dev)
ov_mark_target_as_cc(${TARGET_NAME}_obj)
@ -163,7 +136,7 @@ ov_add_clang_format_target(${TARGET_NAME}_clang FOR_SOURCES ${OV_STATIC_DEPENDEN
ov_ncc_naming_style(FOR_TARGET ${TARGET_NAME}_obj
SOURCE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include/openvino"
ADDITIONAL_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
ADDITIONAL_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:openvino::core::dev,INTERFACE_INCLUDE_DIRECTORIES>)
# Static library used for unit tests which are always built
@ -177,7 +150,6 @@ if (TBBBIND_2_5_FOUND)
endif()
target_include_directories(${TARGET_NAME}_s PUBLIC
$<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
if(WIN32)
@ -201,12 +173,9 @@ set_target_properties(${TARGET_NAME}_obj
# Export for developer package
ov_developer_package_export_targets(TARGET ${TARGET_NAME}_s)
ov_developer_package_export_targets(TARGET ${TARGET_NAME}_plugin_api)
# Install static libraries for case BUILD_SHARED_LIBS=OFF
ov_install_static_lib(${TARGET_NAME}_plugin_api ${OV_CPACK_COMP_CORE})
install(DIRECTORY "${PUBLIC_HEADERS_DIR}/"
DESTINATION ${OV_CPACK_INCLUDEDIR}
COMPONENT ${OV_CPACK_COMP_CORE_DEV}

2
src/inference/tests/functional/CMakeLists.txt
View File

@ -50,7 +50,7 @@ ov_add_test_target(
DEFINES
${COMPILE_DEFINITIONS}
INCLUDES
$<TARGET_PROPERTY:inference_engine_obj,SOURCE_DIR>/src
$<TARGET_PROPERTY:openvino_runtime_obj,SOURCE_DIR>/src
$<$<TARGET_EXISTS:openvino_proxy_plugin_obj>:$<TARGET_PROPERTY:openvino_proxy_plugin_obj,INTERFACE_INCLUDE_DIRECTORIES>>
${CMAKE_CURRENT_SOURCE_DIR}
ADD_CLANG_FORMAT

4
src/plugins/intel_cpu/CMakeLists.txt
View File

@ -207,9 +207,7 @@ if(BUILD_SHARED_LIBS)
ov_set_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>)
USE_STATIC_IE IMPLEMENT_INFERENCE_ENGINE_PLUGIN IMPLEMENT_INFERENCE_EXTENSION_API)
set_target_properties(${TARGET_NAME}_obj PROPERTIES EXCLUDE_FROM_ALL ON)

4
src/plugins/intel_cpu/tests/unit/CMakeLists.txt
View File

@ -54,14 +54,12 @@ ov_add_test_target(
gmock
dnnl
openvino::shape_inference
inference_engine_s
openvino_runtime_s
unit_test_utils
ov_models
ov_snippets_models
snippets_test_utils
${MLAS_LIBRARY}
inference_engine_transformations
inference_engine_lp_transformations
ADD_CPPLINT
LABELS
OV UNIT CPU

2
src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt
View File

@ -71,7 +71,7 @@ if(COMMAND add_cpplint_target)
add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
endif()
target_link_libraries(${TARGET_NAME} PUBLIC OpenCL::OpenCL inference_engine_plugin_api)
target_link_libraries(${TARGET_NAME} PUBLIC OpenCL::OpenCL openvino::runtime)
set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})

2
src/plugins/intel_gpu/src/runtime/CMakeLists.txt
View File

@ -49,7 +49,7 @@ ov_set_threading_interface_for(${TARGET_NAME})
target_link_libraries(${TARGET_NAME} PRIVATE
OpenCL::OpenCL
openvino::itt
inference_engine_plugin_api
openvino::runtime::dev
)
if(ENABLE_ONEDNN_FOR_GPU)

2
src/plugins/intel_gpu/tests/unit/CMakeLists.txt
View File

@ -62,14 +62,12 @@ endif()
set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
target_link_libraries(${TARGET_NAME} PRIVATE openvino_intel_gpu_graph
inference_engine
OpenCL::OpenCL
gtest
gtest_main
gflags
common_test_utils
openvino::reference
inference_engine_transformations
gmock)
target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}

11
src/plugins/proxy/CMakeLists.txt
View File

@ -30,11 +30,12 @@ target_compile_definitions(${TARGET_NAME} PRIVATE
# LTO
set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
target_include_directories(${TARGET_NAME} SYSTEM PRIVATE
$<BUILD_INTERFACE:$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>>)
target_include_directories(${TARGET_NAME}
PUBLIC
$<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}>
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/src
$<BUILD_INTERFACE:$<TARGET_PROPERTY:openvino::runtime::dev,INTERFACE_INCLUDE_DIRECTORIES>>)
ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})

2
src/tests/test_utils/common_test_utils/CMakeLists.txt
View File

@ -51,7 +51,7 @@ function(add_common_utils ADD_TARGET_NAME)
# USE_STATIC_IE is passed
if(ARGN)
target_link_libraries(${ADD_TARGET_NAME} PRIVATE inference_engine_s)
target_link_libraries(${ADD_TARGET_NAME} PRIVATE openvino_runtime_s)
endif()
ov_build_target_faster(${ADD_TARGET_NAME}

2
src/tests/test_utils/unit_test_utils/CMakeLists.txt
View File

@ -18,7 +18,7 @@ ov_add_target(
LINK_LIBRARIES
PUBLIC
common_test_utils_s
inference_engine_s
openvino_runtime_s
gmock
DEPENDENCIES
mock_engine

8
src/tests/test_utils/unit_test_utils/mocks/mock_engine/CMakeLists.txt
View File

@ -29,13 +29,7 @@ add_library(${TARGET_NAME} MODULE
target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
if(TARGET IE::inference_engine_plugin_api)
target_link_libraries(${TARGET_NAME} PRIVATE IE::inference_engine_plugin_api)
else()
target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime::dev)
endif()
target_link_libraries(${TARGET_NAME} PRIVATE inference_engine)
target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime::dev)
target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLUGIN)