From 42350a705eb2dced88fbdb828decf11d5c295b90 Mon Sep 17 00:00:00 2001 From: Ilya Churaev Date: Thu, 23 Dec 2021 08:16:23 +0300 Subject: [PATCH] Remove legacy targets (#9333) * 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 --- cmake/developer_package/add_ie_target.cmake | 8 +++++++ .../frontends/frontends.cmake | 2 +- cmake/developer_package/plugins/plugins.cmake | 10 ++++---- cmake/extra_modules.cmake | 24 +++++++++++++------ ...renceEngineDeveloperPackageConfig.cmake.in | 5 ++++ cmake/templates/OpenVINOConfig.cmake.in | 6 ----- .../OpenVINODeveloperPackageConfig.cmake.in | 6 +++-- docs/snippets/CMakeLists.txt | 3 +-- docs/template_plugin/CMakeLists.txt | 6 ++--- docs/template_plugin/src/CMakeLists.txt | 7 ++---- .../tests/functional/CMakeLists.txt | 4 ++-- .../src/mkldnn_plugin/CMakeLists.txt | 7 +----- .../src/vpu/common/CMakeLists.txt | 6 ++--- .../src/vpu/graph_transformer/CMakeLists.txt | 4 ++-- .../thirdparty/clDNN/src/CMakeLists.txt | 4 ++-- src/bindings/c/src/CMakeLists.txt | 2 -- .../python/src/pyopenvino/CMakeLists.txt | 6 +++-- src/cmake/ov_runtime.cmake | 20 +++++++++++----- src/common/legacy/CMakeLists.txt | 9 +++---- .../CMakeLists.txt | 11 --------- .../offline_transformations/CMakeLists.txt | 4 ++-- src/common/preprocessing/CMakeLists.txt | 8 +++---- src/common/snippets/CMakeLists.txt | 4 ++-- src/common/transformations/CMakeLists.txt | 8 ------- src/core/CMakeLists.txt | 13 ---------- src/core/tests/CMakeLists.txt | 2 +- src/core/tests/engines_util/CMakeLists.txt | 4 +--- src/core/tests/frontend/shared/CMakeLists.txt | 4 ++-- src/core/tests/util/CMakeLists.txt | 2 +- src/frontends/common/CMakeLists.txt | 11 --------- src/frontends/ir/CMakeLists.txt | 6 ++--- src/frontends/onnx/frontend/CMakeLists.txt | 2 +- src/frontends/onnx/onnx_common/CMakeLists.txt | 2 +- src/frontends/paddle/CMakeLists.txt | 2 +- src/inference/CMakeLists.txt | 14 ----------- src/plugins/auto/CMakeLists.txt | 2 -- src/plugins/hetero/CMakeLists.txt | 3 +-- src/plugins/intel_gna/CMakeLists.txt | 2 +- src/plugins/intel_gpu/CMakeLists.txt | 8 ++----- .../subgraphs_dumper/tests/CMakeLists.txt | 3 +-- .../functional/plugin/cpu/CMakeLists.txt | 2 +- .../functional/plugin/shared/CMakeLists.txt | 2 +- .../common_test_utils/CMakeLists.txt | 10 ++++---- .../functional_test_utils/CMakeLists.txt | 7 +++--- .../mocks/mock_engine/CMakeLists.txt | 2 +- .../lpt_ngraph_functions/CMakeLists.txt | 2 +- .../ngraph_functions/CMakeLists.txt | 2 +- src/tests/unit/auto/CMakeLists.txt | 6 ++--- src/tests/unit/vpu/CMakeLists.txt | 4 ++-- .../functional/shared_tests/CMakeLists.txt | 4 ++-- .../readers/ir_reader_v7/CMakeLists.txt | 2 +- tests/fuzz/src/CMakeLists.txt | 2 +- .../mock_mo_python_api/CMakeLists.txt | 2 +- .../ov_mock_mo_frontend/CMakeLists.txt | 3 +-- 54 files changed, 123 insertions(+), 181 deletions(-) diff --git a/cmake/developer_package/add_ie_target.cmake b/cmake/developer_package/add_ie_target.cmake index 0aff25cddc2..a940847423d 100644 --- a/cmake/developer_package/add_ie_target.cmake +++ b/cmake/developer_package/add_ie_target.cmake @@ -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() diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake index 43842a66114..e585b29d044 100644 --- a/cmake/developer_package/frontends/frontends.cmake +++ b/cmake/developer_package/frontends/frontends.cmake @@ -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 diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake index 6068d4e5af0..8095dba3f0d 100644 --- a/cmake/developer_package/plugins/plugins.cmake +++ b/cmake/developer_package/plugins/plugins.cmake @@ -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
# POSSIBLE_PLUGINS ) diff --git a/cmake/extra_modules.cmake b/cmake/extra_modules.cmake index b9dc0d91337..8262742d955 100644 --- a/cmake/extra_modules.cmake +++ b/cmake/extra_modules.cmake @@ -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/*") diff --git a/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in b/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in index ef7d2beec02..5bc30250661 100644 --- a/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in +++ b/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in @@ -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 diff --git a/cmake/templates/OpenVINOConfig.cmake.in b/cmake/templates/OpenVINOConfig.cmake.in index 5ab40ad9153..cade1754859 100644 --- a/cmake/templates/OpenVINOConfig.cmake.in +++ b/cmake/templates/OpenVINOConfig.cmake.in @@ -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) # diff --git a/cmake/templates/OpenVINODeveloperPackageConfig.cmake.in b/cmake/templates/OpenVINODeveloperPackageConfig.cmake.in index da3a7b0427b..b280c11fb62 100644 --- a/cmake/templates/OpenVINODeveloperPackageConfig.cmake.in +++ b/cmake/templates/OpenVINODeveloperPackageConfig.cmake.in @@ -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) diff --git a/docs/snippets/CMakeLists.txt b/docs/snippets/CMakeLists.txt index e240d0b3cfe..a073b5caa24 100644 --- a/docs/snippets/CMakeLists.txt +++ b/docs/snippets/CMakeLists.txt @@ -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) diff --git a/docs/template_plugin/CMakeLists.txt b/docs/template_plugin/CMakeLists.txt index 77b90650db5..3080c74b619 100644 --- a/docs/template_plugin/CMakeLists.txt +++ b/docs/template_plugin/CMakeLists.txt @@ -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) diff --git a/docs/template_plugin/src/CMakeLists.txt b/docs/template_plugin/src/CMakeLists.txt index 18b20731e18..f413a8f3260 100644 --- a/docs/template_plugin/src/CMakeLists.txt +++ b/docs/template_plugin/src/CMakeLists.txt @@ -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}) diff --git a/docs/template_plugin/tests/functional/CMakeLists.txt b/docs/template_plugin/tests/functional/CMakeLists.txt index 0a0309992b6..9015a50f922 100644 --- a/docs/template_plugin/tests/functional/CMakeLists.txt +++ b/docs/template_plugin/tests/functional/CMakeLists.txt @@ -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" diff --git a/inference-engine/src/mkldnn_plugin/CMakeLists.txt b/inference-engine/src/mkldnn_plugin/CMakeLists.txt index e6397b6a77c..f2a9f6c5339 100644 --- a/inference-engine/src/mkldnn_plugin/CMakeLists.txt +++ b/inference-engine/src/mkldnn_plugin/CMakeLists.txt @@ -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 $ - $ - $ + $ $ - $ $ $ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/inference-engine/src/vpu/common/CMakeLists.txt b/inference-engine/src/vpu/common/CMakeLists.txt index d691b3137c4..24ac28f87bf 100644 --- a/inference-engine/src/vpu/common/CMakeLists.txt +++ b/inference-engine/src/vpu/common/CMakeLists.txt @@ -36,8 +36,8 @@ function(add_common_target TARGET_NAME STATIC_IE) $) target_include_directories(${TARGET_NAME} SYSTEM PUBLIC - $ - $ + $ + $ $) 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) diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt index 13130799383..40a3751c2ef 100644 --- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt +++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt @@ -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 ) diff --git a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt index f4d66f8872e..f56f727d435 100644 --- a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt +++ b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt @@ -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) diff --git a/src/bindings/c/src/CMakeLists.txt b/src/bindings/c/src/CMakeLists.txt index 97c9930c14c..ba507379bec 100644 --- a/src/bindings/c/src/CMakeLists.txt +++ b/src/bindings/c/src/CMakeLists.txt @@ -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) diff --git a/src/bindings/python/src/pyopenvino/CMakeLists.txt b/src/bindings/python/src/pyopenvino/CMakeLists.txt index 1a5d31bfcfa..adaf9b9f760 100644 --- a/src/bindings/python/src/pyopenvino/CMakeLists.txt +++ b/src/bindings/python/src/pyopenvino/CMakeLists.txt @@ -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}/..") diff --git a/src/cmake/ov_runtime.cmake b/src/cmake/ov_runtime.cmake index 650b878a403..3ff4a28d36d 100644 --- a/src/cmake/ov_runtime.cmake +++ b/src/cmake/ov_runtime.cmake @@ -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 $> - $> - $> +target_include_directories(${TARGET_NAME} PUBLIC $ + $ + $ + $ ) 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 $> - $>) +target_include_directories(${TARGET_NAME}_dev INTERFACE $ + $ + $ + $ + ) + +target_compile_definitions(${TARGET_NAME}_dev INTERFACE + $) + +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) diff --git a/src/common/legacy/CMakeLists.txt b/src/common/legacy/CMakeLists.txt index 05587686b60..76823f4afaf 100644 --- a/src/common/legacy/CMakeLists.txt +++ b/src/common/legacy/CMakeLists.txt @@ -37,9 +37,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE ${PUBLIC_HEADERS_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src $/src # For CNNNetworkNGraphImpl - $ - $ - $ + $ $) target_compile_definitions(${TARGET_NAME}_obj PRIVATE $) @@ -54,9 +52,8 @@ add_library(${TARGET_NAME} STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp $) -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 $) diff --git a/src/common/low_precision_transformations/CMakeLists.txt b/src/common/low_precision_transformations/CMakeLists.txt index d0bdc4a11a2..cf19e3f36a1 100644 --- a/src/common/low_precision_transformations/CMakeLists.txt +++ b/src/common/low_precision_transformations/CMakeLists.txt @@ -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() diff --git a/src/common/offline_transformations/CMakeLists.txt b/src/common/offline_transformations/CMakeLists.txt index 359cda2fa77..25fefe22c26 100644 --- a/src/common/offline_transformations/CMakeLists.txt +++ b/src/common/offline_transformations/CMakeLists.txt @@ -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} diff --git a/src/common/preprocessing/CMakeLists.txt b/src/common/preprocessing/CMakeLists.txt index a15fa60e039..c0baef8cc06 100644 --- a/src/common/preprocessing/CMakeLists.txt +++ b/src/common/preprocessing/CMakeLists.txt @@ -99,7 +99,7 @@ ie_faster_build(${TARGET_NAME}_obj ) target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLUGIN - $ + $ $ $<$: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 $ - $) + $) # 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) diff --git a/src/common/snippets/CMakeLists.txt b/src/common/snippets/CMakeLists.txt index de6b5dd3992..7eb2c5712d3 100644 --- a/src/common/snippets/CMakeLists.txt +++ b/src/common/snippets/CMakeLists.txt @@ -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 $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) diff --git a/src/common/transformations/CMakeLists.txt b/src/common/transformations/CMakeLists.txt index 97deaaa294f..af300ca433e 100644 --- a/src/common/transformations/CMakeLists.txt +++ b/src/common/transformations/CMakeLists.txt @@ -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) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 1ebda071d61..6562d8127e2 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -114,23 +114,10 @@ add_library(openvino::core ALIAS ngraph) target_include_directories(ngraph INTERFACE $) -#----------------------------------------------------------------------------------------------- -# 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 diff --git a/src/core/tests/CMakeLists.txt b/src/core/tests/CMakeLists.txt index d47c2b65e0e..1e3dbf4a88b 100644 --- a/src/core/tests/CMakeLists.txt +++ b/src/core/tests/CMakeLists.txt @@ -409,7 +409,7 @@ set(SRC # For type relaxed types set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/threading.cpp - PROPERTIES INCLUDE_DIRECTORIES $) + PROPERTIES INCLUDE_DIRECTORIES $) # Add include path to so_extension.hpp set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/extension.cpp diff --git a/src/core/tests/engines_util/CMakeLists.txt b/src/core/tests/engines_util/CMakeLists.txt index 0d585cb16aa..9165e936cfb 100644 --- a/src/core/tests/engines_util/CMakeLists.txt +++ b/src/core/tests/engines_util/CMakeLists.txt @@ -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_include_directories(engines_test_util PRIVATE $) -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}) diff --git a/src/core/tests/frontend/shared/CMakeLists.txt b/src/core/tests/frontend/shared/CMakeLists.txt index 71cf6f5c92a..b2fa3cb7ba1 100644 --- a/src/core/tests/frontend/shared/CMakeLists.txt +++ b/src/core/tests/frontend/shared/CMakeLists.txt @@ -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} diff --git a/src/core/tests/util/CMakeLists.txt b/src/core/tests/util/CMakeLists.txt index b0f7cad2323..59bdad22fa1 100644 --- a/src/core/tests/util/CMakeLists.txt +++ b/src/core/tests/util/CMakeLists.txt @@ -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") diff --git a/src/frontends/common/CMakeLists.txt b/src/frontends/common/CMakeLists.txt index 0402c98e6bf..96c4775cb3f 100644 --- a/src/frontends/common/CMakeLists.txt +++ b/src/frontends/common/CMakeLists.txt @@ -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") diff --git a/src/frontends/ir/CMakeLists.txt b/src/frontends/ir/CMakeLists.txt index 120bae4b6d5..0a3d2617c39 100644 --- a/src/frontends/ir/CMakeLists.txt +++ b/src/frontends/ir/CMakeLists.txt @@ -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 diff --git a/src/frontends/onnx/frontend/CMakeLists.txt b/src/frontends/onnx/frontend/CMakeLists.txt index aaf2b473682..f75a2917d81 100644 --- a/src/frontends/onnx/frontend/CMakeLists.txt +++ b/src/frontends/onnx/frontend/CMakeLists.txt @@ -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}) diff --git a/src/frontends/onnx/onnx_common/CMakeLists.txt b/src/frontends/onnx/onnx_common/CMakeLists.txt index 7921a6d58fb..026882c8c90 100644 --- a/src/frontends/onnx/onnx_common/CMakeLists.txt +++ b/src/frontends/onnx/onnx_common/CMakeLists.txt @@ -25,7 +25,7 @@ set(ONNX_COMMON_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) target_include_directories(${TARGET_NAME} PUBLIC $ $) -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}) diff --git a/src/frontends/paddle/CMakeLists.txt b/src/frontends/paddle/CMakeLists.txt index c42ead4cf8f..1d043d7e812 100644 --- a/src/frontends/paddle/CMakeLists.txt +++ b/src/frontends/paddle/CMakeLists.txt @@ -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) diff --git a/src/inference/CMakeLists.txt b/src/inference/CMakeLists.txt index 85b58bcba12..5aaeb7cb4ed 100644 --- a/src/inference/CMakeLists.txt +++ b/src/inference/CMakeLists.txt @@ -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) diff --git a/src/plugins/auto/CMakeLists.txt b/src/plugins/auto/CMakeLists.txt index b144bfb4866..3b0094c7917 100644 --- a/src/plugins/auto/CMakeLists.txt +++ b/src/plugins/auto/CMakeLists.txt @@ -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}) diff --git a/src/plugins/hetero/CMakeLists.txt b/src/plugins/hetero/CMakeLists.txt index 61c9eab2a94..5b3af67fdd3 100644 --- a/src/plugins/hetero/CMakeLists.txt +++ b/src/plugins/hetero/CMakeLists.txt @@ -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}) diff --git a/src/plugins/intel_gna/CMakeLists.txt b/src/plugins/intel_gna/CMakeLists.txt index e531dbf98be..417063188d3 100644 --- a/src/plugins/intel_gna/CMakeLists.txt +++ b/src/plugins/intel_gna/CMakeLists.txt @@ -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}) diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt index e109575acfb..aa65f408984 100644 --- a/src/plugins/intel_gpu/CMakeLists.txt +++ b/src/plugins/intel_gpu/CMakeLists.txt @@ -29,14 +29,10 @@ target_compile_options(${TARGET_NAME} PRIVATE $<$:$,/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/ - $) + ${CMAKE_CURRENT_SOURCE_DIR}/include/) set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) diff --git a/src/tests/functional/plugin/conformance/subgraphs_dumper/tests/CMakeLists.txt b/src/tests/functional/plugin/conformance/subgraphs_dumper/tests/CMakeLists.txt index b56b65c9b1f..a6811a77774 100644 --- a/src/tests/functional/plugin/conformance/subgraphs_dumper/tests/CMakeLists.txt +++ b/src/tests/functional/plugin/conformance/subgraphs_dumper/tests/CMakeLists.txt @@ -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 - $ LINK_LIBRARIES PRIVATE funcTestUtils - ngraph + openvino::runtime pugixml::static ADD_CPPLINT ) diff --git a/src/tests/functional/plugin/cpu/CMakeLists.txt b/src/tests/functional/plugin/cpu/CMakeLists.txt index e60fc572283..64fb4357db2 100644 --- a/src/tests/functional/plugin/cpu/CMakeLists.txt +++ b/src/tests/functional/plugin/cpu/CMakeLists.txt @@ -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} $) set(DEPENDENCIES MKLDNNPlugin) diff --git a/src/tests/functional/plugin/shared/CMakeLists.txt b/src/tests/functional/plugin/shared/CMakeLists.txt index bca4f9d39e6..9c4834253ad 100644 --- a/src/tests/functional/plugin/shared/CMakeLists.txt +++ b/src/tests/functional/plugin/shared/CMakeLists.txt @@ -52,7 +52,7 @@ addIeTarget( sharedTestClasses PRIVATE openvino::util - inference_engine_transformations + openvino::runtime::dev DEPENDENCIES ${DEPENDENCIES} ) diff --git a/src/tests/ie_test_utils/common_test_utils/CMakeLists.txt b/src/tests/ie_test_utils/common_test_utils/CMakeLists.txt index 6c9f0148e00..93f1557317a 100644 --- a/src/tests/ie_test_utils/common_test_utils/CMakeLists.txt +++ b/src/tests/ie_test_utils/common_test_utils/CMakeLists.txt @@ -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 - $ + $ PRIVATE $ - $ - $ - ) + $) target_include_directories(${ADD_TARGET_NAME} SYSTEM PUBLIC ${IE_TESTS_ROOT}/ie_test_utils) target_compile_definitions(${ADD_TARGET_NAME} PUBLIC ${ARGN}) diff --git a/src/tests/ie_test_utils/functional_test_utils/CMakeLists.txt b/src/tests/ie_test_utils/functional_test_utils/CMakeLists.txt index ac31cc4b89c..93292edd945 100644 --- a/src/tests/ie_test_utils/functional_test_utils/CMakeLists.txt +++ b/src/tests/ie_test_utils/functional_test_utils/CMakeLists.txt @@ -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 - $ + $ ) ie_faster_build(${TARGET_NAME} diff --git a/src/tests/ie_test_utils/unit_test_utils/mocks/mock_engine/CMakeLists.txt b/src/tests/ie_test_utils/unit_test_utils/mocks/mock_engine/CMakeLists.txt index d6343d8bfb7..bd07fbddcdb 100644 --- a/src/tests/ie_test_utils/unit_test_utils/mocks/mock_engine/CMakeLists.txt +++ b/src/tests/ie_test_utils/unit_test_utils/mocks/mock_engine/CMakeLists.txt @@ -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) diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/CMakeLists.txt b/src/tests/ngraph_helpers/lpt_ngraph_functions/CMakeLists.txt index 546b42c963b..f01fce74c02 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/CMakeLists.txt +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/CMakeLists.txt @@ -18,7 +18,7 @@ addIeTarget( LINK_LIBRARIES PRIVATE ngraphFunctions - inference_engine_lp_transformations + openvino::runtime::dev inference_engine_legacy ADD_CPPLINT DEPENDENCIES diff --git a/src/tests/ngraph_helpers/ngraph_functions/CMakeLists.txt b/src/tests/ngraph_helpers/ngraph_functions/CMakeLists.txt index 583dbca2679..a6fcf150d63 100644 --- a/src/tests/ngraph_helpers/ngraph_functions/CMakeLists.txt +++ b/src/tests/ngraph_helpers/ngraph_functions/CMakeLists.txt @@ -17,7 +17,7 @@ addIeTarget( ${CMAKE_CURRENT_SOURCE_DIR}/src LINK_LIBRARIES PUBLIC - ngraph + openvino::runtime ngraph_reference interpreter_backend ADD_CPPLINT diff --git a/src/tests/unit/auto/CMakeLists.txt b/src/tests/unit/auto/CMakeLists.txt index 9fb4cbf66bb..c7519d01628 100644 --- a/src/tests/unit/auto/CMakeLists.txt +++ b/src/tests/unit/auto/CMakeLists.txt @@ -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 diff --git a/src/tests/unit/vpu/CMakeLists.txt b/src/tests/unit/vpu/CMakeLists.txt index cd505a6b7e0..e081b732032 100644 --- a/src/tests/unit/vpu/CMakeLists.txt +++ b/src/tests/unit/vpu/CMakeLists.txt @@ -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 diff --git a/src/tests_deprecated/functional/shared_tests/CMakeLists.txt b/src/tests_deprecated/functional/shared_tests/CMakeLists.txt index bf932bb0c81..6bb4ba313a3 100644 --- a/src/tests_deprecated/functional/shared_tests/CMakeLists.txt +++ b/src/tests_deprecated/functional/shared_tests/CMakeLists.txt @@ -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 - $ + $ ) if(OpenCV_FOUND) diff --git a/src/tests_deprecated/readers/ir_reader_v7/CMakeLists.txt b/src/tests_deprecated/readers/ir_reader_v7/CMakeLists.txt index 6b9d7543a06..51a2ca8322c 100644 --- a/src/tests_deprecated/readers/ir_reader_v7/CMakeLists.txt +++ b/src/tests_deprecated/readers/ir_reader_v7/CMakeLists.txt @@ -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}) diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt index 72c22a8fd7a..224f84f26e4 100644 --- a/tests/fuzz/src/CMakeLists.txt +++ b/tests/fuzz/src/CMakeLists.txt @@ -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}) diff --git a/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/CMakeLists.txt b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/CMakeLists.txt index 83ad038bf43..2bf85808537 100644 --- a/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/CMakeLists.txt +++ b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/CMakeLists.txt @@ -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}) diff --git a/tools/mo/unit_tests/mock_mo_frontend/ov_mock_mo_frontend/CMakeLists.txt b/tools/mo/unit_tests/mock_mo_frontend/ov_mock_mo_frontend/CMakeLists.txt index aae056a2fd7..7667bfc89bc 100644 --- a/tools/mo/unit_tests/mock_mo_frontend/ov_mock_mo_frontend/CMakeLists.txt +++ b/tools/mo/unit_tests/mock_mo_frontend/ov_mock_mo_frontend/CMakeLists.txt @@ -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})