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

Aligned target and files (libraries) names (#19161)

Browse Source
This commit is contained in:
Ilya Lavrenov 2023-08-13 11:31:44 +04:00 committed by GitHub
parent 0368474c8a
commit 6067ab17ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 108 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,7 +173,7 @@ macro(ov_add_frontend)
# Shutdown protobuf when unloading the frontend dynamic library # Shutdown protobuf when unloading the frontend dynamic library
if(proto_files AND BUILD_SHARED_LIBS) if(proto_files AND BUILD_SHARED_LIBS)
target_link_libraries(${TARGET_NAME} PRIVATE ov_protobuf_shutdown) target_link_libraries(${TARGET_NAME} PRIVATE openvino::protobuf_shutdown)
endif() endif()
if(NOT BUILD_SHARED_LIBS) if(NOT BUILD_SHARED_LIBS)

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

@ -7,17 +7,31 @@
include(CMakeFindDependencyMacro) include(CMakeFindDependencyMacro)
# TODO: remove after changing [private plugins] # TODO: remove after changing [private plugins]
set_and_check(OpenVINO_SOURCE_DIR "@OpenVINO_SOURCE_DIR@") # KMB set_and_check(OpenVINO_SOURCE_DIR "@OpenVINO_SOURCE_DIR@") # NPU
set_and_check(OpenVINO_MAIN_SOURCE_DIR "@OpenVINO_SOURCE_DIR@") # KMB set_and_check(OpenVINO_MAIN_SOURCE_DIR "@OpenVINO_SOURCE_DIR@") # NPU
# Variables to export in plugin's projects # Variables to export in plugin's projects
set(ie_options "@IE_OPTIONS@") set(ie_options "@IE_OPTIONS@")
list(APPEND ie_options CMAKE_CXX_COMPILER_LAUNCHER CMAKE_C_COMPILER_LAUNCHER list(APPEND ie_options CMAKE_CXX_COMPILER_LAUNCHER CMAKE_C_COMPILER_LAUNCHER
CMAKE_CXX_LINKER_LAUNCHER CMAKE_C_LINKER_LAUNCHER CMAKE_CXX_LINKER_LAUNCHER CMAKE_C_LINKER_LAUNCHER
CMAKE_BUILD_TYPE CMAKE_SKIP_RPATH CMAKE_INSTALL_PREFIX CMAKE_SKIP_RPATH CMAKE_INSTALL_PREFIX CPACK_GENERATOR)
CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET
CMAKE_CONFIGURATION_TYPES CMAKE_DEFAULT_BUILD_TYPE) if(APPLE)
list(APPEND ie_options CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET)
endif()
get_property(_IE_GENERATOR_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
if(_IE_GENERATOR_MULTI_CONFIG)
list(APPEND ie_options CMAKE_CONFIGURATION_TYPES)
if(CMAKE_GENERATOR MATCHES "^Ninja Multi-Config$")
list(APPEND ie_options CMAKE_DEFAULT_BUILD_TYPE)
endif()
else()
list(APPEND ie_options CMAKE_BUILD_TYPE)
endif()
unset(_IE_GENERATOR_MULTI_CONFIG)
file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}" cache_path) 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 Inference Engine Developer package")
@ -90,6 +104,12 @@ if(TARGET IE::runtime::dev AND NOT TARGET openvino::runtime::dev)
INTERFACE_LINK_LIBRARIES IE::runtime::dev) INTERFACE_LINK_LIBRARIES IE::runtime::dev)
endif() endif()
if(TARGET IE::reference AND NOT TARGET IE::ngraph_reference)
add_library(IE::ngraph_reference INTERFACE IMPORTED)
set_target_properties(IE::ngraph_reference PROPERTIES
INTERFACE_LINK_LIBRARIES IE::reference)
endif()
if(ENABLE_SYSTEM_PUGIXML) if(ENABLE_SYSTEM_PUGIXML)
set(_ov_pugixml_pkgconfig_interface "@pugixml_FOUND@") set(_ov_pugixml_pkgconfig_interface "@pugixml_FOUND@")
set(_ov_pugixml_cmake_interface "@PugiXML_FOUND@") set(_ov_pugixml_cmake_interface "@PugiXML_FOUND@")

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

@ -13,9 +13,23 @@ set_and_check(OpenVINO_SOURCE_DIR "@OpenVINO_SOURCE_DIR@")
set(ov_options "@IE_OPTIONS@") set(ov_options "@IE_OPTIONS@")
list(APPEND ov_options CMAKE_CXX_COMPILER_LAUNCHER CMAKE_C_COMPILER_LAUNCHER list(APPEND ov_options CMAKE_CXX_COMPILER_LAUNCHER CMAKE_C_COMPILER_LAUNCHER
CMAKE_CXX_LINKER_LAUNCHER CMAKE_C_LINKER_LAUNCHER CMAKE_CXX_LINKER_LAUNCHER CMAKE_C_LINKER_LAUNCHER
CMAKE_BUILD_TYPE CMAKE_SKIP_RPATH CMAKE_INSTALL_PREFIX CMAKE_SKIP_RPATH CMAKE_INSTALL_PREFIX CPACK_GENERATOR)
CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET
CPACK_GENERATOR) if(APPLE)
list(APPEND ov_options CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET)
endif()
get_property(_OV_GENERATOR_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
if(_IE_GENERATOR_MULTI_CONFIG)
list(APPEND ov_options CMAKE_CONFIGURATION_TYPES)
if(CMAKE_GENERATOR MATCHES "^Ninja Multi-Config$")
list(APPEND ov_options CMAKE_DEFAULT_BUILD_TYPE)
endif()
else()
list(APPEND ov_options CMAKE_BUILD_TYPE)
endif()
unset(_OV_GENERATOR_MULTI_CONFIG)
file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}" cache_path) file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}" cache_path)
message(STATUS "The following CMake options are exported from OpenVINO Developer package") message(STATUS "The following CMake options are exported from OpenVINO Developer package")

6
src/cmake/openvino.cmake
View File

@ -39,9 +39,9 @@ target_include_directories(${TARGET_NAME} PUBLIC
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/inference/include> $<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/inference/include>
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/inference/include/ie>) $<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/inference/include/ie>)
target_link_libraries(${TARGET_NAME} PRIVATE ngraph_reference target_link_libraries(${TARGET_NAME} PRIVATE openvino::reference
ngraph_builders openvino::builders
ov_shape_inference openvino::shape_inference
openvino::pugixml openvino::pugixml
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}
Threads::Threads) Threads::Threads)

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

@ -2,12 +2,14 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
set(TARGET_NAME itt) set(TARGET_NAME openvino_itt)
file(GLOB_RECURSE SOURCES "src/*.cpp" "src/*.hpp") file(GLOB_RECURSE SOURCES "src/*.cpp" "src/*.hpp")
add_library(${TARGET_NAME} STATIC ${SOURCES}) add_library(${TARGET_NAME} STATIC ${SOURCES})
add_library(openvino::itt ALIAS ${TARGET_NAME}) add_library(openvino::itt ALIAS ${TARGET_NAME})
set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME itt)
target_link_libraries(${TARGET_NAME} PUBLIC openvino::util) target_link_libraries(${TARGET_NAME} PUBLIC openvino::util)

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

@ -19,7 +19,7 @@ source_group("include" FILES ${PUBLIC_HEADERS})
add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${PUBLIC_HEADERS}) add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${PUBLIC_HEADERS})
target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime::dev openvino::itt openvino::pugixml ngraph::reference target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime::dev openvino::itt openvino::pugixml openvino::reference
openvino::runtime) openvino::runtime)
set_source_files_properties(INCLUDE_DIRECTORIES set_source_files_properties(INCLUDE_DIRECTORIES

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

@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
set (TARGET_NAME "inference_engine_snippets") set (TARGET_NAME "openvino_snippets")
set(PUBLIC_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include") set(PUBLIC_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
@ -21,12 +21,15 @@ add_library(${TARGET_NAME} STATIC
${LIBRARY_SRC} ${LIBRARY_SRC}
${PUBLIC_HEADERS}) ${PUBLIC_HEADERS})
add_library(openvino::snippets ALIAS ${TARGET_NAME})
set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME snippets)
ie_faster_build(${TARGET_NAME} ie_faster_build(${TARGET_NAME}
UNITY UNITY
) )
target_link_libraries(${TARGET_NAME} PUBLIC openvino::runtime target_link_libraries(${TARGET_NAME} PUBLIC openvino::runtime
PRIVATE ngraph_reference openvino::runtime::dev) PRIVATE openvino::reference openvino::runtime::dev)
target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}> target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}>
PRIVATE $<BUILD_INTERFACE:${SHAPE_INFER_INCLUDE_DIR}>) PRIVATE $<BUILD_INTERFACE:${SHAPE_INFER_INCLUDE_DIR}>)

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

@ -9,7 +9,7 @@ addIeTargetTest(
ROOT ${CMAKE_CURRENT_SOURCE_DIR} ROOT ${CMAKE_CURRENT_SOURCE_DIR}
INCLUDES INCLUDES
${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include
$<TARGET_PROPERTY:inference_engine_snippets,INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:openvino::snippets,INTERFACE_INCLUDE_DIRECTORIES>
LINK_LIBRARIES LINK_LIBRARIES
openvino::runtime::dev openvino::runtime::dev
common_test_utils common_test_utils

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

@ -25,7 +25,7 @@ ie_faster_build(${TARGET_NAME}_obj
PCH PRIVATE "src/precomp.hpp" PCH PRIVATE "src/precomp.hpp"
) )
target_link_libraries(${TARGET_NAME}_obj PRIVATE ngraph_reference openvino::itt ngraph::builder openvino::core::dev ov_shape_inference) target_link_libraries(${TARGET_NAME}_obj PRIVATE openvino::reference openvino::itt openvino::builders openvino::core::dev openvino::shape_inference)
target_include_directories(${TARGET_NAME}_obj PRIVATE $<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}> target_include_directories(${TARGET_NAME}_obj PRIVATE $<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}>
"${CMAKE_CURRENT_SOURCE_DIR}/src") "${CMAKE_CURRENT_SOURCE_DIR}/src")

1
src/common/util/CMakeLists.txt
View File

@ -35,6 +35,7 @@ source_group("include" FILES ${PUBLIC_HEADERS})
add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${PUBLIC_HEADERS}) add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${PUBLIC_HEADERS})
add_library(openvino::util ALIAS ${TARGET_NAME}) add_library(openvino::util ALIAS ${TARGET_NAME})
set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME util)
target_link_libraries(${TARGET_NAME} PRIVATE ${CMAKE_DL_LIBS}) target_link_libraries(${TARGET_NAME} PRIVATE ${CMAKE_DL_LIBS})
if (WIN32) if (WIN32)

8
src/core/CMakeLists.txt
View File

@ -86,8 +86,8 @@ ie_faster_build(ngraph_obj
ov_add_version_defines(src/version.cpp ngraph_obj) ov_add_version_defines(src/version.cpp ngraph_obj)
target_link_libraries(ngraph_obj PRIVATE ngraph::builder ngraph::reference openvino::util target_link_libraries(ngraph_obj PRIVATE openvino::builders openvino::reference openvino::util
openvino::pugixml ov_shape_inference openvino::core::dev) openvino::pugixml openvino::shape_inference openvino::core::dev)
ie_mark_target_as_cc(ngraph_obj) ie_mark_target_as_cc(ngraph_obj)
@ -104,12 +104,12 @@ if(NOT BUILD_SHARED_LIBS)
endif() endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
# ngraph is linked against ngraph_builders, ngraph_reference, ov_shape_inference static libraries # ngraph is linked against openvino::builders, openvino::reference, openvino::shape_inference static libraries
# which include ngraph headers with dllimport attribute. Linker complains about it # which include ngraph headers with dllimport attribute. Linker complains about it
# but no way to fix this: linking with no attribute defaults to dllexport and we have # but no way to fix this: linking with no attribute defaults to dllexport and we have
# multiple defitions for ngraph symbols. # multiple defitions for ngraph symbols.
# #
# The possible way is to use object libraries for ngraph_builders, ngraph_reference # The possible way is to use object libraries for openvino::builders, openvino::reference
# but it's not convinient since these libraries are exported from build tree # but it's not convinient since these libraries are exported from build tree
# and it's better to use them as static libraries in 3rd party projects # and it's better to use them as static libraries in 3rd party projects
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)

12
src/core/builder/CMakeLists.txt
View File

@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
set(TARGET_NAME "ngraph_builders") set(TARGET_NAME "openvino_builders")
file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
file(GLOB_RECURSE PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp) file(GLOB_RECURSE PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp)
@ -18,6 +18,9 @@ source_group("include" FILES ${PUBLIC_HEADERS})
# Create static library # Create static library
add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${PUBLIC_HEADERS}) add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${PUBLIC_HEADERS})
add_library(openvino::builders ALIAS ${TARGET_NAME})
set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME builders)
ie_faster_build(${TARGET_NAME} ie_faster_build(${TARGET_NAME}
UNITY UNITY
PCH PRIVATE "src/precomp.hpp") PCH PRIVATE "src/precomp.hpp")
@ -32,11 +35,8 @@ endif()
add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})
# Add an alias so that library can be used inside the build tree, e.g. when testing ov_install_static_lib(openvino_builders ${OV_CPACK_COMP_CORE})
add_library(ngraph::builder ALIAS ${TARGET_NAME})
ov_install_static_lib(ngraph_builders ${OV_CPACK_COMP_CORE})
# developer package # developer package
openvino_developer_export_targets(COMPONENT core TARGETS ngraph::builder) openvino_developer_export_targets(COMPONENT core TARGETS openvino::builders)

10
src/core/reference/CMakeLists.txt
View File

@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
set(TARGET_NAME "ngraph_reference") set(TARGET_NAME "openvino_reference")
file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
file(GLOB_RECURSE PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp) file(GLOB_RECURSE PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp)
@ -18,6 +18,9 @@ source_group("include" FILES ${PUBLIC_HEADERS})
# Create static library # Create static library
add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${PUBLIC_HEADERS}) add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${PUBLIC_HEADERS})
add_library(openvino::reference ALIAS ${TARGET_NAME})
set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME reference)
ie_faster_build(${TARGET_NAME} ie_faster_build(${TARGET_NAME}
UNITY UNITY
PCH PRIVATE "src/precomp.hpp") PCH PRIVATE "src/precomp.hpp")
@ -42,10 +45,7 @@ target_link_libraries(${TARGET_NAME} PRIVATE Threads::Threads)
add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})
# Add an alias so that library can be used inside the build tree, e.g. when testing
add_library(ngraph::reference ALIAS ${TARGET_NAME})
ov_install_static_lib(${TARGET_NAME} ${OV_CPACK_COMP_CORE}) ov_install_static_lib(${TARGET_NAME} ${OV_CPACK_COMP_CORE})
# developer package # developer package
openvino_developer_export_targets(COMPONENT core TARGETS ngraph::reference) openvino_developer_export_targets(COMPONENT core TARGETS openvino::reference)

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

@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
set(TARGET_NAME "ov_shape_inference") set(TARGET_NAME "openvino_shape_inference")
file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
file(GLOB_RECURSE PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp) file(GLOB_RECURSE PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp)
@ -18,6 +18,9 @@ source_group("include" FILES ${PUBLIC_HEADERS})
# Create static library # Create static library
add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${PUBLIC_HEADERS}) add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${PUBLIC_HEADERS})
add_library(openvino::shape_inference ALIAS ${TARGET_NAME})
set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME shape_inference)
target_include_directories(${TARGET_NAME} PUBLIC target_include_directories(${TARGET_NAME} PUBLIC
$<BUILD_INTERFACE:${SHAPE_INFER_INCLUDE_DIR}> $<BUILD_INTERFACE:${SHAPE_INFER_INCLUDE_DIR}>
$<BUILD_INTERFACE:${OV_CORE_INCLUDE_PATH}>) $<BUILD_INTERFACE:${OV_CORE_INCLUDE_PATH}>)

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

@ -39,10 +39,10 @@ ov_add_test_target(
test_model_zoo test_model_zoo
LINK_LIBRARIES LINK_LIBRARIES
common_test_utils common_test_utils
ngraph_reference openvino::reference
ngraph::builder openvino::builders
openvino::util openvino::util
ov_shape_inference openvino::shape_inference
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}
Threads::Threads Threads::Threads
openvino::conditional_compilation openvino::conditional_compilation

5
src/frontends/common/shutdown_protobuf/CMakeLists.txt
View File

@ -2,10 +2,13 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
set(TARGET_NAME ov_protobuf_shutdown) set(TARGET_NAME openvino_protobuf_shutdown)
add_library(${TARGET_NAME} STATIC shutdown_protobuf.cpp) add_library(${TARGET_NAME} STATIC shutdown_protobuf.cpp)
add_library(openvino::protobuf_shutdown ALIAS ${TARGET_NAME})
set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME protobuf_shutdown)
target_include_directories(${TARGET_NAME} SYSTEM PRIVATE target_include_directories(${TARGET_NAME} SYSTEM PRIVATE
$<BUILD_INTERFACE:$<TARGET_PROPERTY:protobuf::libprotobuf,INTERFACE_INCLUDE_DIRECTORIES>>) $<BUILD_INTERFACE:$<TARGET_PROPERTY:protobuf::libprotobuf,INTERFACE_INCLUDE_DIRECTORIES>>)
set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})

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

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

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

@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
set(TARGET_NAME "onnx_common") set(TARGET_NAME "openvino_onnx_common")
file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
file(GLOB_RECURSE PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp) file(GLOB_RECURSE PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp)

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

@ -138,7 +138,7 @@ if(ONNX_TESTS_DEPENDENCIES)
endif() endif()
target_link_libraries(ov_onnx_frontend_tests PRIVATE gtest_main_manifest openvino::runtime::dev target_link_libraries(ov_onnx_frontend_tests PRIVATE gtest_main_manifest openvino::runtime::dev
openvino_onnx_frontend onnx_common func_test_utils) openvino_onnx_frontend openvino_onnx_common func_test_utils)
# It's needed by onnx_import_library.cpp and onnx_import_exceptions.cpp tests to include onnx_pb.h. # It's needed by onnx_import_library.cpp and onnx_import_exceptions.cpp tests to include onnx_pb.h.
# Not linking statically to libprotobuf (linked into libonnx) avoids false-failing onnx_editor tests. # Not linking statically to libprotobuf (linked into libonnx) avoids false-failing onnx_editor tests.

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

@ -116,8 +116,8 @@ endif()
ie_mark_target_as_cc(${TARGET_NAME}) ie_mark_target_as_cc(${TARGET_NAME})
target_link_libraries(${TARGET_NAME} PRIVATE dnnl target_link_libraries(${TARGET_NAME} PRIVATE dnnl
ov_shape_inference openvino::shape_inference
inference_engine_snippets) openvino::snippets)
target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_EXTENSION_API) target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_EXTENSION_API)
target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
@ -161,8 +161,8 @@ if(BUILD_SHARED_LIBS)
PRIVATE PRIVATE
$<TARGET_PROPERTY:openvino::runtime::dev,INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:openvino::runtime::dev,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:openvino::itt,INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:openvino::itt,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ov_shape_inference,INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:openvino::shape_inference,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_snippets,INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:openvino::snippets,INTERFACE_INCLUDE_DIRECTORIES>
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src
$<TARGET_PROPERTY:openvino::conditional_compilation,INTERFACE_INCLUDE_DIRECTORIES>) $<TARGET_PROPERTY:openvino::conditional_compilation,INTERFACE_INCLUDE_DIRECTORIES>)

2
src/plugins/intel_cpu/tests/functional/CMakeLists.txt
View File

@ -11,7 +11,7 @@ target_link_libraries(cpuSpecificRtInfo PRIVATE openvino::runtime)
set(INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} $<TARGET_PROPERTY:openvino_intel_cpu_plugin,SOURCE_DIR>/src) set(INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} $<TARGET_PROPERTY:openvino_intel_cpu_plugin,SOURCE_DIR>/src)
set(DEPENDENCIES openvino_intel_cpu_plugin template_extension) set(DEPENDENCIES openvino_intel_cpu_plugin template_extension)
set(LINK_LIBRARIES funcSharedTests cpuSpecificRtInfo inference_engine_snippets snippetsNgraphFunctions) set(LINK_LIBRARIES funcSharedTests cpuSpecificRtInfo openvino::snippets snippetsNgraphFunctions)
if(ENABLE_OV_ONNX_FRONTEND) if(ENABLE_OV_ONNX_FRONTEND)
list(APPEND DEFINES TEST_MODELS="${TEST_MODEL_ZOO}") list(APPEND DEFINES TEST_MODELS="${TEST_MODEL_ZOO}")

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

@ -42,7 +42,7 @@ addIeTargetTest(
$<TARGET_PROPERTY:openvino_intel_cpu_plugin,SOURCE_DIR>/thirdparty/onednn/src $<TARGET_PROPERTY:openvino_intel_cpu_plugin,SOURCE_DIR>/thirdparty/onednn/src
$<TARGET_PROPERTY:openvino::conditional_compilation,INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:openvino::conditional_compilation,INTERFACE_INCLUDE_DIRECTORIES>
PRIVATE PRIVATE
$<TARGET_PROPERTY:inference_engine_snippets,SOURCE_DIR>/include $<TARGET_PROPERTY:openvino::snippets,SOURCE_DIR>/include
EXCLUDED_SOURCE_PATHS EXCLUDED_SOURCE_PATHS
${EXCLUDED_SOURCE_PATHS_FOR_UNIT_TEST} ${EXCLUDED_SOURCE_PATHS_FOR_UNIT_TEST}
OBJECT_FILES OBJECT_FILES
@ -54,7 +54,7 @@ addIeTargetTest(
dnnl dnnl
inference_engine_transformations inference_engine_transformations
inference_engine_lp_transformations inference_engine_lp_transformations
ov_shape_inference openvino::shape_inference
inference_engine_s inference_engine_s
unit_test_utils unit_test_utils
ngraphFunctions ngraphFunctions

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

@ -33,7 +33,7 @@ target_include_directories(${TARGET_NAME} PUBLIC
target_compile_options(${TARGET_NAME} PRIVATE target_compile_options(${TARGET_NAME} PRIVATE
$<$<CONFIG:Release>:$<IF:$<CXX_COMPILER_ID:MSVC>,/Os,-Os>>) $<$<CONFIG:Release>:$<IF:$<CXX_COMPILER_ID:MSVC>,/Os,-Os>>)
target_link_libraries(${TARGET_NAME} PUBLIC OpenCL::OpenCL ov_shape_inference) target_link_libraries(${TARGET_NAME} PUBLIC OpenCL::OpenCL openvino::shape_inference)
target_link_libraries(${TARGET_NAME} PRIVATE openvino_intel_gpu_kernels target_link_libraries(${TARGET_NAME} PRIVATE openvino_intel_gpu_kernels
openvino_intel_gpu_runtime openvino_intel_gpu_runtime
openvino::itt openvino::itt

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

@ -63,7 +63,7 @@ target_link_libraries(${TARGET_NAME} PRIVATE openvino_intel_gpu_graph
gtest gtest
gtest_main gtest_main
gflags gflags
ngraph_reference openvino::reference
inference_engine_transformations inference_engine_transformations
gmock) gmock)

4
src/plugins/intel_gpu/thirdparty/CMakeLists.txt vendored
View File

@ -104,7 +104,7 @@ if(ENABLE_ONEDNN_FOR_GPU)
"-DDNNL_TARGET_ARCH=${ONEDNN_TARGET_ARCH}" "-DDNNL_TARGET_ARCH=${ONEDNN_TARGET_ARCH}"
"-DDNNL_CPU_RUNTIME=NONE" "-DDNNL_CPU_RUNTIME=NONE"
"-DDNNL_GPU_RUNTIME=OCL" "-DDNNL_GPU_RUNTIME=OCL"
"-DDNNL_LIBRARY_NAME=onednn_gpu" "-DDNNL_LIBRARY_NAME=openvino_onednn_gpu"
"-DCMAKE_INSTALL_PREFIX=${ONEDNN_INSTALL_DIR}" "-DCMAKE_INSTALL_PREFIX=${ONEDNN_INSTALL_DIR}"
"-DCMAKE_INSTALL_LIBDIR=lib/$<CONFIG>" "-DCMAKE_INSTALL_LIBDIR=lib/$<CONFIG>"
"-DDNNL_ENABLE_CONCURRENT_EXEC=ON" "-DDNNL_ENABLE_CONCURRENT_EXEC=ON"
@ -127,7 +127,7 @@ if(ENABLE_ONEDNN_FOR_GPU)
add_library(onednn_gpu_tgt INTERFACE) add_library(onednn_gpu_tgt INTERFACE)
set_target_properties(onednn_gpu_tgt PROPERTIES set_target_properties(onednn_gpu_tgt PROPERTIES
INTERFACE_LINK_DIRECTORIES "${ONEDNN_INSTALL_DIR}/lib/$<CONFIG>" INTERFACE_LINK_DIRECTORIES "${ONEDNN_INSTALL_DIR}/lib/$<CONFIG>"
INTERFACE_LINK_LIBRARIES "onednn_gpu" INTERFACE_LINK_LIBRARIES "openvino_onednn_gpu"
INTERFACE_INCLUDE_DIRECTORIES "${ONEDNN_INSTALL_DIR}/include" INTERFACE_INCLUDE_DIRECTORIES "${ONEDNN_INSTALL_DIR}/include"
INTERFACE_COMPILE_DEFINITIONS ENABLE_ONEDNN_FOR_GPU INTERFACE_COMPILE_DEFINITIONS ENABLE_ONEDNN_FOR_GPU
) )

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

@ -1,11 +1,11 @@
# Copyright (C) 2018-2023 Intel Corporation # Copyright (C) 2018-2023 Intel Corporation
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
if (NOT ENABLE_PROXY) if (NOT ENABLE_PROXY)
return() return()
endif() endif()
set(TARGET_NAME "openvino_proxy_plugin_obj") set(TARGET_NAME "openvino_proxy_plugin_obj")
set(PUBLIC_HEADERS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dev_api) set(PUBLIC_HEADERS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dev_api)

2
src/plugins/template/backend/CMakeLists.txt
View File

@ -39,7 +39,7 @@ target_compile_definitions(interpreter_backend
SHARED_LIB_PREFIX="${CMAKE_SHARED_LIBRARY_PREFIX}" SHARED_LIB_PREFIX="${CMAKE_SHARED_LIBRARY_PREFIX}"
SHARED_LIB_SUFFIX="${IE_BUILD_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}" SHARED_LIB_SUFFIX="${IE_BUILD_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}"
) )
target_link_libraries(interpreter_backend PRIVATE ngraph::builder ngraph::reference openvino::util openvino::runtime::dev ov_shape_inference) target_link_libraries(interpreter_backend PRIVATE openvino::builders openvino::reference openvino::util openvino::runtime::dev openvino::shape_inference)
target_include_directories(interpreter_backend PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/ops/>) target_include_directories(interpreter_backend PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/ops/>)

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

@ -31,7 +31,7 @@ target_include_directories(${TARGET_NAME} PRIVATE
# link common Inference Engine libraries # link common Inference Engine libraries
target_link_libraries(${TARGET_NAME} PRIVATE target_link_libraries(${TARGET_NAME} PRIVATE
openvino::interpreter_backend openvino::interpreter_backend
openvino::ngraph_reference) openvino::reference)
set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})

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

@ -40,7 +40,7 @@ else()
set(EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/src/onnx) set(EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/src/onnx)
endif() endif()
if (TARGET inference_engine_snippets) if (TARGET openvino::snippets)
list(APPEND LINK_LIBRARIES_PRIVATE snippetsNgraphFunctions) list(APPEND LINK_LIBRARIES_PRIVATE snippetsNgraphFunctions)
else() else()
list(APPEND EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/src/snippets) list(APPEND EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/src/snippets)

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

@ -5,6 +5,6 @@
add_subdirectory(ngraph_functions) add_subdirectory(ngraph_functions)
add_subdirectory(lpt_ngraph_functions) add_subdirectory(lpt_ngraph_functions)
if(TARGET inference_engine_snippets) if(TARGET openvino::snippets)
add_subdirectory(snippets_ngraph_functions) add_subdirectory(snippets_ngraph_functions)
endif() endif()

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

@ -18,7 +18,7 @@ addIeTarget(
LINK_LIBRARIES LINK_LIBRARIES
PUBLIC PUBLIC
openvino::runtime openvino::runtime
ngraph_reference openvino::reference
interpreter_backend interpreter_backend
openvino::runtime::dev openvino::runtime::dev
ADD_CPPLINT ADD_CPPLINT

4
src/tests/ngraph_helpers/snippets_ngraph_functions/CMakeLists.txt
View File

@ -5,7 +5,7 @@
set(TARGET_NAME snippetsNgraphFunctions) set(TARGET_NAME snippetsNgraphFunctions)
set(PUBLIC_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include") set(PUBLIC_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
set(SNIPPETS_INCLUDES "$<TARGET_PROPERTY:inference_engine_snippets,SOURCE_DIR>/include") set(SNIPPETS_INCLUDES "$<TARGET_PROPERTY:openvino::snippets,SOURCE_DIR>/include")
set(COMMON_TEST_UTILS_INCLUDES "$<TARGET_PROPERTY:common_test_utils,INTERFACE_INCLUDE_DIRECTORIES>") set(COMMON_TEST_UTILS_INCLUDES "$<TARGET_PROPERTY:common_test_utils,INTERFACE_INCLUDE_DIRECTORIES>")
addIeTarget( addIeTarget(
NAME ${TARGET_NAME} NAME ${TARGET_NAME}
@ -24,7 +24,7 @@ addIeTarget(
PUBLIC PUBLIC
openvino::runtime::dev openvino::runtime::dev
common_test_utils common_test_utils
inference_engine_snippets openvino::snippets
lptNgraphFunctions lptNgraphFunctions
ADD_CPPLINT ADD_CPPLINT
DEVELOPER_PACKAGE DEVELOPER_PACKAGE

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

@ -35,7 +35,7 @@ function(add_common_utils ADD_TARGET_NAME)
openvino::runtime::dev openvino::runtime::dev
PRIVATE PRIVATE
openvino::util openvino::util
ov_shape_inference openvino::shape_inference
INCLUDES INCLUDES
PUBLIC PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/include"

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

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