From 9e5f46eb9833b10e02f530bc88503bfbecdf3d68 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Fri, 18 Dec 2020 02:18:13 +0300 Subject: [PATCH] Split developer targets per component --- .ci/azure/linux_ngraph_onnx.yml | 2 +- .ci/openvino-onnx/Dockerfile | 2 - CMakeLists.txt | 30 +++++++------ cmake/developer_package/add_ie_target.cmake | 10 ++--- cmake/developer_package/features.cmake | 4 ++ inference-engine/CMakeLists.txt | 42 ++++++------------- inference-engine/cmake/features.cmake | 4 -- ...renceEngineDeveloperPackageConfig.cmake.in | 12 +++++- .../src/inference_engine/CMakeLists.txt | 6 +-- .../src/vpu/common/CMakeLists.txt | 2 +- .../src/vpu/graph_transformer/CMakeLists.txt | 2 +- .../functional/plugin/shared/CMakeLists.txt | 1 + .../shared_test_classes/CMakeLists.txt | 1 + .../common_test_utils/CMakeLists.txt | 11 ++--- .../functional_test_utils/CMakeLists.txt | 1 + .../unit_test_utils/CMakeLists.txt | 1 + .../lpt_ngraph_functions/CMakeLists.txt | 1 + .../ngraph_functions/CMakeLists.txt | 1 + .../behavior/shared_tests/CMakeLists.txt | 2 +- .../functional/ie_tests/CMakeLists.txt | 3 +- .../functional/shared_tests/CMakeLists.txt | 2 +- .../functional/vpu/CMakeLists.txt | 6 +-- inference-engine/thirdparty/CMakeLists.txt | 6 +-- ngraph/core/builder/CMakeLists.txt | 4 +- ngraph/core/reference/CMakeLists.txt | 2 +- openvino/CMakeLists.txt | 2 +- openvino/itt/CMakeLists.txt | 2 +- 27 files changed, 81 insertions(+), 81 deletions(-) diff --git a/.ci/azure/linux_ngraph_onnx.yml b/.ci/azure/linux_ngraph_onnx.yml index f993670f98c95b..c6e363d7c99f19 100644 --- a/.ci/azure/linux_ngraph_onnx.yml +++ b/.ci/azure/linux_ngraph_onnx.yml @@ -64,7 +64,7 @@ jobs: - task: CMake@1 inputs: # CMake must get Python 3.x version by default - cmakeArgs: -GNinja -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_VPU=OFF -DENABLE_GNA=OFF -DENABLE_OPENCV=OFF -DENABLE_CPPLINT=OFF -DENABLE_TESTS=OFF -DENABLE_BEH_TESTS=OFF -DENABLE_FUNCTIONAL_TESTS=OFF -DENABLE_MKL_DNN=ON -DENABLE_CLDNN=OFF -DENABLE_PROFILING_ITT=OFF -DENABLE_SAMPLES=OFF -DENABLE_SPEECH_DEMO=OFF -DENABLE_PYTHON=ON -DPYTHON_EXECUTABLE=/usr/bin/python3.6 -DNGRAPH_ONNX_IMPORT_ENABLE=ON -DNGRAPH_INTERPRETER_ENABLE=ON -DNGRAPH_DEBUG_ENABLE=OFF -DNGRAPH_DYNAMIC_COMPONENTS_ENABLE=ON -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) $(REPO_DIR) + cmakeArgs: -GNinja -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_VPU=OFF -DENABLE_GNA=OFF -DENABLE_OPENCV=OFF -DENABLE_CPPLINT=OFF -DENABLE_TESTS=OFF -DENABLE_MKL_DNN=ON -DENABLE_CLDNN=OFF -DENABLE_PROFILING_ITT=OFF -DENABLE_SAMPLES=OFF -DENABLE_SPEECH_DEMO=OFF -DENABLE_PYTHON=ON -DPYTHON_EXECUTABLE=/usr/bin/python3.6 -DNGRAPH_ONNX_IMPORT_ENABLE=ON -DNGRAPH_INTERPRETER_ENABLE=ON -DNGRAPH_DEBUG_ENABLE=OFF -DNGRAPH_DYNAMIC_COMPONENTS_ENABLE=ON -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) $(REPO_DIR) workingDirectory: $(BUILD_DIR) enabled: false diff --git a/.ci/openvino-onnx/Dockerfile b/.ci/openvino-onnx/Dockerfile index 954b1634ed2a23..5fe36e46219061 100644 --- a/.ci/openvino-onnx/Dockerfile +++ b/.ci/openvino-onnx/Dockerfile @@ -57,8 +57,6 @@ RUN cmake .. \ -DENABLE_OPENCV=OFF \ -DENABLE_CPPLINT=OFF \ -DENABLE_TESTS=OFF \ - -DENABLE_BEH_TESTS=OFF \ - -DENABLE_FUNCTIONAL_TESTS=OFF \ -DENABLE_MKL_DNN=ON \ -DENABLE_CLDNN=OFF \ -DENABLE_PROFILING_ITT=OFF \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 207489d1f430cc..8b8362c7d24f72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,8 +29,10 @@ message (STATUS "CMAKE_C_COMPILER_ID ................... " ${CMAKE_C_COMPILER_ID message (STATUS "CMAKE_BUILD_TYPE ...................... " ${CMAKE_BUILD_TYPE}) # remove file with exported developer targets to force its regeneration -file(REMOVE "${CMAKE_BINARY_DIR}/inference_engine_targets_developer.cmake") -file(REMOVE "${CMAKE_BINARY_DIR}/inference_engine_targets.cmake") +foreach(component IN LISTS openvino_export_components) + file(REMOVE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake") + unset(${component} CACHE) +endforeach() # # Build @@ -117,28 +119,32 @@ function(build_ngraph) set(NGRAPH_LIBRARIES ngraph PARENT_SCOPE) endfunction() -file(REMOVE "${CMAKE_BINARY_DIR}/openvino_targets_developer.cmake") -unset(OpenVINODeveloperPackageTargets CACHE) - function(openvino_developer_export_targets) - set(OpenVINODeveloperPackageTargets "${OpenVINODeveloperPackageTargets};${ARGV}") + cmake_parse_arguments(EXPORT "" "COMPONENT" "TARGETS" ${ARGN}) + + set(${EXPORT_COMPONENT} "${${EXPORT_COMPONENT}};${EXPORT_TARGETS}") # to allow exporting of aliased targets with the original names - foreach(target_name ${OpenVINODeveloperPackageTargets}) + foreach(target_name IN LISTS ${EXPORT_COMPONENT}) if(TARGET "${target_name}") get_target_property(original_name ${target_name} ALIASED_TARGET) if(TARGET "${original_name}") message(STATUS "The name ${target_name} is an ALIAS for ${original_name}. " "It will be exported to the InferenceEngineDeveloperPackage with the original name.") - list(REMOVE_ITEM OpenVINODeveloperPackageTargets ${target_name}) - list(APPEND OpenVINODeveloperPackageTargets ${original_name}) + list(REMOVE_ITEM ${EXPORT_COMPONENT} ${target_name}) + list(APPEND ${EXPORT_COMPONENT} ${original_name}) endif() endif() endforeach() - list(REMOVE_DUPLICATES OpenVINODeveloperPackageTargets) - set(OpenVINODeveloperPackageTargets "${OpenVINODeveloperPackageTargets}" CACHE INTERNAL - "Paths to extra Inference Engine plugins" FORCE) + list(REMOVE_DUPLICATES ${EXPORT_COMPONENT}) + set(${EXPORT_COMPONENT} "${${EXPORT_COMPONENT}}" CACHE INTERNAL + "A list of OpenVINO ${EXPORT_COMPONENT} exported targets" FORCE) + + list(APPEND openvino_export_components ${EXPORT_COMPONENT}) + list(REMOVE_DUPLICATES openvino_export_components) + set(openvino_export_components "${openvino_export_components}" CACHE INTERNAL + "A list of OpenVINO exported components" FORCE) endfunction() add_subdirectory(openvino) diff --git a/cmake/developer_package/add_ie_target.cmake b/cmake/developer_package/add_ie_target.cmake index f6d4dd19ca6a5f..b081a69459da1d 100644 --- a/cmake/developer_package/add_ie_target.cmake +++ b/cmake/developer_package/add_ie_target.cmake @@ -8,7 +8,7 @@ Example: addIeTarget( NAME core_lib ADD_CPPLINT - DEVELOPER_PACKAGE + DEVELOPER_PACKAGE TYPE ROOT ${CMAKE_CURRENT_SOURCE_DIR} ADDITIONAL_SOURCE_DIRS @@ -31,7 +31,6 @@ addIeTarget( function(addIeTarget) set(options ADD_CPPLINT # Enables code style checks for the target - DEVELOPER_PACKAGE # Enables exporting of the target through the developer package ) set(oneValueRequiredArgs TYPE # type of target, SHARED|STATIC|EXECUTABLE. SHARED and STATIC correspond to add_library, EXECUTABLE to add_executable @@ -39,6 +38,7 @@ function(addIeTarget) ROOT # root directory to be used for recursive search of source files ) set(oneValueOptionalArgs + DEVELOPER_PACKAGE # Enables exporting of the target through the developer package ) set(multiValueArgs INCLUDES # Extra include directories @@ -121,10 +121,8 @@ function(addIeTarget) endif() if (ARG_DEVELOPER_PACKAGE) # developer package - ie_developer_export_targets(${ARG_NAME}) - if (ARG_EXPORT_DEPENDENCIES) - ie_developer_export_targets(${ARG_NAME} ${ARG_EXPORT_DEPENDENCIES}) - endif() + openvino_developer_export_targets(COMPONENT ${ARG_DEVELOPER_PACKAGE} + TARGETS ${ARG_NAME} ${ARG_EXPORT_DEPENDENCIES}) endif() if(WIN32) # Provide default compile pdb name equal to target name diff --git a/cmake/developer_package/features.cmake b/cmake/developer_package/features.cmake index 251e0fec4fe72e..a5400b33c00d2a 100644 --- a/cmake/developer_package/features.cmake +++ b/cmake/developer_package/features.cmake @@ -44,6 +44,10 @@ ie_option (ENABLE_CLANG_FORMAT "Enable clang-format checks during the build" ON) ie_option (VERBOSE_BUILD "shows extra information about build" OFF) +ie_option (ENABLE_UNSAFE_LOCATIONS "skip check for MD5 for dependency" OFF) + +ie_option (ENABLE_ALTERNATIVE_TEMP "in case of dependency conflict, to avoid modification in master, use local copy of dependency" ON) + # # Check features # diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt index cdf3e235e3773b..3f44e176cf88e9 100644 --- a/inference-engine/CMakeLists.txt +++ b/inference-engine/CMakeLists.txt @@ -14,38 +14,20 @@ endif() find_package(Threads REQUIRED) -unset(IEDeveloperPackageTargets CACHE) function(ie_developer_export_targets) - set(IEDeveloperPackageTargets "${IEDeveloperPackageTargets};${ARGV}") - - # to allow exporting of aliased targets with the original names - foreach(target_name ${IEDeveloperPackageTargets}) - if(TARGET "${target_name}") - get_target_property(original_name ${target_name} ALIASED_TARGET) - if(TARGET "${original_name}") - message(STATUS "The name ${target_name} is an ALIAS for ${original_name}. " - "It will be exported to the InferenceEngineDeveloperPackage with the original name.") - list(REMOVE_ITEM IEDeveloperPackageTargets ${target_name}) - list(APPEND IEDeveloperPackageTargets ${original_name}) - endif() - endif() - endforeach() - - list(REMOVE_DUPLICATES IEDeveloperPackageTargets) - set(IEDeveloperPackageTargets "${IEDeveloperPackageTargets}" CACHE INTERNAL - "Paths to extra Inference Engine plugins" FORCE) + openvino_developer_export_targets(COMPONENT inference_engine TARGETS ${ARGN}) endfunction() function(ie_developer_export) - export(TARGETS ${OpenVINODeveloperPackageTargets} NAMESPACE IE:: - APPEND FILE "${CMAKE_BINARY_DIR}/inference_engine_targets_developer.cmake") - - export(TARGETS ${IEDeveloperPackageTargets} NAMESPACE IE:: - APPEND FILE "${CMAKE_BINARY_DIR}/inference_engine_targets_developer.cmake") + set(all_dev_targets gflags inference_engine_ir_reader inference_engine_ir_v7_reader) + foreach(component IN LISTS openvino_export_components) + export(TARGETS ${${component}} NAMESPACE IE:: + APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake") + list(APPEND all_dev_targets ${${component}}) + endforeach() # Custom target to build only Inference Engine Developer Package targets - add_custom_target(ie_dev_targets ALL DEPENDS ${OpenVINODeveloperPackageTargets} ${IEDeveloperPackageTargets} gflags - inference_engine_ir_reader inference_engine_ir_v7_reader) + add_custom_target(ie_dev_targets ALL DEPENDS ${all_dev_targets}) endfunction() add_subdirectory(thirdparty) @@ -156,12 +138,12 @@ endif() # Developer package # -ie_developer_export_targets(format_reader) -ie_developer_export_targets(${NGRAPH_LIBRARIES}) +openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader) +openvino_developer_export_targets(COMPONENT ngraph TARGETS ${NGRAPH_LIBRARIES}) # for Template plugin if(NGRAPH_INTERPRETER_ENABLE) - ie_developer_export_targets(ngraph_backend interpreter_backend) + openvino_developer_export_targets(COMPONENT ngraph TARGETS ngraph_backend interpreter_backend) endif() ie_developer_export() @@ -198,7 +180,7 @@ function(register_extra_modules) file(WRITE "${iedevconfig_file}" "\# !! AUTOGENERATED: DON'T EDIT !!\n\n") file(APPEND "${iedevconfig_file}" "ie_deprecated_no_errors()\n") - foreach(target IN LISTS OpenVINODeveloperPackageTargets IEDeveloperPackageTargets) + foreach(target IN LISTS ${openvino_export_components}) if(target) file(APPEND "${iedevconfig_file}" "add_library(IE::${target} ALIAS ${target})\n") endif() diff --git a/inference-engine/cmake/features.cmake b/inference-engine/cmake/features.cmake index 5b1d4129a734cf..1c8c26339c922a 100644 --- a/inference-engine/cmake/features.cmake +++ b/inference-engine/cmake/features.cmake @@ -83,10 +83,6 @@ ie_dependent_option (ENABLE_SPEECH_DEMO "enable speech demo integration" ON "NOT ie_option (ENABLE_FUZZING "instrument build for fuzzing" OFF) -ie_option (ENABLE_UNSAFE_LOCATIONS "skip check for MD5 for dependency" OFF) - -ie_option (ENABLE_ALTERNATIVE_TEMP "in case of dependency conflict, to avoid modification in master, use local copy of dependency" ON) - ie_option (ENABLE_OPENCV "enables OpenCV" ON) ie_option (ENABLE_PYTHON "enables ie python bridge build" OFF) diff --git a/inference-engine/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in b/inference-engine/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in index c3713143e393a1..c02f41c15a6fd9 100644 --- a/inference-engine/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in +++ b/inference-engine/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in @@ -25,12 +25,20 @@ endforeach() message("") set(gflags_DIR "@gflags_BINARY_DIR@") + # GNA lib dir set(GNA "@GNA@") # Targets -include("${CMAKE_CURRENT_LIST_DIR}/inference_engine_targets_developer.cmake") +if(USE_SYSTEM_PUGIXML) + find_package(PugiXML REQUIRED) + set_property(TARGET pugixml PROPERTY IMPORTED_GLOBAL TRUE) +endif() + +foreach(component @openvino_export_components@) + include("${CMAKE_CURRENT_LIST_DIR}/${component}_dev_targets.cmake") +endforeach() get_target_property(InferenceEngine_INCLUDE_DIRS IE::inference_engine INTERFACE_INCLUDE_DIRECTORIES) set(InferenceEngine_LIBRARIES IE::inference_engine) @@ -44,7 +52,7 @@ list(APPEND CMAKE_MODULE_PATH "@OpenVINO_MAIN_SOURCE_DIR@/cmake/developer_packag "@OpenVINO_MAIN_SOURCE_DIR@/cmake/developer_package/download" # KMB, HDDL "@IE_MAIN_SOURCE_DIR@/cmake") # HDDL -# generic stuff from developer package +# Inference Engine Developer Scripts package find_package(IEDevScripts REQUIRED PATHS "@OpenVINO_MAIN_SOURCE_DIR@/cmake/developer_package" NO_DEFAULT_PATH) diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt index c9ef05386ea19a..52b087dcdabb8c 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt @@ -174,8 +174,7 @@ if(WIN32) endif() target_link_libraries(${TARGET_NAME}_s PRIVATE openvino::itt openvino::conditional_compilation ${CMAKE_DL_LIBS} ${NGRAPH_LIBRARIES} - inference_engine_transformations - PUBLIC pugixml) + inference_engine_transformations pugixml) target_compile_definitions(${TARGET_NAME}_s PUBLIC USE_STATIC_IE) @@ -217,7 +216,8 @@ configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-vers add_library(xbyak INTERFACE) target_include_directories(xbyak INTERFACE ${IE_MAIN_SOURCE_DIR}/thirdparty/mkl-dnn/src/cpu/xbyak) -ie_developer_export_targets(${TARGET_NAME} ${TARGET_NAME}_plugin_api xbyak) +openvino_developer_export_targets(COMPONENT openvino_common TARGETS xbyak) +ie_developer_export_targets(${TARGET_NAME} ${TARGET_NAME}_plugin_api) # install TBB diff --git a/inference-engine/src/vpu/common/CMakeLists.txt b/inference-engine/src/vpu/common/CMakeLists.txt index 5b8267bbb87609..ad900610d16f74 100644 --- a/inference-engine/src/vpu/common/CMakeLists.txt +++ b/inference-engine/src/vpu/common/CMakeLists.txt @@ -49,7 +49,7 @@ function(add_common_target TARGET_NAME STATIC_IE) set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) - ie_developer_export_targets(${TARGET_NAME}) + openvino_developer_export_targets(COMPONENT inference_engine_vpu TARGETS ${TARGET_NAME}) target_link_libraries(${TARGET_NAME} PUBLIC ${NGRAPH_LIBRARIES} inference_engine_transformations PRIVATE openvino::itt) diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt index ec799a6ac54694..8bcdad0d6048dd 100644 --- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt +++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt @@ -54,7 +54,7 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE) if(NOT STATIC_IE) add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME} CUSTOM_FILTERS "+runtime/explicit") - ie_developer_export_targets(${TARGET_NAME}) + openvino_developer_export_targets(COMPONENT inference_engine_vpu TARGETS ${TARGET_NAME}) endif() set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) diff --git a/inference-engine/tests/functional/plugin/shared/CMakeLists.txt b/inference-engine/tests/functional/plugin/shared/CMakeLists.txt index d80bb2ba6e7eee..05fa0e4d2e32d6 100644 --- a/inference-engine/tests/functional/plugin/shared/CMakeLists.txt +++ b/inference-engine/tests/functional/plugin/shared/CMakeLists.txt @@ -22,6 +22,7 @@ addIeTarget( ${CMAKE_CURRENT_SOURCE_DIR}/src ADD_CPPLINT DEVELOPER_PACKAGE + inference_engine_tests INCLUDES PUBLIC ${PUBLIC_HEADERS_DIR} diff --git a/inference-engine/tests/functional/shared_test_classes/CMakeLists.txt b/inference-engine/tests/functional/shared_test_classes/CMakeLists.txt index b0a95b09709e18..092cb2b440827e 100644 --- a/inference-engine/tests/functional/shared_test_classes/CMakeLists.txt +++ b/inference-engine/tests/functional/shared_test_classes/CMakeLists.txt @@ -15,6 +15,7 @@ addIeTarget( ROOT "${CMAKE_CURRENT_SOURCE_DIR}/include" ADD_CPPLINT DEVELOPER_PACKAGE + inference_engine_tests INCLUDES PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt index 6dee3f11890b38..93382ae6b6c500 100644 --- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt +++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt @@ -70,6 +70,7 @@ function(add_common_utils ADD_TARGET_NAME) ${CMAKE_CURRENT_SOURCE_DIR}/gtest ADD_CPPLINT DEVELOPER_PACKAGE + inference_engine_tests EXPORT_DEPENDENCIES ${EXPORT_DEPENDENCIES} ) @@ -96,21 +97,21 @@ function(add_common_utils ADD_TARGET_NAME) endif () target_include_directories(${ADD_TARGET_NAME} - PUBLIC + PUBLIC ${IE_TESTS_ROOT}/ie_test_utils $ $ $ - PRIVATE + PRIVATE $ - ) + ) target_compile_definitions(${ADD_TARGET_NAME} PUBLIC ${ARGN}) target_link_libraries(${ADD_TARGET_NAME} - PUBLIC + PUBLIC ${EXPORT_DEPENDENCIES} - ) + ) endfunction() add_common_utils(${TARGET_NAME}) diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/functional_test_utils/CMakeLists.txt index 623648e691d29a..6ca067f661d7a5 100644 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/CMakeLists.txt +++ b/inference-engine/tests/ie_test_utils/functional_test_utils/CMakeLists.txt @@ -17,6 +17,7 @@ addIeTarget( ROOT "${CMAKE_CURRENT_SOURCE_DIR}/include" ADD_CPPLINT DEVELOPER_PACKAGE + inference_engine_tests INCLUDES PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt index 5413d1389522b1..ab956218aabd08 100644 --- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt @@ -17,6 +17,7 @@ addIeTarget( ROOT ${CMAKE_CURRENT_SOURCE_DIR} ADD_CPPLINT DEVELOPER_PACKAGE + inference_engine_tests EXPORT_DEPENDENCIES ${EXPORT_DEPENDENCIES} ) diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/CMakeLists.txt b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/CMakeLists.txt index 32a0f871ff0854..645797734170ca 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/CMakeLists.txt +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/CMakeLists.txt @@ -28,6 +28,7 @@ addIeTarget( DEPENDENCIES ngraphFunctions DEVELOPER_PACKAGE + inference_engine_tests EXPORT_DEPENDENCIES ${EXPORT_DEPENDENCIES} ) diff --git a/inference-engine/tests/ngraph_helpers/ngraph_functions/CMakeLists.txt b/inference-engine/tests/ngraph_helpers/ngraph_functions/CMakeLists.txt index a7514816390cc4..5ca9261b65ae59 100644 --- a/inference-engine/tests/ngraph_helpers/ngraph_functions/CMakeLists.txt +++ b/inference-engine/tests/ngraph_helpers/ngraph_functions/CMakeLists.txt @@ -26,6 +26,7 @@ addIeTarget( ${EXPORT_DEPENDENCIES} ADD_CPPLINT DEVELOPER_PACKAGE + inference_engine_tests EXPORT_DEPENDENCIES ${EXPORT_DEPENDENCIES} ) diff --git a/inference-engine/tests_deprecated/behavior/shared_tests/CMakeLists.txt b/inference-engine/tests_deprecated/behavior/shared_tests/CMakeLists.txt index ac558570ef058a..d18283e4b25b06 100644 --- a/inference-engine/tests_deprecated/behavior/shared_tests/CMakeLists.txt +++ b/inference-engine/tests_deprecated/behavior/shared_tests/CMakeLists.txt @@ -33,4 +33,4 @@ target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/plugin_tests) # developer package -ie_developer_export_targets(${TARGET_NAME}) +openvino_developer_export_targets(COMPONENT inference_engine_tests TARGETS ${TARGET_NAME}) diff --git a/inference-engine/tests_deprecated/functional/ie_tests/CMakeLists.txt b/inference-engine/tests_deprecated/functional/ie_tests/CMakeLists.txt index 697411c550c9dc..c3ba343e659abb 100644 --- a/inference-engine/tests_deprecated/functional/ie_tests/CMakeLists.txt +++ b/inference-engine/tests_deprecated/functional/ie_tests/CMakeLists.txt @@ -32,4 +32,5 @@ target_link_libraries(${TARGET_NAME} PUBLIC # developer package -ie_developer_export_targets(${TARGET_NAME} ${EXPORT_DEPENDENCIES} ieTestHelpers_s) +openvino_developer_export_targets(COMPONENT inference_engine_tests + TARGETS ${TARGET_NAME} ${EXPORT_DEPENDENCIES} ieTestHelpers_s) diff --git a/inference-engine/tests_deprecated/functional/shared_tests/CMakeLists.txt b/inference-engine/tests_deprecated/functional/shared_tests/CMakeLists.txt index c426ac28298ab5..65289c7c788c7e 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/CMakeLists.txt +++ b/inference-engine/tests_deprecated/functional/shared_tests/CMakeLists.txt @@ -62,4 +62,4 @@ add_dependencies(${TARGET_NAME} HeteroPlugin) # developer package -ie_developer_export_targets(${TARGET_NAME}) +openvino_developer_export_targets(COMPONENT inference_engine_tests TARGETS ${TARGET_NAME}) diff --git a/inference-engine/tests_deprecated/functional/vpu/CMakeLists.txt b/inference-engine/tests_deprecated/functional/vpu/CMakeLists.txt index d9007d5994c862..464eeec16882ab 100644 --- a/inference-engine/tests_deprecated/functional/vpu/CMakeLists.txt +++ b/inference-engine/tests_deprecated/functional/vpu/CMakeLists.txt @@ -14,7 +14,7 @@ endif() addIeTarget( NAME myriadTestData - DEVELOPER_PACKAGE + DEVELOPER_PACKAGE inference_engine_tests TYPE STATIC ROOT ${CMAKE_CURRENT_SOURCE_DIR}/test_data LINK_LIBRARIES @@ -27,7 +27,7 @@ addIeTarget( addIeTarget( NAME VPUCommonTests - DEVELOPER_PACKAGE + DEVELOPER_PACKAGE inference_engine_tests TYPE STATIC ROOT ${CMAKE_CURRENT_SOURCE_DIR}/common ADDITIONAL_SOURCE_DIRS @@ -50,7 +50,7 @@ target_include_directories(VPUCommonTests INTERFACE $ ) -ie_developer_export_targets(vpu_custom_kernels) +openvino_developer_export_targets(COMPONENT inference_engine_vpu TARGETS vpu_custom_kernels) addIeTargetTest( NAME MyriadFunctionalTests ROOT ${CMAKE_CURRENT_SOURCE_DIR}/myriad_tests diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt index cd35228121fd1d..1417eeaffcc171 100644 --- a/inference-engine/thirdparty/CMakeLists.txt +++ b/inference-engine/thirdparty/CMakeLists.txt @@ -70,13 +70,13 @@ set_target_properties(ade fluid stb_image PROPERTIES FOLDER thirdparty) # developer package -ie_developer_export_targets(ade fluid) +openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid) if (NOT USE_SYSTEM_PUGIXML) set_target_properties(pugixml PROPERTIES FOLDER thirdparty) - ie_developer_export_targets(pugixml) + openvino_developer_export_targets(COMPONENT openvino_common pugixml) if(TARGET pugixml_mt) - ie_developer_export_targets(pugixml_mt) + openvino_developer_export_targets(COMPONENT openvino_common pugixml_mt) set_target_properties(pugixml_mt PROPERTIES FOLDER thirdparty) endif() endif() diff --git a/ngraph/core/builder/CMakeLists.txt b/ngraph/core/builder/CMakeLists.txt index 4c5a4766d84fb7..9cf04ceca0d256 100644 --- a/ngraph/core/builder/CMakeLists.txt +++ b/ngraph/core/builder/CMakeLists.txt @@ -43,9 +43,9 @@ target_include_directories(${TARGET_NAME} PRIVATE ${NGRAPH_INCLUDE_PATH} ${BUILDER_INCLUDE_DIR}/ngraph/ ${BUILDER_INCLUDE_DIR}/ngraph/builder) -#Add an alias so that library can be used inside the build tree, e.g. when testing +# Add an alias so that library can be used inside the build tree, e.g. when testing add_library(ngraph::builder ALIAS ${TARGET_NAME}) # developer package -openvino_developer_export_targets(ngraph::builder) +openvino_developer_export_targets(COMPONENT ngraph TARGETS ngraph::builder) diff --git a/ngraph/core/reference/CMakeLists.txt b/ngraph/core/reference/CMakeLists.txt index 2fa49195b34022..5b0705f9baf4a0 100644 --- a/ngraph/core/reference/CMakeLists.txt +++ b/ngraph/core/reference/CMakeLists.txt @@ -47,4 +47,4 @@ add_library(ngraph::reference ALIAS ${TARGET_NAME}) # developer package -openvino_developer_export_targets(ngraph::reference) +openvino_developer_export_targets(COMPONENT ngraph TARGETS ngraph::reference) diff --git a/openvino/CMakeLists.txt b/openvino/CMakeLists.txt index 2d6ebf915f2933..cf548389b360a3 100644 --- a/openvino/CMakeLists.txt +++ b/openvino/CMakeLists.txt @@ -17,4 +17,4 @@ add_subdirectory(itt) add_subdirectory(conditional_compilation) -openvino_developer_export_targets(openvino::itt openvino::conditional_compilation) +openvino_developer_export_targets(COMPONENT openvino_common TARGETS openvino::itt openvino::conditional_compilation) diff --git a/openvino/itt/CMakeLists.txt b/openvino/itt/CMakeLists.txt index 4451d46e3e2a6d..22b287164fb552 100644 --- a/openvino/itt/CMakeLists.txt +++ b/openvino/itt/CMakeLists.txt @@ -45,7 +45,7 @@ if(ENABLE_PROFILING_ITT) target_compile_options(ittnotify PRIVATE -Wno-undef) endif() - openvino_developer_export_targets(ittnotify) + openvino_developer_export_targets(COMPONENT openvino_common TARGETS ittnotify) endif() endif()