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

Remove legacy targets (#9333)

Browse Source 
* Remove some legacy targets

* Replace some targets

* Removed inference_engine_plugin_api dependency

* Minor comment for developer config

* Fixed include paths

* Small fixes for static build

* Try to fix build pyopenvino

* Fixed comments

* Try to fix build

* Include OpenVINODeveloperPackage inside InferenceEngineDeveloperPackageConfig

* Try to fix GAPI tests
This commit is contained in:
Ilya Churaev 2021-12-23 08:16:23 +03:00 committed by GitHub
parent 16b39d15d0
commit 42350a705e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
54 changed files with 123 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/developer_package/add_ie_target.cmake
View File

@ -133,6 +133,10 @@ function(addIeTarget)
endif()
endfunction()
function(ov_add_target)
addIeTarget(${ARGV})
endfunction()
#[[
Wrapper function over addIeTarget, that also adds a test with the same name.
You could use
@ -163,3 +167,7 @@ function(addIeTargetTest)
COMPONENT tests
EXCLUDE_FROM_ALL)
endfunction()
function(ov_add_test_target)
addIeTargetTest(${ARGV})
endfunction()

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

@ -177,7 +177,7 @@ macro(ov_add_frontend)
ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
target_link_libraries(${TARGET_NAME} PRIVATE frontend_common::static ${OV_FRONTEND_LINK_LIBRARIES})
target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime ${OV_FRONTEND_LINK_LIBRARIES})
# WA for TF frontends which always requires protobuf (not protobuf-lite)
# if TF FE is built in static mode, use protobuf for all other FEs

10
cmake/developer_package/plugins/plugins.cmake
View File

@ -80,11 +80,7 @@ function(ie_add_plugin)
ie_add_vs_version_file(NAME ${IE_PLUGIN_NAME}
FILEDESCRIPTION "Inference Engine ${IE_PLUGIN_DEVICE_NAME} device plugin library")
if(TARGET IE::inference_engine_plugin_api)
target_link_libraries(${IE_PLUGIN_NAME} PRIVATE IE::inference_engine IE::inference_engine_plugin_api)
else()
target_link_libraries(${IE_PLUGIN_NAME} PRIVATE inference_engine inference_engine_plugin_api)
endif()
target_link_libraries(${IE_PLUGIN_NAME} PRIVATE openvino::runtime openvino::runtime::dev)
if(WIN32)
set_target_properties(${IE_PLUGIN_NAME} PROPERTIES COMPILE_PDB_NAME ${IE_PLUGIN_NAME})
@ -170,6 +166,10 @@ function(ie_add_plugin)
set(${IE_PLUGIN_DEVICE_NAME}_AS_EXTENSION "${IE_PLUGIN_AS_EXTENSION}" CACHE INTERNAL "" FORCE)
endfunction()
function(ov_add_plugin)
ie_add_plugin(${ARGN})
endfunction()
#
# ie_register_plugins_dynamic(MAIN_TARGET <main target name>
# POSSIBLE_PLUGINS <list of plugins which can be build by this repo>)

24
cmake/extra_modules.cmake
View File

@ -63,22 +63,32 @@ function(register_extra_modules)
openvino_developer_export_targets(COMPONENT core TARGETS ngraph)
set(InferenceEngineDeveloperPackage_DIR "${CMAKE_CURRENT_BINARY_DIR}/runtime")
set(OpenVINODeveloperPackage_DIR "${CMAKE_BINARY_DIR}/runtime")
function(generate_fake_dev_package)
set(iedevconfig_file "${InferenceEngineDeveloperPackage_DIR}/InferenceEngineDeveloperPackageConfig.cmake")
file(REMOVE "${iedevconfig_file}")
function(generate_fake_dev_package NS)
if (NS STREQUAL "openvino")
set(devconfig_file "${OpenVINODeveloperPackage_DIR}/OpenVINODeveloperPackageConfig.cmake")
else()
set(devconfig_file "${InferenceEngineDeveloperPackage_DIR}/InferenceEngineDeveloperPackageConfig.cmake")
endif()
file(REMOVE "${devconfig_file}")
file(WRITE "${iedevconfig_file}" "\# !! AUTOGENERATED: DON'T EDIT !!\n\n")
file(APPEND "${iedevconfig_file}" "ie_deprecated_no_errors()\n")
file(WRITE "${devconfig_file}" "\# !! AUTOGENERATED: DON'T EDIT !!\n\n")
file(APPEND "${devconfig_file}" "ie_deprecated_no_errors()\n")
foreach(target IN LISTS ${openvino_export_components})
if(target)
file(APPEND "${iedevconfig_file}" "add_library(IE::${target} ALIAS ${target})\n")
file(APPEND "${devconfig_file}" "add_library(${NS}::${target} ALIAS ${target})\n")
endif()
endforeach()
if ("${NS}" STREQUAL "openvino")
file(APPEND "${devconfig_file}" "add_library(${NS}::runtime ALIAS ov_runtime)\n")
file(APPEND "${devconfig_file}" "add_library(${NS}::runtime::dev ALIAS ov_runtime_dev)\n")
endif()
endfunction()
generate_fake_dev_package()
generate_fake_dev_package("openvino")
generate_fake_dev_package("IE")
# automatically import plugins from the 'runtime/plugins' folder
file(GLOB local_extra_modules "runtime/plugins/*")

5
cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in
View File

@ -49,6 +49,11 @@ find_dependency(ngraph
NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH)
find_dependency(OpenVINODeveloperPackage
PATHS "${CMAKE_CURRENT_LIST_DIR}"
NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH)
if(TARGET openvino::runtime AND NOT TARGET IE::runtime)
add_library(IE::runtime INTERFACE IMPORTED)
set_target_properties(IE::runtime PROPERTIES

6
cmake/templates/OpenVINOConfig.cmake.in
View File

@ -32,14 +32,8 @@
# `openvino::runtime::c`
# The OpenVINO C Inference Runtime
#
# `openvino::core`
# The OpenVINO C++ Core Runtime
#
# Frontend specific targets:
#
# `openvino::frontend::common`
# OpenVINO frontend common
#
# `openvino::frontend::onnx`
# ONNX FrontEnd target (optional)
#

6
cmake/templates/OpenVINODeveloperPackageConfig.cmake.in
View File

@ -6,13 +6,15 @@
include(CMakeFindDependencyMacro)
set_and_check(OpenVINO_SOURCE_DIR "@OpenVINO_SOURCE_DIR@")
# Variables to export in plugin's projects
set(ie_options "@IE_OPTIONS@;CMAKE_BUILD_TYPE;CMAKE_SKIP_RPATH")
list(APPEND ie_options CMAKE_CXX_COMPILER_LAUNCHER CMAKE_C_COMPILER_LAUNCHER)
file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}" cache_path)
message(STATUS "The following CMake options are exported from Inference Engine Developer package")
message(STATUS "The following CMake options are exported from OpenVINO Developer package")
message("")
foreach(option IN LISTS ie_options)
if(NOT DEFINED "${option}")
@ -30,7 +32,7 @@ set_and_check(gflags_DIR "@gflags_BINARY_DIR@")
#
find_dependency(IEDevScripts
PATHS "@OpenVINO_SOURCE_DIR@/cmake/developer_package"
PATHS "${OpenVINO_SOURCE_DIR}/cmake/developer_package"
NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH)

3
docs/snippets/CMakeLists.txt
View File

@ -56,5 +56,4 @@ if(NOT MSVC)
endif()
endif()
target_link_libraries(${TARGET_NAME} PRIVATE inference_engine_plugin_api
ngraph inference_engine_transformations)
target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime openvino::runtime::dev)

6
docs/template_plugin/CMakeLists.txt
View File

@ -5,11 +5,11 @@
# [cmake:main]
cmake_minimum_required(VERSION 3.13)
project(InferenceEngineTemplatePlugin)
project(OpenVINOTemplatePlugin)
set(IE_MAIN_TEMPLATE_PLUGIN_SOURCE_DIR ${InferenceEngineTemplatePlugin_SOURCE_DIR})
set(IE_MAIN_TEMPLATE_PLUGIN_SOURCE_DIR ${OpenVINOTemplatePlugin_SOURCE_DIR})
find_package(InferenceEngineDeveloperPackage REQUIRED)
find_package(OpenVINODeveloperPackage REQUIRED)
if(CMAKE_COMPILER_IS_GNUCXX)
ie_add_compiler_flags(-Wall)

7
docs/template_plugin/src/CMakeLists.txt
View File

@ -9,7 +9,7 @@ file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp)
# adds a shared library with plugin
ie_add_plugin(NAME ${TARGET_NAME}
ov_add_plugin(NAME ${TARGET_NAME}
DEVICE_NAME "TEMPLATE"
SOURCES ${SOURCES} ${HEADERS}
SKIP_INSTALL # ATTENTION: uncomment to install component
@ -25,11 +25,8 @@ target_include_directories(${TARGET_NAME} PRIVATE
# link common Inference Engine libraries
target_link_libraries(${TARGET_NAME} PRIVATE
IE::inference_engine
IE::inference_engine_transformations
interpreter_backend
ngraph::reference
${NGRAPH_LIBRARIES})
openvino::ngraph_reference)
set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})

4
docs/template_plugin/tests/functional/CMakeLists.txt
View File

@ -5,13 +5,13 @@
# [cmake:functional_tests]
set(TARGET_NAME templateFuncTests)
addIeTargetTest(
ov_add_test_target(
NAME ${TARGET_NAME}
ROOT ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDENCIES
templatePlugin
LINK_LIBRARIES
IE::funcSharedTests
openvino::funcSharedTests
INCLUDES
"${IE_MAIN_TEMPLATE_PLUGIN_SOURCE_DIR}/include"
"${CMAKE_CURRENT_SOURCE_DIR}/op_reference"

7
inference-engine/src/mkldnn_plugin/CMakeLists.txt
View File

@ -41,9 +41,6 @@ if(SELECTIVE_BUILD STREQUAL "ON")
endif()
target_link_libraries(${TARGET_NAME} PRIVATE mkldnn
inference_engine
inference_engine_transformations
inference_engine_lp_transformations
ov_shape_inference
inference_engine_snippets)
@ -71,10 +68,8 @@ 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:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:openvino::runtime::dev,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:openvino::itt,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ov_shape_inference,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_snippets,INTERFACE_INCLUDE_DIRECTORIES>
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}

6
inference-engine/src/vpu/common/CMakeLists.txt
View File

@ -36,8 +36,8 @@ function(add_common_target TARGET_NAME STATIC_IE)
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
target_include_directories(${TARGET_NAME} SYSTEM PUBLIC
$<TARGET_PROPERTY:ngraph,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:openvino::runtime,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:openvino::runtime::dev,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_legacy,INTERFACE_INCLUDE_DIRECTORIES>)
if(WIN32)
@ -52,7 +52,7 @@ function(add_common_target TARGET_NAME STATIC_IE)
openvino_developer_export_targets(COMPONENT vpu TARGETS ${TARGET_NAME})
target_link_libraries(${TARGET_NAME} PUBLIC ngraph inference_engine_transformations
target_link_libraries(${TARGET_NAME} PUBLIC openvino::runtime openvino::runtime::dev
PRIVATE openvino::itt)
if(NOT STATIC_IE)

4
inference-engine/src/vpu/graph_transformer/CMakeLists.txt
View File

@ -53,8 +53,8 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE)
target_link_libraries(${TARGET_NAME}
PUBLIC
ngraph
inference_engine_plugin_api
openvino::runtime
openvino::runtime::dev
PRIVATE
openvino::itt
)

4
inference-engine/thirdparty/clDNN/src/CMakeLists.txt vendored
View File

@ -37,8 +37,8 @@ target_link_libraries(${TARGET_NAME} PUBLIC OpenCL)
target_link_libraries(${TARGET_NAME} PRIVATE ov_intel_gpu_kernels
ov_intel_gpu_runtime
openvino::itt
inference_engine_plugin_api
inference_engine)
openvino::runtime::dev
openvino::runtime)
if(ENABLE_ONEDNN_FOR_GPU)
target_link_libraries(${TARGET_NAME} PUBLIC onednn_gpu_tgt)

2
src/bindings/c/src/CMakeLists.txt
View File

@ -34,8 +34,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME runtime::c)
export(TARGETS ${TARGET_NAME} NAMESPACE openvino::
APPEND FILE "${CMAKE_BINARY_DIR}/OpenVINOTargets.cmake")
openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME})
# install
ie_cpack_add_component(core_c DEPENDS core)

6
src/bindings/python/src/pyopenvino/CMakeLists.txt
View File

@ -4,7 +4,7 @@
project (pyopenvino)
if(NOT DEFINED OpenVINO_SOURCE_DIR)
find_package(InferenceEngineDeveloperPackage REQUIRED)
find_package(OpenVINODeveloperPackage REQUIRED)
endif()
# PYTHON_VERSION_MAJOR and PYTHON_VERSION_MINOR are defined inside pybind11
@ -56,8 +56,10 @@ pybind11_add_module(${PROJECT_NAME} MODULE ${SOURCES})
if(TARGET offline_transformations)
set(OFFLINE_TRANSFORMATIONS_LIB offline_transformations)
else()
elseif(TARGET IE::offline_transformations)
set(OFFLINE_TRANSFORMATIONS_LIB IE::offline_transformations)
else()
set(OFFLINE_TRANSFORMATIONS_LIB openvino::offline_transformations)
endif()
target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")

20
src/cmake/ov_runtime.cmake
View File

@ -16,9 +16,10 @@ set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME runtime)
ie_add_vs_version_file(NAME ${TARGET_NAME} FILEDESCRIPTION "OpenVINO runtime library")
ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:$<TARGET_PROPERTY:ngraph,INTERFACE_INCLUDE_DIRECTORIES>>
$<BUILD_INTERFACE:$<TARGET_PROPERTY:frontend_common,INTERFACE_INCLUDE_DIRECTORIES>>
$<BUILD_INTERFACE:$<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES>>
target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/core/include>
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/frontends/common/include>
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/inference/include>
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/inference/include/ie>
)
target_link_libraries(${TARGET_NAME} PRIVATE ngraph_reference
@ -63,9 +64,16 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
# --------------- OpenVINO runtime library dev ------------------------------
add_library(${TARGET_NAME}_dev INTERFACE)
target_link_libraries(${TARGET_NAME}_dev INTERFACE inference_engine_plugin_api)
target_include_directories(${TARGET_NAME}_dev INTERFACE $<BUILD_INTERFACE:$<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>>
$<BUILD_INTERFACE:$<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES>>)
target_include_directories(${TARGET_NAME}_dev INTERFACE $<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/common/transformations/include>
$<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>
)
target_compile_definitions(${TARGET_NAME}_dev INTERFACE
$<TARGET_PROPERTY:inference_engine_preproc,INTERFACE_COMPILE_DEFINITIONS>)
target_link_libraries(${TARGET_NAME}_dev INTERFACE ${TARGET_NAME} pugixml::static openvino::itt openvino::util)
add_library(openvino::runtime::dev ALIAS ${TARGET_NAME}_dev)
set_ie_threading_interface_for(${TARGET_NAME}_dev)
set_target_properties(${TARGET_NAME}_dev PROPERTIES EXPORT_NAME runtime::dev)

9
src/common/legacy/CMakeLists.txt
View File

@ -37,9 +37,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE
${PUBLIC_HEADERS_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/src
$<TARGET_PROPERTY:inference_engine_obj,SOURCE_DIR>/src # For CNNNetworkNGraphImpl
$<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ngraph,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:openvino::runtime::dev,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:pugixml::static,INTERFACE_INCLUDE_DIRECTORIES>)
target_compile_definitions(${TARGET_NAME}_obj PRIVATE $<TARGET_PROPERTY:ngraph,INTERFACE_COMPILE_DEFINITIONS>)
@ -54,9 +52,8 @@ add_library(${TARGET_NAME} STATIC EXCLUDE_FROM_ALL
${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
$<TARGET_OBJECTS:${TARGET_NAME}_obj>)
target_link_libraries(${TARGET_NAME} PUBLIC inference_engine
PRIVATE pugixml::static openvino::itt
ngraph inference_engine_transformations)
target_link_libraries(${TARGET_NAME} PUBLIC openvino::runtime
PRIVATE pugixml::static openvino::itt openvino::runtime::dev)
target_include_directories(${TARGET_NAME} INTERFACE
$<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}>)

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

@ -52,14 +52,3 @@ target_include_directories(${TARGET_NAME} INTERFACE
# developer package
openvino_developer_export_targets(COMPONENT core_legacy TARGETS ${TARGET_NAME})
# install
# TODO: remove this
if(BUILD_SHARED_LIBS)
install(TARGETS ${TARGET_NAME}
RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
else()
ov_install_static_lib(${TARGET_NAME} core)
endif()

4
src/common/offline_transformations/CMakeLists.txt
View File

@ -19,8 +19,8 @@ source_group("include" FILES ${PUBLIC_HEADERS})
add_library(${TARGET_NAME} STATIC EXCLUDE_FROM_ALL ${LIBRARY_SRC} ${PUBLIC_HEADERS})
target_link_libraries(${TARGET_NAME} PUBLIC ngraph inference_engine_transformations ngraph::reference
PRIVATE openvino::itt pugixml::static openvino::frontend::common
target_link_libraries(${TARGET_NAME} PUBLIC openvino::runtime::dev
PRIVATE openvino::itt pugixml::static openvino::runtime ngraph::reference
nlohmann_json_schema_validator nlohmann_json)
target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR}

8
src/common/preprocessing/CMakeLists.txt
View File

@ -99,7 +99,7 @@ ie_faster_build(${TARGET_NAME}_obj
)
target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLUGIN
$<TARGET_PROPERTY:inference_engine,INTERFACE_COMPILE_DEFINITIONS>
$<TARGET_PROPERTY:openvino::runtime,INTERFACE_COMPILE_DEFINITIONS>
$<TARGET_PROPERTY:fluid,INTERFACE_COMPILE_DEFINITIONS>
$<$<BOOL:${ENABLE_GAPI_PREPROCESSING}>:ENABLE_GAPI_PREPROCESSING>)
@ -139,7 +139,7 @@ if(ENABLE_GAPI_PREPROCESSING)
target_link_libraries(${TARGET_NAME} PRIVATE fluid openvino::itt openvino::util)
if(BUILD_SHARED_LIBS)
target_link_libraries(${TARGET_NAME} PRIVATE inference_engine)
target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime)
else()
# for static linkage the dependencies are in opposite order
target_link_libraries(ov_runtime PRIVATE ${TARGET_NAME})
@ -163,7 +163,7 @@ endif()
target_include_directories(${TARGET_NAME} INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES>)
$<TARGET_PROPERTY:ov_runtime,INTERFACE_INCLUDE_DIRECTORIES>)
# Static library used for unit tests which are always built
@ -178,7 +178,7 @@ if(WIN32)
set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s)
endif()
target_link_libraries(${TARGET_NAME}_s PRIVATE fluid openvino::itt inference_engine)
target_link_libraries(${TARGET_NAME}_s PRIVATE fluid openvino::itt openvino::runtime)
target_compile_definitions(${TARGET_NAME}_s INTERFACE USE_STATIC_IE)

4
src/common/snippets/CMakeLists.txt
View File

@ -25,8 +25,8 @@ ie_faster_build(${TARGET_NAME}
UNITY
)
target_link_libraries(${TARGET_NAME} PUBLIC ngraph inference_engine_transformations
PRIVATE ngraph_reference)
target_link_libraries(${TARGET_NAME} PUBLIC openvino::runtime
PRIVATE ngraph_reference openvino::runtime::dev)
target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)

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

@ -53,11 +53,3 @@ target_link_libraries(${TARGET_NAME} INTERFACE openvino::runtime)
# developer package
openvino_developer_export_targets(COMPONENT core_legacy TARGETS ${TARGET_NAME})
# install
# TODO remove this
install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)

13
src/core/CMakeLists.txt
View File

@ -114,23 +114,10 @@ add_library(openvino::core ALIAS ngraph)
target_include_directories(ngraph INTERFACE $<BUILD_INTERFACE:${OV_CORE_INCLUDE_PATH}>)
#-----------------------------------------------------------------------------------------------
# Export for build tree
#-----------------------------------------------------------------------------------------------
export(TARGETS ngraph NAMESPACE openvino::
APPEND FILE "${CMAKE_BINARY_DIR}/OpenVINOTargets.cmake")
#-----------------------------------------------------------------------------------------------
# Installation logic...
#-----------------------------------------------------------------------------------------------
install(TARGETS ngraph EXPORT OpenVINOTargets
RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core
INCLUDES DESTINATION runtime/include)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
DESTINATION "runtime/include"
COMPONENT core_dev

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

@ -409,7 +409,7 @@ set(SRC
# 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::runtime::dev,INTERFACE_INCLUDE_DIRECTORIES>)
# Add include path to so_extension.hpp
set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/extension.cpp

4
src/core/tests/engines_util/CMakeLists.txt
View File

@ -8,9 +8,7 @@ add_library(engines_test_util STATIC EXCLUDE_FROM_ALL ${ENGINES_UTIL_SRC})
ie_faster_build(engines_test_util UNITY)
target_include_directories(engines_test_util PRIVATE $<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES>)
target_include_directories(engines_test_util PRIVATE $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>)
target_link_libraries(engines_test_util PUBLIC ngraph inference_engine inference_engine_transformations gtest gmock ngraph_test_util)
target_link_libraries(engines_test_util PUBLIC openvino::runtime openvino::runtime::dev gtest gmock ngraph_test_util)
target_include_directories(engines_test_util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
add_clang_format_target(engines_test_util_clang FOR_SOURCES ${ENGINES_UTIL_SRC})

4
src/core/tests/frontend/shared/CMakeLists.txt
View File

@ -14,8 +14,8 @@ add_subdirectory(test_builtin_extensions_2)
target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../..)
target_link_libraries(${TARGET_NAME} PUBLIC frontend_common engines_test_util
offline_transformations ngraph cnpy commonTestUtils ngraph_test_util openvino::util
target_link_libraries(${TARGET_NAME} PUBLIC engines_test_util openvino::runtime
offline_transformations cnpy commonTestUtils ngraph_test_util openvino::util
nlohmann_json_schema_validator test_builtin_extensions_1 test_builtin_extensions_2)
target_compile_definitions(${TARGET_NAME}

2
src/core/tests/util/CMakeLists.txt
View File

@ -8,7 +8,7 @@ add_library(ngraph_test_util STATIC EXCLUDE_FROM_ALL ${UTIL_SRC})
ie_faster_build(ngraph_test_util UNITY)
target_link_libraries(ngraph_test_util PUBLIC ngraph gtest gmock)
target_link_libraries(ngraph_test_util PUBLIC openvino::runtime gtest gmock)
target_include_directories(ngraph_test_util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
file(GLOB_RECURSE all_util_src "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")

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

@ -69,17 +69,6 @@ add_library(${TARGET_NAME}::static ALIAS ${TARGET_NAME})
openvino_developer_export_targets(COMPONENT core_legacy TARGETS ${TARGET_NAME})
# Installation rules for shared version only
set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME frontend::common)
install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
install(DIRECTORY ${FRONTEND_INCLUDE_DIR}/openvino
DESTINATION ${FRONTEND_INSTALL_INCLUDE}
COMPONENT core_dev)
export(TARGETS ${TARGET_NAME} NAMESPACE openvino::
APPEND FILE "${CMAKE_BINARY_DIR}/OpenVINOTargets.cmake")

6
src/frontends/ir/CMakeLists.txt
View File

@ -4,9 +4,9 @@
ov_add_frontend(NAME ir
FILEDESCRIPTION "FrontEnd to load OpenVINO IR file format"
LINK_LIBRARIES inference_engine_transformations pugixml::static
# TODO: remove dependencies below in CVS-69781
inference_engine inference_engine_plugin_api)
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

2
src/frontends/onnx/frontend/CMakeLists.txt
View File

@ -7,7 +7,7 @@ ov_add_frontend(NAME onnx
PROTOBUF_LITE
SKIP_NCC_STYLE
FILEDESCRIPTION "FrontEnd to load and convert ONNX file format"
LINK_LIBRARIES ngraph::builder openvino::util onnx_common inference_engine_transformations)
LINK_LIBRARIES ngraph::builder openvino::util onnx_common openvino::runtime::dev)
set(ONNX_OPSET_VERSION 15 CACHE INTERNAL "Supported version of ONNX operator set")
target_compile_definitions(${TARGET_NAME} PRIVATE ONNX_OPSET_VERSION=${ONNX_OPSET_VERSION})

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

@ -25,7 +25,7 @@ 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_link_libraries(${TARGET_NAME} PRIVATE ngraph)
target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime)
if(ONNX_USE_LITE_PROTO)
link_system_libraries(${TARGET_NAME} PUBLIC onnx_proto onnx ${Protobuf_LITE_LIBRARIES})

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

@ -6,4 +6,4 @@ ov_add_frontend(NAME paddle
LINKABLE_FRONTEND
PROTOBUF_LITE
FILEDESCRIPTION "FrontEnd to load and convert PaddlePaddle file format"
LINK_LIBRARIES inference_engine_transformations)
LINK_LIBRARIES openvino::runtime::dev)

14
src/inference/CMakeLists.txt
View File

@ -205,11 +205,6 @@ set_target_properties(${TARGET_NAME}_s PROPERTIES
set_target_properties(${TARGET_NAME}_obj
PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
# Export for build tree
export(TARGETS ${TARGET_NAME} NAMESPACE openvino::
APPEND FILE "${CMAKE_BINARY_DIR}/OpenVINOTargets.cmake")
# Export for developer package
openvino_developer_export_targets(COMPONENT core_legacy TARGETS ${TARGET_NAME}_plugin_api)
@ -217,15 +212,6 @@ openvino_developer_export_targets(COMPONENT core_legacy TARGETS ${TARGET_NAME}_p
install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" DESTINATION runtime/include
COMPONENT core_dev)
# set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME runtime)
install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core
INCLUDES DESTINATION runtime/include
# TODO: remove later once samples are updated
runtime/include/ie)
# Install static libraries for case BUILD_SHARED_LIBS=OFF
ov_install_static_lib(${TARGET_NAME}_plugin_api core)

2
src/plugins/auto/CMakeLists.txt
View File

@ -29,8 +29,6 @@ elseif(ENABLE_MULTI)
VERSION_DEFINES_FOR plugin.cpp)
endif()
target_link_libraries(${TARGET_NAME} PRIVATE ngraph inference_engine_transformations)
set_ie_threading_interface_for(${TARGET_NAME})
ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})

3
src/plugins/hetero/CMakeLists.txt
View File

@ -17,8 +17,7 @@ ie_faster_build(${TARGET_NAME}
UNITY
)
target_link_libraries(${TARGET_NAME} PRIVATE pugixml::static
ngraph inference_engine_transformations)
target_link_libraries(${TARGET_NAME} PRIVATE pugixml::static)
ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})

2
src/plugins/intel_gna/CMakeLists.txt
View File

@ -38,7 +38,7 @@ ie_add_plugin(NAME ${TARGET_NAME}
# Enable support of CC for the plugin
ie_mark_target_as_cc(${TARGET_NAME})
target_link_libraries(${TARGET_NAME} PRIVATE inference_engine_legacy inference_engine_transformations
target_link_libraries(${TARGET_NAME} PRIVATE inference_engine_legacy
Threads::Threads libGNA)
target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

8
src/plugins/intel_gpu/CMakeLists.txt
View File

@ -29,14 +29,10 @@ target_compile_options(${TARGET_NAME} PRIVATE
$<$<CONFIG:Release>:$<IF:$<CXX_COMPILER_ID:MSVC>,/Os,-Os>>)
target_link_libraries(${TARGET_NAME} PRIVATE ov_intel_gpu_graph
pugixml::static
inference_engine_transformations
inference_engine_lp_transformations
ngraph)
pugixml::static)
target_include_directories(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/include/
$<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>)
${CMAKE_CURRENT_SOURCE_DIR}/include/)
set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})

3
src/tests/functional/plugin/conformance/subgraphs_dumper/tests/CMakeLists.txt
View File

@ -10,11 +10,10 @@ addIeTargetTest(
ADDITIONAL_SOURCE_DIRS ${OpenVINO_SOURCE_DIR}/src/tests/functional/plugin/conformance/subgraphs_dumper/src/matchers
INCLUDES
${OpenVINO_SOURCE_DIR}/src/tests/functional/plugin/conformance/subgraphs_dumper/include
$<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES>
LINK_LIBRARIES
PRIVATE
funcTestUtils
ngraph
openvino::runtime
pugixml::static
ADD_CPPLINT
)

2
src/tests/functional/plugin/cpu/CMakeLists.txt
View File

@ -6,7 +6,7 @@ set(TARGET_NAME cpuFuncTests)
add_library(cpuSpecificRtInfo STATIC ${IE_MAIN_SOURCE_DIR}/src/mkldnn_plugin/utils/rt_info/memory_formats_attribute.hpp
${IE_MAIN_SOURCE_DIR}/src/mkldnn_plugin/utils/rt_info/memory_formats_attribute.cpp)
target_link_libraries(cpuSpecificRtInfo PRIVATE ngraph)
target_link_libraries(cpuSpecificRtInfo PRIVATE openvino::runtime)
set(INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} $<TARGET_PROPERTY:MKLDNNPlugin,SOURCE_DIR>)
set(DEPENDENCIES MKLDNNPlugin)

2
src/tests/functional/plugin/shared/CMakeLists.txt
View File

@ -52,7 +52,7 @@ addIeTarget(
sharedTestClasses
PRIVATE
openvino::util
inference_engine_transformations
openvino::runtime::dev
DEPENDENCIES
${DEPENDENCIES}
)

10
src/tests/ie_test_utils/common_test_utils/CMakeLists.txt
View File

@ -15,12 +15,12 @@ function(add_common_utils ADD_TARGET_NAME)
tests
LINK_LIBRARIES
PUBLIC
ngraph
gtest
gtest_main
inference_engine_transformations
ngraph_test_util
ngraphFunctions
openvino::runtime
openvino::runtime::dev
PRIVATE
openvino::util
)
@ -55,12 +55,10 @@ function(add_common_utils ADD_TARGET_NAME)
target_include_directories(${ADD_TARGET_NAME}
PUBLIC
$<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:openvino::runtime,INTERFACE_INCLUDE_DIRECTORIES>
PRIVATE
$<TARGET_PROPERTY:inference_engine_legacy,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
)
$<TARGET_PROPERTY:openvino::runtime::dev,INTERFACE_INCLUDE_DIRECTORIES>)
target_include_directories(${ADD_TARGET_NAME} SYSTEM PUBLIC ${IE_TESTS_ROOT}/ie_test_utils)
target_compile_definitions(${ADD_TARGET_NAME} PUBLIC ${ARGN})

7
src/tests/ie_test_utils/functional_test_utils/CMakeLists.txt
View File

@ -19,15 +19,14 @@ addIeTarget(
LINK_LIBRARIES
PUBLIC
commonTestUtils
inference_engine_transformations
inference_engine_lp_transformations
inference_engine
openvino::runtime
openvino::runtime::dev
PRIVATE
ngraphFunctions
pugixml::static
INCLUDES
PUBLIC
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:openvino::runtime::dev,INTERFACE_INCLUDE_DIRECTORIES>
)
ie_faster_build(${TARGET_NAME}

2
src/tests/ie_test_utils/unit_test_utils/mocks/mock_engine/CMakeLists.txt
View File

@ -32,7 +32,7 @@ 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 inference_engine_plugin_api)
target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime::dev)
endif()
target_link_libraries(${TARGET_NAME} PRIVATE inference_engine)

2
src/tests/ngraph_helpers/lpt_ngraph_functions/CMakeLists.txt
View File

@ -18,7 +18,7 @@ addIeTarget(
LINK_LIBRARIES
PRIVATE
ngraphFunctions
inference_engine_lp_transformations
openvino::runtime::dev
inference_engine_legacy
ADD_CPPLINT
DEPENDENCIES

2
src/tests/ngraph_helpers/ngraph_functions/CMakeLists.txt
View File

@ -17,7 +17,7 @@ addIeTarget(
${CMAKE_CURRENT_SOURCE_DIR}/src
LINK_LIBRARIES
PUBLIC
ngraph
openvino::runtime
ngraph_reference
interpreter_backend
ADD_CPPLINT

6
src/tests/unit/auto/CMakeLists.txt
View File

@ -15,11 +15,9 @@ addIeTargetTest(
INCLUDES
${OpenVINO_SOURCE_DIR}/src/plugins/auto ${CMAKE_CURRENT_SOURCE_DIR}
LINK_LIBRARIES
inference_engine_lp_transformations
ngraphFunctions
inference_engine
ngraph
inference_engine_transformations
openvino::runtime
openvino::runtime::dev
unitTestUtils
ADD_CPPLINT
DEPENDENCIES

4
src/tests/unit/vpu/CMakeLists.txt
View File

@ -20,8 +20,8 @@ addIeTargetTest(
LINK_LIBRARIES
vpu_graph_transformer_test_static
mvnc
ngraph
inference_engine_lp_transformations # for ngraphFunctions
openvino::runtime
openvino::runtime::dev
ADD_CPPLINT
LABELS
VPU

4
src/tests_deprecated/functional/shared_tests/CMakeLists.txt
View File

@ -5,8 +5,8 @@
set(TARGET_NAME IESharedTests)
list(APPEND SHARED_LIBRARIES
ngraph
commonTestUtils
openvino::runtime
ngraphFunctions
ieTestHelpers
)
@ -46,7 +46,7 @@ target_include_directories(${TARGET_NAME} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/lstm
${CMAKE_CURRENT_SOURCE_DIR}/common_single_layer_tests
${CMAKE_CURRENT_SOURCE_DIR}/single_layer_tests
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:openvino::runtime::dev,INTERFACE_INCLUDE_DIRECTORIES>
)
if(OpenCV_FOUND)

2
src/tests_deprecated/readers/ir_reader_v7/CMakeLists.txt
View File

@ -34,7 +34,7 @@ target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLU
target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/")
target_link_libraries(${TARGET_NAME} PRIVATE inference_engine_plugin_api
target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime::dev
inference_engine_legacy pugixml::static openvino::itt)
ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})

2
tests/fuzz/src/CMakeLists.txt
View File

@ -17,7 +17,7 @@ foreach(test_source ${tests})
add_fuzzer(${test_name} ${test_source})
target_link_libraries(${test_name} PRIVATE
openvino::runtime openvino::frontend::common cnpy zlib)
openvino::runtime cnpy zlib)
add_dependencies(fuzz ${test_name})

2
tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/CMakeLists.txt
View File

@ -34,7 +34,7 @@ add_subdirectory(${OpenVINO_SOURCE_DIR}/src/bindings/python/thirdparty/pybind11
pybind11_add_module(${PYBIND_FE_NAME} MODULE ${PYBIND_FE_SRC})
target_link_libraries(${PYBIND_FE_NAME} PRIVATE ngraph frontend_common::static)
target_link_libraries(${PYBIND_FE_NAME} PRIVATE openvino::runtime)
target_link_libraries(${PYBIND_FE_NAME} PRIVATE ${TARGET_FE_NAME})
add_dependencies(${PYBIND_FE_NAME} ${TARGET_FE_NAME})

3
tools/mo/unit_tests/mock_mo_frontend/ov_mock_mo_frontend/CMakeLists.txt
View File

@ -15,8 +15,7 @@ add_library(${TARGET_FE_NAME} SHARED ${LIBRARY_SRC} ${LIBRARY_HEADERS})
target_include_directories(${TARGET_FE_NAME} PRIVATE ".")
target_link_libraries(${TARGET_FE_NAME} PRIVATE frontend_common::static)
target_link_libraries(${TARGET_FE_NAME} PUBLIC ngraph PRIVATE ngraph::builder)
target_link_libraries(${TARGET_FE_NAME} PUBLIC openvino::runtime PRIVATE ngraph::builder)
add_clang_format_target(${TARGET_FE_NAME}_clang FOR_TARGETS ${TARGET_FE_NAME})