diff --git a/.ci/azure/android_arm64.yml b/.ci/azure/android_arm64.yml index 956de5b737d..279b3e5827d 100644 --- a/.ci/azure/android_arm64.yml +++ b/.ci/azure/android_arm64.yml @@ -133,9 +133,8 @@ jobs: - task: CMake@1 inputs: cmakeArgs: > - -GNinja + -G "Ninja Multi-Config" -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DCMAKE_TOOLCHAIN_FILE=$(ANDROID_TOOLS)/ndk-bundle/build/cmake/android.toolchain.cmake -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DANDROID_ABI=$(ANDROID_ABI_CONFIG) diff --git a/.ci/azure/linux_arm64.yml b/.ci/azure/linux_arm64.yml index 277d3dff15d..4e4efe406d4 100644 --- a/.ci/azure/linux_arm64.yml +++ b/.ci/azure/linux_arm64.yml @@ -129,7 +129,7 @@ jobs: - task: CMake@1 inputs: cmakeArgs: > - -GNinja + -G "Ninja Multi-Config" -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DOpenCV_DIR=$(INSTALL_OPENCV)/cmake @@ -137,7 +137,6 @@ jobs: -DENABLE_TESTS=ON -DENABLE_DATA=OFF -DCMAKE_TOOLCHAIN_FILE=$(OPENVINO_REPO_DIR)/cmake/arm64.toolchain.cmake - -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache diff --git a/.ci/azure/linux_conditional_compilation.yml b/.ci/azure/linux_conditional_compilation.yml index 1aa913eef2e..ddad31d5505 100644 --- a/.ci/azure/linux_conditional_compilation.yml +++ b/.ci/azure/linux_conditional_compilation.yml @@ -123,12 +123,11 @@ jobs: - task: CMake@1 inputs: cmakeArgs: > - -GNinja + -G "Ninja Multi-Config" -DENABLE_CPPLINT=OFF -DENABLE_GAPI_PREPROCESSING=OFF -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON - -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_FASTER_BUILD=ON -DENABLE_PROFILING_ITT=ON -DSELECTIVE_BUILD=COLLECT @@ -152,11 +151,10 @@ jobs: - task: CMake@1 inputs: cmakeArgs: > - -GNinja -DSELECTIVE_BUILD=ON -DSELECTIVE_BUILD_STAT=$(BUILD_DIR)/*.csv - -S $(REPO_DIR) -B $(BUILD_DIR) + -S $(REPO_DIR) displayName: 'CMake CC ON' - script: cmake --build $(BUILD_DIR) --parallel --config $(BUILD_TYPE) --target openvino_intel_cpu_plugin openvino_ir_frontend diff --git a/.ci/azure/linux_coverity.yml b/.ci/azure/linux_coverity.yml index 309cddcaab6..64073ab5ee5 100644 --- a/.ci/azure/linux_coverity.yml +++ b/.ci/azure/linux_coverity.yml @@ -106,10 +106,9 @@ jobs: inputs: # Coverity has too many PARSE_ERROR errors with ENABLE_FASTER_BUILD=ON. Disabling FASTER_BUILD. cmakeArgs: > - -GNinja + -G "Ninja Multi-Config" -DENABLE_CPPLINT=OFF -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_FASTER_BUILD=OFF -DENABLE_STRICT_DEPENDENCIES=OFF -DBUILD_nvidia_plugin=OFF diff --git a/.ci/azure/linux_cuda.yml b/.ci/azure/linux_cuda.yml index d27b720fe52..657d6022fbd 100644 --- a/.ci/azure/linux_cuda.yml +++ b/.ci/azure/linux_cuda.yml @@ -127,7 +127,7 @@ jobs: python3 -m pip install -r /root/repos/openvino/src/bindings/python/requirements.txt && cmake -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DDENABLE_CPPLINT=OFF \ + -DENABLE_CPPLINT=OFF \ -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \ -DOPENVINO_EXTRA_MODULES=/root/repos/openvino_contrib/modules/nvidia_plugin \ -DENABLE_INTEL_CPU=OFF \ diff --git a/.ci/azure/mac.yml b/.ci/azure/mac.yml index d2df7e3b462..e41824080a3 100644 --- a/.ci/azure/mac.yml +++ b/.ci/azure/mac.yml @@ -123,7 +123,8 @@ jobs: - script: | export PATH="/usr/local/opt/cython/bin:$PATH" - cmake -GNinja \ + cmake \ + -G Ninja \ -DENABLE_CPPLINT=OFF \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \ diff --git a/.ci/azure/windows.yml b/.ci/azure/windows.yml index 2f958a92ed3..b5e8a838027 100644 --- a/.ci/azure/windows.yml +++ b/.ci/azure/windows.yml @@ -166,12 +166,12 @@ jobs: - script: | set PATH=$(WORK_DIR)\ninja-win;%PATH% - call "$(MSVS_VARS_PATH)" && $(CMAKE_CMD) -G "Ninja Multi-Config" ^ + call "$(MSVS_VARS_PATH)" && $(CMAKE_CMD) ^ + -G "Ninja Multi-Config" ^ -DENABLE_CPPLINT=OFF ^ -DENABLE_ONEDNN_FOR_GPU=$(CMAKE_BUILD_SHARED_LIBS) ^ -DBUILD_SHARED_LIBS=$(CMAKE_BUILD_SHARED_LIBS) ^ -DENABLE_FASTER_BUILD=ON ^ - -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) ^ -DENABLE_TESTS=ON ^ -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ^ -DENABLE_STRICT_DEPENDENCIES=OFF ^ diff --git a/.ci/azure/windows_conditional_compilation.yml b/.ci/azure/windows_conditional_compilation.yml index cdca66e6e7c..2e8a96797c7 100644 --- a/.ci/azure/windows_conditional_compilation.yml +++ b/.ci/azure/windows_conditional_compilation.yml @@ -78,6 +78,8 @@ jobs: python --version where java java -version + where cmake + cmake --version wmic computersystem get TotalPhysicalMemory wmic cpu list wmic logicaldisk get description,name @@ -110,7 +112,8 @@ jobs: - script: | set PATH=$(WORK_DIR)\ninja-win;%PATH% - call "$(MSVS_VARS_PATH)" && cmake -GNinja ^ + call "$(MSVS_VARS_PATH)" && cmake ^ + -G Ninja ^ -DENABLE_CPPLINT=OFF ^ -DENABLE_GAPI_PREPROCESSING=OFF ^ -DENABLE_FASTER_BUILD=ON ^ @@ -145,12 +148,12 @@ jobs: displayName: 'List csv files' - script: | - call "$(MSVS_VARS_PATH)" && cmake -G"Visual Studio 16 2019" ^ + call "$(MSVS_VARS_PATH)" && cmake ^ + -G "Visual Studio 16 2019" ^ -DVERBOSE_BUILD=ON ^ -DENABLE_CPPLINT=OFF ^ -DENABLE_GAPI_PREPROCESSING=OFF ^ -DENABLE_FASTER_BUILD=ON ^ - -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) ^ -DENABLE_PROFILING_ITT=OFF ^ -DSELECTIVE_BUILD=ON ^ -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ^ diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 2afab8acfe8..9e04035b799 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -53,7 +53,7 @@ if(THREADING STREQUAL "OMP") update_deps_cache(OMP "${OMP}" "Path to OMP root folder") debug_message(STATUS "intel_omp=" ${OMP}) - ie_cpack_add_component(omp HIDDEN) + ov_cpack_add_component(omp HIDDEN) file(GLOB_RECURSE source_list "${OMP}/*${CMAKE_SHARED_LIBRARY_SUFFIX}*") install(FILES ${source_list} DESTINATION ${OV_CPACK_RUNTIMEDIR} diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake index f881d0bed17..897e6f8e3a6 100644 --- a/cmake/developer_package/frontends/frontends.cmake +++ b/cmake/developer_package/frontends/frontends.cmake @@ -201,7 +201,7 @@ macro(ov_add_frontend) ${frontend_root_dir}/src ${CMAKE_CURRENT_BINARY_DIR}) - ie_add_vs_version_file(NAME ${TARGET_NAME} + ov_add_vs_version_file(NAME ${TARGET_NAME} FILEDESCRIPTION ${OV_FRONTEND_FILEDESCRIPTION}) target_link_libraries(${TARGET_NAME} PUBLIC openvino::runtime) @@ -273,7 +273,7 @@ macro(ov_add_frontend) set(dev_component "${OV_CPACK_COMP_CORE_DEV}") # TODO: whether we need to do it configuralbe on Windows installer? - ie_cpack_add_component(${lib_component} HIDDEN) + ov_cpack_add_component(${lib_component} HIDDEN) if(OV_FRONTEND_LINKABLE_FRONTEND) set(export_set EXPORT OpenVINOTargets) diff --git a/cmake/developer_package/packaging/packaging.cmake b/cmake/developer_package/packaging/packaging.cmake index 25c9cdb29d0..8925f576f1e 100644 --- a/cmake/developer_package/packaging/packaging.cmake +++ b/cmake/developer_package/packaging/packaging.cmake @@ -66,11 +66,11 @@ endmacro() ov_cpack_set_dirs() # -# ie_cpack_add_component(NAME ...) +# ov_cpack_add_component(NAME ...) # # Wraps original `cpack_add_component` and adds component to internal IE list # -function(ie_cpack_add_component name) +function(ov_cpack_add_component name) if(NOT ${name} IN_LIST IE_CPACK_COMPONENTS_ALL) cpack_add_component(${name} ${ARGN}) diff --git a/cmake/developer_package/plugins/create_plugin_file.cmake b/cmake/developer_package/plugins/create_plugin_file.cmake index c323a6a6555..86d6a2c0253 100644 --- a/cmake/developer_package/plugins/create_plugin_file.cmake +++ b/cmake/developer_package/plugins/create_plugin_file.cmake @@ -4,13 +4,13 @@ cmake_policy(SET CMP0007 NEW) -set(newContent " ") +set(newContent " ") -if(IE_PLUGIN_PROPERTIES) +if(OV_PLUGIN_PROPERTIES) set(newContent "${newContent} ") - foreach(props IN LISTS IE_PLUGIN_PROPERTIES) + foreach(props IN LISTS OV_PLUGIN_PROPERTIES) string(REPLACE ":" ";" props "${props}") list(GET props 0 key) @@ -27,4 +27,4 @@ endif() set(newContent "${newContent} ") -file(WRITE "${IE_CONFIG_OUTPUT_FILE}" "${newContent}") +file(WRITE "${OV_CONFIG_OUTPUT_FILE}" "${newContent}") diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake index d62151ec6a0..b8e7cad406d 100644 --- a/cmake/developer_package/plugins/plugins.cmake +++ b/cmake/developer_package/plugins/plugins.cmake @@ -6,7 +6,7 @@ include(CMakeParseArguments) set(PLUGIN_FILES "" CACHE INTERNAL "") -function(ie_plugin_get_file_name target_name library_name) +function(ov_plugin_get_file_name target_name library_name) set(LIB_PREFIX "${CMAKE_SHARED_MODULE_PREFIX}") set(LIB_SUFFIX "${IE_BUILD_POSTFIX}${CMAKE_SHARED_MODULE_SUFFIX}") @@ -22,7 +22,7 @@ if(NOT TARGET ov_plugins) endif() # -# ie_add_plugin(NAME +# ov_add_plugin(NAME # DEVICE_NAME # [PSEUDO_DEVICE] # [PSEUDO_PLUGIN_FOR ] @@ -36,25 +36,25 @@ endif() # [ADD_CLANG_FORMAT] # ) # -function(ie_add_plugin) +function(ov_add_plugin) set(options SKIP_INSTALL PSEUDO_DEVICE ADD_CLANG_FORMAT AS_EXTENSION SKIP_REGISTRATION) set(oneValueArgs NAME DEVICE_NAME VERSION_DEFINES_FOR PSEUDO_PLUGIN_FOR) set(multiValueArgs DEFAULT_CONFIG SOURCES OBJECT_LIBRARIES CPPLINT_FILTERS) - cmake_parse_arguments(IE_PLUGIN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + cmake_parse_arguments(OV_PLUGIN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - if(NOT IE_PLUGIN_NAME) + if(NOT OV_PLUGIN_NAME) message(FATAL_ERROR "Please, specify plugin target name") endif() - if(NOT IE_PLUGIN_DEVICE_NAME) - message(FATAL_ERROR "Please, specify device name for ${IE_PLUGIN_NAME}") + if(NOT OV_PLUGIN_DEVICE_NAME) + message(FATAL_ERROR "Please, specify device name for ${OV_PLUGIN_NAME}") endif() # create and configure target - if(NOT IE_PLUGIN_PSEUDO_PLUGIN_FOR) - set(input_files ${IE_PLUGIN_SOURCES}) - foreach(obj_lib IN LISTS IE_PLUGIN_OBJECT_LIBRARIES) + if(NOT OV_PLUGIN_PSEUDO_PLUGIN_FOR) + set(input_files ${OV_PLUGIN_SOURCES}) + foreach(obj_lib IN LISTS OV_PLUGIN_OBJECT_LIBRARIES) list(APPEND input_files $) add_cpplint_target(${obj_lib}_cpplint FOR_TARGETS ${obj_lib}) endforeach() @@ -65,120 +65,122 @@ function(ie_add_plugin) set(library_type STATIC) endif() - add_library(${IE_PLUGIN_NAME} ${library_type} ${input_files}) + add_library(${OV_PLUGIN_NAME} ${library_type} ${input_files}) - if(IE_PLUGIN_VERSION_DEFINES_FOR) - ov_add_version_defines(${IE_PLUGIN_VERSION_DEFINES_FOR} ${IE_PLUGIN_NAME}) + if(OV_PLUGIN_VERSION_DEFINES_FOR) + ov_add_version_defines(${OV_PLUGIN_VERSION_DEFINES_FOR} ${OV_PLUGIN_NAME}) endif() - target_compile_definitions(${IE_PLUGIN_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLUGIN) + target_compile_definitions(${OV_PLUGIN_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLUGIN) if(NOT BUILD_SHARED_LIBS) # to distinguish functions creating plugin objects - target_compile_definitions(${IE_PLUGIN_NAME} PRIVATE - IE_CREATE_PLUGIN=CreatePluginEngine${IE_PLUGIN_DEVICE_NAME} - OV_CREATE_PLUGIN=CreatePluginEngine${IE_PLUGIN_DEVICE_NAME}) - if(IE_PLUGIN_AS_EXTENSION) + target_compile_definitions(${OV_PLUGIN_NAME} PRIVATE + IE_CREATE_PLUGIN=CreatePluginEngine${OV_PLUGIN_DEVICE_NAME} + OV_CREATE_PLUGIN=CreatePluginEngine${OV_PLUGIN_DEVICE_NAME}) + if(OV_PLUGIN_AS_EXTENSION) # to distinguish functions creating extensions objects - target_compile_definitions(${IE_PLUGIN_NAME} PRIVATE - IE_CREATE_EXTENSION=CreateExtensionShared${IE_PLUGIN_DEVICE_NAME}) + target_compile_definitions(${OV_PLUGIN_NAME} PRIVATE + IE_CREATE_EXTENSION=CreateExtensionShared${OV_PLUGIN_DEVICE_NAME}) endif() endif() - ie_add_vs_version_file(NAME ${IE_PLUGIN_NAME} - FILEDESCRIPTION "OpenVINO Runtime ${IE_PLUGIN_DEVICE_NAME} device plugin library") + ov_add_vs_version_file(NAME ${OV_PLUGIN_NAME} + FILEDESCRIPTION "OpenVINO Runtime ${OV_PLUGIN_DEVICE_NAME} device plugin library") - target_link_libraries(${IE_PLUGIN_NAME} PRIVATE openvino::runtime openvino::runtime::dev) + target_link_libraries(${OV_PLUGIN_NAME} PRIVATE openvino::runtime openvino::runtime::dev) if(WIN32) - set_target_properties(${IE_PLUGIN_NAME} PROPERTIES COMPILE_PDB_NAME ${IE_PLUGIN_NAME}) + set_target_properties(${OV_PLUGIN_NAME} PROPERTIES COMPILE_PDB_NAME ${OV_PLUGIN_NAME}) endif() if(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CROSSCOMPILING) - target_link_options(${IE_PLUGIN_NAME} PRIVATE -Wl,--unresolved-symbols=ignore-in-shared-libs) + target_link_options(${OV_PLUGIN_NAME} PRIVATE -Wl,--unresolved-symbols=ignore-in-shared-libs) endif() set(custom_filter "") - foreach(filter IN LISTS IE_PLUGIN_CPPLINT_FILTERS) + foreach(filter IN LISTS OV_PLUGIN_CPPLINT_FILTERS) string(CONCAT custom_filter "${custom_filter}" "," "${filter}") endforeach() - if (IE_PLUGIN_ADD_CLANG_FORMAT) - add_clang_format_target(${IE_PLUGIN_NAME}_clang FOR_TARGETS ${IE_PLUGIN_NAME}) + if (OV_PLUGIN_ADD_CLANG_FORMAT) + add_clang_format_target(${OV_PLUGIN_NAME}_clang FOR_TARGETS ${OV_PLUGIN_NAME}) else() - add_cpplint_target(${IE_PLUGIN_NAME}_cpplint FOR_TARGETS ${IE_PLUGIN_NAME} CUSTOM_FILTERS ${custom_filter}) + add_cpplint_target(${OV_PLUGIN_NAME}_cpplint FOR_TARGETS ${OV_PLUGIN_NAME} CUSTOM_FILTERS ${custom_filter}) endif() - add_dependencies(ov_plugins ${IE_PLUGIN_NAME}) + add_dependencies(ov_plugins ${OV_PLUGIN_NAME}) # install rules - if(NOT IE_PLUGIN_SKIP_INSTALL OR NOT BUILD_SHARED_LIBS) - string(TOLOWER "${IE_PLUGIN_DEVICE_NAME}" install_component) + if(NOT OV_PLUGIN_SKIP_INSTALL OR NOT BUILD_SHARED_LIBS) + string(TOLOWER "${OV_PLUGIN_DEVICE_NAME}" install_component) - if(IE_PLUGIN_PSEUDO_DEVICE) + if(OV_PLUGIN_PSEUDO_DEVICE) set(plugin_hidden HIDDEN) endif() - ie_cpack_add_component(${install_component} - DISPLAY_NAME "${IE_PLUGIN_DEVICE_NAME} runtime" - DESCRIPTION "${IE_PLUGIN_DEVICE_NAME} runtime" + ov_cpack_add_component(${install_component} + DISPLAY_NAME "${OV_PLUGIN_DEVICE_NAME} runtime" + DESCRIPTION "${OV_PLUGIN_DEVICE_NAME} runtime" ${plugin_hidden} DEPENDS ${OV_CPACK_COMP_CORE}) if(BUILD_SHARED_LIBS) - install(TARGETS ${IE_PLUGIN_NAME} + install(TARGETS ${OV_PLUGIN_NAME} LIBRARY DESTINATION ${OV_CPACK_PLUGINSDIR} COMPONENT ${install_component}) - install(TARGETS ${IE_PLUGIN_NAME} + install(TARGETS ${OV_PLUGIN_NAME} LIBRARY DESTINATION ${OV_CPACK_PLUGINSDIR} COMPONENT ${install_component}) else() - ov_install_static_lib(${IE_PLUGIN_NAME} ${install_component}) + ov_install_static_lib(${OV_PLUGIN_NAME} ${install_component}) endif() endif() endif() # Enable for static build to generate correct plugins.hpp - if(NOT IE_PLUGIN_SKIP_REGISTRATION OR NOT BUILD_SHARED_LIBS) + if(NOT OV_PLUGIN_SKIP_REGISTRATION OR NOT BUILD_SHARED_LIBS) # check that plugin with such name is not registered foreach(plugin_entry IN LISTS PLUGIN_FILES) string(REPLACE ":" ";" plugin_entry "${plugin_entry}") list(GET plugin_entry -1 library_name) list(GET plugin_entry 0 plugin_name) - if(plugin_name STREQUAL "${IE_PLUGIN_DEVICE_NAME}" AND - NOT library_name STREQUAL ${IE_PLUGIN_NAME}) - message(FATAL_ERROR "${IE_PLUGIN_NAME} and ${library_name} are both registered as ${plugin_name}") + if(plugin_name STREQUAL "${OV_PLUGIN_DEVICE_NAME}" AND + NOT library_name STREQUAL ${OV_PLUGIN_NAME}) + message(FATAL_ERROR "${OV_PLUGIN_NAME} and ${library_name} are both registered as ${plugin_name}") endif() endforeach() # append plugin to the list to register - list(APPEND PLUGIN_FILES "${IE_PLUGIN_DEVICE_NAME}:${IE_PLUGIN_NAME}") + list(APPEND PLUGIN_FILES "${OV_PLUGIN_DEVICE_NAME}:${OV_PLUGIN_NAME}") set(PLUGIN_FILES "${PLUGIN_FILES}" CACHE INTERNAL "" FORCE) - set(${IE_PLUGIN_DEVICE_NAME}_CONFIG "${IE_PLUGIN_DEFAULT_CONFIG}" CACHE INTERNAL "" FORCE) - set(${IE_PLUGIN_DEVICE_NAME}_PSEUDO_PLUGIN_FOR "${IE_PLUGIN_PSEUDO_PLUGIN_FOR}" CACHE INTERNAL "" FORCE) - set(${IE_PLUGIN_DEVICE_NAME}_AS_EXTENSION "${IE_PLUGIN_AS_EXTENSION}" CACHE INTERNAL "" FORCE) + set(${OV_PLUGIN_DEVICE_NAME}_CONFIG "${OV_PLUGIN_DEFAULT_CONFIG}" CACHE INTERNAL "" FORCE) + set(${OV_PLUGIN_DEVICE_NAME}_PSEUDO_PLUGIN_FOR "${OV_PLUGIN_PSEUDO_PLUGIN_FOR}" CACHE INTERNAL "" FORCE) + set(${OV_PLUGIN_DEVICE_NAME}_AS_EXTENSION "${OV_PLUGIN_AS_EXTENSION}" CACHE INTERNAL "" FORCE) endif() endfunction() -function(ov_add_plugin) - ie_add_plugin(${ARGN}) +function(ie_add_plugin) + ov_add_plugin(${ARGN}) endfunction() # -# ie_register_plugins_dynamic(MAIN_TARGET
) +# ov_register_in_plugins_xml(MAIN_TARGET
) # -macro(ie_register_plugins_dynamic) +# Registers plugins in plugins.xml files for dynamic plugins build +# +macro(ov_register_in_plugins_xml) set(options) set(oneValueArgs MAIN_TARGET) set(multiValueArgs) - cmake_parse_arguments(IE_REGISTER "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + cmake_parse_arguments(OV_REGISTER "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - if(NOT IE_REGISTER_MAIN_TARGET) + if(NOT OV_REGISTER_MAIN_TARGET) message(FATAL_ERROR "Please, define MAIN_TARGET") endif() # Unregister .xml files for plugins from current build tree - set(config_output_file "$/plugins.xml") + set(config_output_file "$/plugins.xml") foreach(name IN LISTS PLUGIN_FILES) string(REPLACE ":" ";" name "${name}") @@ -187,12 +189,12 @@ macro(ie_register_plugins_dynamic) message(FATAL_ERROR "Unexpected error, please, contact developer of this script") endif() list(GET name 0 device_name) - add_custom_command(TARGET ${IE_REGISTER_MAIN_TARGET} POST_BUILD + add_custom_command(TARGET ${OV_REGISTER_MAIN_TARGET} POST_BUILD COMMAND "${CMAKE_COMMAND}" - -D "IE_CONFIG_OUTPUT_FILE=${config_output_file}" - -D "IE_PLUGIN_NAME=${device_name}" - -D "IE_CONFIGS_DIR=${CMAKE_BINARY_DIR}/plugins" + -D "OV_CONFIG_OUTPUT_FILE=${config_output_file}" + -D "OV_PLUGIN_NAME=${device_name}" + -D "OV_CONFIGS_DIR=${CMAKE_BINARY_DIR}/plugins" -P "${IEDevScripts_DIR}/plugins/unregister_plugin_cmake.cmake" COMMENT "Remove ${device_name} from the plugins.xml file" @@ -213,15 +215,15 @@ macro(ie_register_plugins_dynamic) # create plugin file set(config_file_name "${CMAKE_BINARY_DIR}/plugins/${device_name}.xml") - ie_plugin_get_file_name(${name} library_name) + ov_plugin_get_file_name(${name} library_name) - add_custom_command(TARGET ${IE_REGISTER_MAIN_TARGET} POST_BUILD + add_custom_command(TARGET ${OV_REGISTER_MAIN_TARGET} POST_BUILD COMMAND "${CMAKE_COMMAND}" - -D "IE_CONFIG_OUTPUT_FILE=${config_file_name}" - -D "IE_DEVICE_NAME=${device_name}" - -D "IE_PLUGIN_PROPERTIES=${${device_name}_CONFIG}" - -D "IE_PLUGIN_LIBRARY_NAME=${library_name}" + -D "OV_CONFIG_OUTPUT_FILE=${config_file_name}" + -D "OV_DEVICE_NAME=${device_name}" + -D "OV_PLUGIN_PROPERTIES=${${device_name}_CONFIG}" + -D "OV_PLUGIN_LIBRARY_NAME=${library_name}" -P "${IEDevScripts_DIR}/plugins/create_plugin_file.cmake" COMMENT "Register ${device_name} device as ${library_name}" VERBATIM) @@ -231,17 +233,24 @@ macro(ie_register_plugins_dynamic) # Combine all .xml files into plugins.xml - if(ENABLE_PLUGINS_XML) - add_custom_command(TARGET ${IE_REGISTER_MAIN_TARGET} POST_BUILD - COMMAND - "${CMAKE_COMMAND}" - -D "CMAKE_SHARED_MODULE_PREFIX=${CMAKE_SHARED_MODULE_PREFIX}" - -D "IE_CONFIG_OUTPUT_FILE=${config_output_file}" - -D "IE_CONFIGS_DIR=${CMAKE_BINARY_DIR}/plugins" - -P "${IEDevScripts_DIR}/plugins/register_plugin_cmake.cmake" - COMMENT - "Registering plugins to plugins.xml config file" - VERBATIM) + add_custom_command(TARGET ${OV_REGISTER_MAIN_TARGET} POST_BUILD + COMMAND + "${CMAKE_COMMAND}" + -D "CMAKE_SHARED_MODULE_PREFIX=${CMAKE_SHARED_MODULE_PREFIX}" + -D "OV_CONFIG_OUTPUT_FILE=${config_output_file}" + -D "OV_CONFIGS_DIR=${CMAKE_BINARY_DIR}/plugins" + -P "${IEDevScripts_DIR}/plugins/register_plugin_cmake.cmake" + COMMENT + "Registering plugins to plugins.xml config file" + VERBATIM) +endmacro() + +# +# ov_register_plugins() +# +macro(ov_register_plugins) + if(BUILD_SHARED_LIBS AND ENABLE_PLUGINS_XML) + ov_register_in_plugins_xml(${ARGN}) endif() endmacro() @@ -249,24 +258,13 @@ endmacro() # ie_register_plugins() # macro(ie_register_plugins) - if(BUILD_SHARED_LIBS) - ie_register_plugins_dynamic(${ARGN}) - endif() + ov_register_plugins(${ARGN}) endmacro() # -# ov_register_plugins() +# ov_target_link_plugins() # -macro(ov_register_plugins) - if(BUILD_SHARED_LIBS) - ie_register_plugins_dynamic(${ARGN}) - endif() -endmacro() - -# -# ie_target_link_plugins() -# -function(ie_target_link_plugins TARGET_NAME) +function(ov_target_link_plugins TARGET_NAME) if(BUILD_SHARED_LIBS) return() endif() @@ -287,6 +285,10 @@ endfunction() # # ov_generate_plugins_hpp() # +# Generates plugins.hpp file for: +# - static plugins build +# - cases when plugins.xml file is disabled +# function(ov_generate_plugins_hpp) set(device_mapping) set(device_configs) @@ -302,7 +304,7 @@ function(ov_generate_plugins_hpp) list(GET name 0 device_name) if(BUILD_SHARED_LIBS) list(GET name 1 library_name) - ie_plugin_get_file_name(${library_name} library_name) + ov_plugin_get_file_name(${library_name} library_name) list(APPEND device_mapping "${device_name}:${library_name}") else() if(${device_name}_PSEUDO_PLUGIN_FOR) @@ -326,12 +328,16 @@ function(ov_generate_plugins_hpp) endforeach() # add plugins to libraries including ov_plugins.hpp - ie_target_link_plugins(openvino) + ov_target_link_plugins(openvino) if(TARGET inference_engine_s) - ie_target_link_plugins(inference_engine_s) + ov_target_link_plugins(inference_engine_s) endif() - set(ov_plugins_hpp "${CMAKE_BINARY_DIR}/src/inference/ov_plugins.hpp") + if(OV_GENERATOR_MULTI_CONFIG AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.20) + set(ov_plugins_hpp "${CMAKE_BINARY_DIR}/src/inference/$/ov_plugins.hpp") + else() + set(ov_plugins_hpp "${CMAKE_BINARY_DIR}/src/inference/ov_plugins.hpp") + endif() set(plugins_hpp_in "${IEDevScripts_DIR}/plugins/plugins.hpp.in") add_custom_command(OUTPUT "${ov_plugins_hpp}" @@ -352,7 +358,7 @@ function(ov_generate_plugins_hpp) VERBATIM) # for some reason dependency on source files does not work - # so, we have to use explicit target and make it dependency for inference_engine + # so, we have to use explicit target and make it dependency for inference_engine_obj add_custom_target(_ov_plugins_hpp DEPENDS ${ov_plugins_hpp}) add_dependencies(inference_engine_obj _ov_plugins_hpp) endfunction() diff --git a/cmake/developer_package/plugins/register_plugin_cmake.cmake b/cmake/developer_package/plugins/register_plugin_cmake.cmake index 52dbeae7f22..eca7e0b6448 100644 --- a/cmake/developer_package/plugins/register_plugin_cmake.cmake +++ b/cmake/developer_package/plugins/register_plugin_cmake.cmake @@ -8,18 +8,18 @@ set(file_content ") -if(NOT EXISTS "${IE_CONFIG_OUTPUT_FILE}") - file(WRITE "${IE_CONFIG_OUTPUT_FILE}" "${file_content}") +if(NOT EXISTS "${OV_CONFIG_OUTPUT_FILE}") + file(WRITE "${OV_CONFIG_OUTPUT_FILE}" "${file_content}") endif() # get list of plugin files -file(GLOB plugin_files "${IE_CONFIGS_DIR}/*.xml") +file(GLOB plugin_files "${OV_CONFIGS_DIR}/*.xml") function(check_plugin_exists plugin_name outvar) set(${outvar} OFF PARENT_SCOPE) # check if config file already has this plugin - file(STRINGS "${IE_CONFIG_OUTPUT_FILE}" content REGEX "plugin .*=\"") + file(STRINGS "${OV_CONFIG_OUTPUT_FILE}" content REGEX "plugin .*=\"") foreach(line IN LISTS content) string(REGEX MATCH "location=\"([^\"]*)\"" location "${line}") @@ -44,7 +44,7 @@ endforeach() # add plugin set(newContent "") -file(STRINGS "${IE_CONFIG_OUTPUT_FILE}" content) +file(STRINGS "${OV_CONFIG_OUTPUT_FILE}" content) set(already_exists_in_xml OFF) foreach(line IN LISTS content) @@ -77,4 +77,4 @@ ${content}") endif() endforeach() -file(WRITE "${IE_CONFIG_OUTPUT_FILE}" "${newContent}") +file(WRITE "${OV_CONFIG_OUTPUT_FILE}" "${newContent}") diff --git a/cmake/developer_package/plugins/unregister_plugin_cmake.cmake b/cmake/developer_package/plugins/unregister_plugin_cmake.cmake index 6eab329ed6c..11bb3b3822f 100644 --- a/cmake/developer_package/plugins/unregister_plugin_cmake.cmake +++ b/cmake/developer_package/plugins/unregister_plugin_cmake.cmake @@ -2,16 +2,16 @@ # SPDX-License-Identifier: Apache-2.0 # -if(NOT EXISTS "${IE_CONFIG_OUTPUT_FILE}") +if(NOT EXISTS "${OV_CONFIG_OUTPUT_FILE}") return() endif() # remove plugin file -file(REMOVE "${IE_CONFIGS_DIR}/${IE_PLUGIN_NAME}.xml") +file(REMOVE "${OV_CONFIGS_DIR}/${IE_PLUGIN_NAME}.xml") # remove plugin set(newContent "") -file(STRINGS "${IE_CONFIG_OUTPUT_FILE}" content) +file(STRINGS "${OV_CONFIG_OUTPUT_FILE}" content) set(skip_plugin OFF) foreach(line IN LISTS content) @@ -32,4 +32,4 @@ foreach(line IN LISTS content) endif() endforeach() -file(WRITE "${IE_CONFIG_OUTPUT_FILE}" "${newContent}") +file(WRITE "${OV_CONFIG_OUTPUT_FILE}" "${newContent}") diff --git a/cmake/developer_package/vs_version/vs_version.cmake b/cmake/developer_package/vs_version/vs_version.cmake index b87610a2f06..6a6209e49cb 100644 --- a/cmake/developer_package/vs_version/vs_version.cmake +++ b/cmake/developer_package/vs_version/vs_version.cmake @@ -2,18 +2,18 @@ # SPDX-License-Identifier: Apache-2.0 # -set(IE_VS_VER_FILEVERSION_QUAD "${OpenVINO_VERSION_MAJOR},${OpenVINO_VERSION_MINOR},${OpenVINO_VERSION_PATCH},${OpenVINO_VERSION_BUILD}") -set(IE_VS_VER_PRODUCTVERSION_QUAD "${OpenVINO_VERSION_MAJOR},${OpenVINO_VERSION_MINOR},${OpenVINO_VERSION_PATCH},${OpenVINO_VERSION_BUILD}") -set(IE_VS_VER_FILEVERSION_STR "${OpenVINO_VERSION_MAJOR}.${OpenVINO_VERSION_MINOR}.${OpenVINO_VERSION_PATCH}.${OpenVINO_VERSION_BUILD}") +set(OV_VS_VER_FILEVERSION_QUAD "${OpenVINO_VERSION_MAJOR},${OpenVINO_VERSION_MINOR},${OpenVINO_VERSION_PATCH},${OpenVINO_VERSION_BUILD}") +set(OV_VS_VER_PRODUCTVERSION_QUAD "${OpenVINO_VERSION_MAJOR},${OpenVINO_VERSION_MINOR},${OpenVINO_VERSION_PATCH},${OpenVINO_VERSION_BUILD}") +set(OV_VS_VER_FILEVERSION_STR "${OpenVINO_VERSION_MAJOR}.${OpenVINO_VERSION_MINOR}.${OpenVINO_VERSION_PATCH}.${OpenVINO_VERSION_BUILD}") -set(IE_VS_VER_COMPANY_NAME_STR "Intel Corporation") -set(IE_VS_VER_PRODUCTVERSION_STR "${CI_BUILD_NUMBER}") -set(IE_VS_VER_PRODUCTNAME_STR "OpenVINO toolkit") -set(IE_VS_VER_COPYRIGHT_STR "Copyright (C) 2018-2021, Intel Corporation") -set(IE_VS_VER_COMMENTS_STR "https://docs.openvino.ai/") +set(OV_VS_VER_COMPANY_NAME_STR "Intel Corporation") +set(OV_VS_VER_PRODUCTVERSION_STR "${CI_BUILD_NUMBER}") +set(OV_VS_VER_PRODUCTNAME_STR "OpenVINO toolkit") +set(OV_VS_VER_COPYRIGHT_STR "Copyright (C) 2018-2021, Intel Corporation") +set(OV_VS_VER_COMMENTS_STR "https://docs.openvino.ai/") # -# ie_add_vs_version_file(NAME +# ov_add_vs_version_file(NAME # FILEDESCRIPTION # [COMPANY_NAME ] # [FILEVERSION ] @@ -25,7 +25,7 @@ set(IE_VS_VER_COMMENTS_STR "https://docs.openvino.ai/") # [FILEVERSION_QUAD ] # [PRODUCTVERSION_QUAD ]) # -function(ie_add_vs_version_file) +function(ov_add_vs_version_file) if(NOT WIN32 OR NOT BUILD_SHARED_LIBS) return() endif() @@ -38,14 +38,14 @@ function(ie_add_vs_version_file) get_target_property(target_type ${VS_VER_NAME} TYPE) if(NOT target_type MATCHES "^(SHARED|MODULE)_LIBRARY$") - message(FATAL_ERROR "ie_add_vs_version_file can work only with dynamic libraries") + message(FATAL_ERROR "ov_add_vs_version_file can work only with dynamic libraries") endif() macro(_vs_ver_update_variable name) - if(VS_VER_NAME AND DEFINED IE_${VS_VER_NAME}_VS_VER_${name}) - set(IE_VS_VER_${name} "${IE_${VS_VER_NAME}_VS_VER_${name}}") + if(VS_VER_NAME AND DEFINED OV_${VS_VER_NAME}_VS_VER_${name}) + set(OV_VS_VER_${name} "${OV_${VS_VER_NAME}_VS_VER_${name}}") elseif(VS_VER_${name}) - set(IE_VS_VER_${name} "${VS_VER_${name}}") + set(OV_VS_VER_${name} "${VS_VER_${name}}") endif() endmacro() @@ -53,10 +53,10 @@ function(ie_add_vs_version_file) _vs_ver_update_variable(PRODUCTVERSION_QUAD) macro(_vs_ver_update_str_variable name) - if(VS_VER_NAME AND DEFINED IE_${VS_VER_NAME}_VS_VER_${name}) - set(IE_VS_VER_${name}_STR "${IE_${VS_VER_NAME}_VS_VER_${name}}") + if(VS_VER_NAME AND DEFINED OV_${VS_VER_NAME}_VS_VER_${name}) + set(OV_VS_VER_${name}_STR "${OV_${VS_VER_NAME}_VS_VER_${name}}") elseif(VS_VER_${name}) - set(IE_VS_VER_${name}_STR "${VS_VER_${name}}") + set(OV_VS_VER_${name}_STR "${VS_VER_${name}}") endif() endmacro() @@ -69,8 +69,8 @@ function(ie_add_vs_version_file) _vs_ver_update_str_variable(PRODUCTVERSION) _vs_ver_update_str_variable(COMMENTS) - set(IE_VS_VER_ORIGINALFILENAME_STR "${CMAKE_SHARED_LIBRARY_PREFIX}${VS_VER_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}") - set(IE_VS_VER_INTERNALNAME_STR ${VS_VER_NAME}) + set(OV_VS_VER_ORIGINALFILENAME_STR "${CMAKE_SHARED_LIBRARY_PREFIX}${VS_VER_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}") + set(OV_VS_VER_INTERNALNAME_STR ${VS_VER_NAME}) set(vs_version_output "${CMAKE_CURRENT_BINARY_DIR}/vs_version.rc") configure_file("${IEDevScripts_DIR}/vs_version/vs_version.rc.in" "${vs_version_output}" @ONLY) diff --git a/cmake/developer_package/vs_version/vs_version.rc.in b/cmake/developer_package/vs_version/vs_version.rc.in index f5375d5f306..c3c5565910f 100644 --- a/cmake/developer_package/vs_version/vs_version.rc.in +++ b/cmake/developer_package/vs_version/vs_version.rc.in @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION @IE_VS_VER_FILEVERSION_QUAD@ - PRODUCTVERSION @IE_VS_VER_PRODUCTVERSION_QUAD@ + FILEVERSION @OV_VS_VER_FILEVERSION_QUAD@ + PRODUCTVERSION @OV_VS_VER_PRODUCTVERSION_QUAD@ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS 1 @@ -17,15 +17,15 @@ BEGIN BEGIN BLOCK "040904E4" BEGIN - VALUE "CompanyName", "@IE_VS_VER_COMPANY_NAME_STR@\0" - VALUE "FileDescription", "@IE_VS_VER_FILEDESCRIPTION_STR@\0" - VALUE "FileVersion", "@IE_VS_VER_FILEVERSION_STR@\0" - VALUE "InternalName", "@IE_VS_VER_INTERNALNAME_STR@\0" - VALUE "LegalCopyright", "@IE_VS_VER_COPYRIGHT_STR@\0" - VALUE "OriginalFilename", "@IE_VS_VER_ORIGINALFILENAME_STR@\0" - VALUE "ProductName", "@IE_VS_VER_PRODUCTNAME_STR@\0" - VALUE "ProductVersion", "@IE_VS_VER_PRODUCTVERSION_STR@\0" - VALUE "Comments", "@IE_VS_VER_COMMENTS_STR@\0" + VALUE "CompanyName", "@OV_VS_VER_COMPANY_NAME_STR@\0" + VALUE "FileDescription", "@OV_VS_VER_FILEDESCRIPTION_STR@\0" + VALUE "FileVersion", "@OV_VS_VER_FILEVERSION_STR@\0" + VALUE "InternalName", "@OV_VS_VER_INTERNALNAME_STR@\0" + VALUE "LegalCopyright", "@OV_VS_VER_COPYRIGHT_STR@\0" + VALUE "OriginalFilename", "@OV_VS_VER_ORIGINALFILENAME_STR@\0" + VALUE "ProductName", "@OV_VS_VER_PRODUCTNAME_STR@\0" + VALUE "ProductVersion", "@OV_VS_VER_PRODUCTVERSION_STR@\0" + VALUE "Comments", "@OV_VS_VER_COMMENTS_STR@\0" END END BLOCK "VarFileInfo" diff --git a/licensing/CMakeLists.txt b/licensing/CMakeLists.txt index c10545b57ae..7ba3293acd7 100644 --- a/licensing/CMakeLists.txt +++ b/licensing/CMakeLists.txt @@ -6,7 +6,7 @@ # Install licensing # -ie_cpack_add_component(${OV_CPACK_COMP_LICENSING} HIDDEN) +ov_cpack_add_component(${OV_CPACK_COMP_LICENSING} HIDDEN) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${OV_CPACK_DOCDIR}/licensing diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 5a7c1ec5e45..5b421c42684 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -20,7 +20,7 @@ openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reade # install C++ samples -ie_cpack_add_component(${OV_CPACK_COMP_CPP_SAMPLES} +ov_cpack_add_component(${OV_CPACK_COMP_CPP_SAMPLES} HIDDEN DEPENDS ${OV_CPACK_COMP_CORE_DEV}) @@ -45,7 +45,7 @@ endif() # install C samples -ie_cpack_add_component(${OV_CPACK_COMP_C_SAMPLES} +ov_cpack_add_component(${OV_CPACK_COMP_C_SAMPLES} HIDDEN DEPENDS ${OV_CPACK_COMP_CORE_C_DEV}) @@ -71,7 +71,7 @@ install(FILES cpp/CMakeLists.txt # install Python samples -ie_cpack_add_component(${OV_CPACK_COMP_PYTHON_SAMPLES} HIDDEN) +ov_cpack_add_component(${OV_CPACK_COMP_PYTHON_SAMPLES} HIDDEN) install(DIRECTORY python/ DESTINATION ${OV_CPACK_SAMPLESDIR}/python diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 6a3e6fad69c..265f4058f3c 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -24,7 +24,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}" # install setupvars -ie_cpack_add_component(${OV_CPACK_COMP_SETUPVARS} HIDDEN) +ov_cpack_add_component(${OV_CPACK_COMP_SETUPVARS} HIDDEN) if(UNIX) set(_setupvars_file_full_path "${CMAKE_CURRENT_SOURCE_DIR}/setupvars/setupvars.sh") @@ -50,7 +50,7 @@ install(PROGRAMS "${_setupvars_file_full_path}" # install install_dependencies if(LINUX) - ie_cpack_add_component(${OV_CPACK_COMP_INSTALL_DEPENDENCIES} HIDDEN) + ov_cpack_add_component(${OV_CPACK_COMP_INSTALL_DEPENDENCIES} HIDDEN) install(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/install_dependencies/install_openvino_dependencies.sh" DESTINATION install_dependencies/ diff --git a/src/bindings/c/src/CMakeLists.txt b/src/bindings/c/src/CMakeLists.txt index 5b07af3d19e..70d344b2126 100644 --- a/src/bindings/c/src/CMakeLists.txt +++ b/src/bindings/c/src/CMakeLists.txt @@ -24,7 +24,7 @@ add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) -ie_add_vs_version_file(NAME ${TARGET_NAME} +ov_add_vs_version_file(NAME ${TARGET_NAME} FILEDESCRIPTION "OpenVINO C API Core Runtime library") # export @@ -37,8 +37,8 @@ export(TARGETS ${TARGET_NAME} NAMESPACE openvino:: APPEND FILE "${CMAKE_BINARY_DIR}/OpenVINOTargets.cmake") # install -ie_cpack_add_component(${OV_CPACK_COMP_CORE_C} HIDDEN) -ie_cpack_add_component(${OV_CPACK_COMP_CORE_C_DEV} HIDDEN) +ov_cpack_add_component(${OV_CPACK_COMP_CORE_C} HIDDEN) +ov_cpack_add_component(${OV_CPACK_COMP_CORE_C_DEV} HIDDEN) install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets RUNTIME DESTINATION ${OV_CPACK_RUNTIMEDIR} COMPONENT ${OV_CPACK_COMP_CORE_C} diff --git a/src/bindings/python/src/compatibility/openvino/CMakeLists.txt b/src/bindings/python/src/compatibility/openvino/CMakeLists.txt index 9f4980d3cab..43e09004b3f 100644 --- a/src/bindings/python/src/compatibility/openvino/CMakeLists.txt +++ b/src/bindings/python/src/compatibility/openvino/CMakeLists.txt @@ -53,4 +53,4 @@ endif() # install -ie_cpack_add_component(${PYTHON_COMPONENT} HIDDEN) +ov_cpack_add_component(${PYTHON_COMPONENT} HIDDEN) diff --git a/src/bindings/python/src/compatibility/openvino/inference_engine/CMakeLists.txt b/src/bindings/python/src/compatibility/openvino/inference_engine/CMakeLists.txt index cfeb78aa1c3..4a708026a24 100644 --- a/src/bindings/python/src/compatibility/openvino/inference_engine/CMakeLists.txt +++ b/src/bindings/python/src/compatibility/openvino/inference_engine/CMakeLists.txt @@ -50,9 +50,9 @@ foreach(PYX_FILE IN LISTS PYX_SOURCES) set_target_properties(${PYX_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) endforeach() -if(COMMAND ie_add_vs_version_file) +if(COMMAND ov_add_vs_version_file) foreach(target IN LISTS INSTALLED_TARGETS) - ie_add_vs_version_file(NAME ${target} + ov_add_vs_version_file(NAME ${target} FILEDESCRIPTION "Inference Engine Python library") endforeach() endif() diff --git a/src/bindings/python/src/compatibility/pyngraph/CMakeLists.txt b/src/bindings/python/src/compatibility/pyngraph/CMakeLists.txt index 3d5b6f2fb02..a27a73abd0f 100644 --- a/src/bindings/python/src/compatibility/pyngraph/CMakeLists.txt +++ b/src/bindings/python/src/compatibility/pyngraph/CMakeLists.txt @@ -75,7 +75,7 @@ if(OpenVINO_SOURCE_DIR OR OpenVINODeveloperPackage_FOUND) ie_python_minimal_api(_${PROJECT_NAME}) add_clang_format_target(_${PROJECT_NAME}_clang FOR_TARGETS _${PROJECT_NAME}) - ie_cpack_add_component(${OV_CPACK_COMP_PYTHON_NGRAPH}_${pyversion} HIDDEN) + ov_cpack_add_component(${OV_CPACK_COMP_PYTHON_NGRAPH}_${pyversion} HIDDEN) install(TARGETS _${PROJECT_NAME} DESTINATION ${OV_CPACK_PYTHONDIR} diff --git a/src/bindings/python/src/pyopenvino/CMakeLists.txt b/src/bindings/python/src/pyopenvino/CMakeLists.txt index 481585a9c63..6cc5b440b85 100644 --- a/src/bindings/python/src/pyopenvino/CMakeLists.txt +++ b/src/bindings/python/src/pyopenvino/CMakeLists.txt @@ -110,7 +110,7 @@ if(OpenVINO_SOURCE_DIR OR OpenVINODeveloperPackage_FOUND) ie_python_minimal_api(${PROJECT_NAME}) add_clang_format_target(${PROJECT_NAME}_clang FOR_TARGETS ${PROJECT_NAME}) - ie_cpack_add_component(${OV_CPACK_COMP_PYTHON_OPENVINO}_${pyversion} + ov_cpack_add_component(${OV_CPACK_COMP_PYTHON_OPENVINO}_${pyversion} HIDDEN) install(DIRECTORY ${OpenVINOPython_SOURCE_DIR}/src/openvino diff --git a/src/bindings/python/src/pyopenvino/test_utils/CMakeLists.txt b/src/bindings/python/src/pyopenvino/test_utils/CMakeLists.txt index a378222214e..2f23a1a9434 100644 --- a/src/bindings/python/src/pyopenvino/test_utils/CMakeLists.txt +++ b/src/bindings/python/src/pyopenvino/test_utils/CMakeLists.txt @@ -17,8 +17,8 @@ pybind11_add_module(${TARGET_NAME} MODULE NO_EXTRAS ${SOURCES}) add_dependencies(${TARGET_NAME} pyopenvino) -if(COMMAND ie_add_vs_version_file) - ie_add_vs_version_file(NAME ${TARGET_NAME} +if(COMMAND ov_add_vs_version_file) + ov_add_vs_version_file(NAME ${TARGET_NAME} FILEDESCRIPTION "Test Utils Python library") endif() diff --git a/src/bindings/python/wheel/CMakeLists.txt b/src/bindings/python/wheel/CMakeLists.txt index 67697a2055b..197bc5a3266 100644 --- a/src/bindings/python/wheel/CMakeLists.txt +++ b/src/bindings/python/wheel/CMakeLists.txt @@ -179,7 +179,7 @@ add_custom_target(ie_wheel ALL DEPENDS ${openvino_wheel_path} ${fdupes_report}) # install -ie_cpack_add_component(${OV_CPACK_COMP_PYTHON_WHEELS} HIDDEN) +ov_cpack_add_component(${OV_CPACK_COMP_PYTHON_WHEELS} HIDDEN) install(FILES ${openvino_wheel_path} DESTINATION ${OV_CPACK_WHEELSDIR} diff --git a/src/cmake/install_tbb.cmake b/src/cmake/install_tbb.cmake index c31c3847094..0a1cce51a4f 100644 --- a/src/cmake/install_tbb.cmake +++ b/src/cmake/install_tbb.cmake @@ -82,7 +82,7 @@ if(THREADING MATCHES "^(TBB|TBB_AUTO)$" AND ( (DEFINED TBBROOT AND TBBROOT MATCHES ${TEMP}) OR (DEFINED TBBROOT OR DEFINED TBB_DIR OR DEFINED ENV{TBBROOT} OR DEFINED ENV{TBB_DIR}) OR ENABLE_SYSTEM_TBB ) ) - ie_cpack_add_component(tbb HIDDEN) + ov_cpack_add_component(tbb HIDDEN) list(APPEND core_components tbb) if(TBBROOT MATCHES ${TEMP}) @@ -202,7 +202,7 @@ if(THREADING MATCHES "^(TBB|TBB_AUTO)$" AND # install development files - ie_cpack_add_component(tbb_dev + ov_cpack_add_component(tbb_dev HIDDEN DEPENDS tbb) list(APPEND core_dev_components tbb_dev) diff --git a/src/cmake/openvino.cmake b/src/cmake/openvino.cmake index 373cffcb981..acfdbdcfbb3 100644 --- a/src/cmake/openvino.cmake +++ b/src/cmake/openvino.cmake @@ -30,7 +30,7 @@ add_library(${TARGET_NAME} add_library(openvino::runtime ALIAS ${TARGET_NAME}) set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME runtime) -ie_add_vs_version_file(NAME ${TARGET_NAME} FILEDESCRIPTION "OpenVINO runtime library") +ov_add_vs_version_file(NAME ${TARGET_NAME} FILEDESCRIPTION "OpenVINO runtime library") target_include_directories(${TARGET_NAME} PUBLIC $ @@ -72,7 +72,7 @@ ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME} EXTRA ${TBB_IMPORTED_ # LTO set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) -ie_register_plugins(MAIN_TARGET ${TARGET_NAME}) +ov_register_plugins(MAIN_TARGET ${TARGET_NAME}) # Export for build tree @@ -126,10 +126,10 @@ if(ENABLE_INTEL_GNA) list(APPEND PATH_VARS "GNA_PATH") endif() -ie_cpack_add_component(${OV_CPACK_COMP_CORE} +ov_cpack_add_component(${OV_CPACK_COMP_CORE} HIDDEN DEPENDS ${core_components}) -ie_cpack_add_component(${OV_CPACK_COMP_CORE_DEV} +ov_cpack_add_component(${OV_CPACK_COMP_CORE_DEV} HIDDEN DEPENDS ${OV_CPACK_COMP_CORE} ${core_dev_components}) diff --git a/src/common/preprocessing/src/CMakeLists.txt b/src/common/preprocessing/src/CMakeLists.txt index 3e8a70b9e61..8c317e69547 100644 --- a/src/common/preprocessing/src/CMakeLists.txt +++ b/src/common/preprocessing/src/CMakeLists.txt @@ -170,7 +170,7 @@ if(ENABLE_GAPI_PREPROCESSING) # must be called after all target_link_libraries ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME}) - ie_add_vs_version_file(NAME ${TARGET_NAME} + ov_add_vs_version_file(NAME ${TARGET_NAME} FILEDESCRIPTION "OpenVINO Preprocessing plugin") endif() diff --git a/src/inference/CMakeLists.txt b/src/inference/CMakeLists.txt index 5ebef0f2913..e9ce7bc8d02 100644 --- a/src/inference/CMakeLists.txt +++ b/src/inference/CMakeLists.txt @@ -135,11 +135,10 @@ target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $ $) - target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src" - # for static ov_plugins.hpp - "${CMAKE_CURRENT_BINARY_DIR}" + # for ov_plugins.hpp + $,$>,${CMAKE_CURRENT_BINARY_DIR}/$,${CMAKE_CURRENT_BINARY_DIR}> # for ie_ir_version.hpp $<$:$> "${OpenVINO_SOURCE_DIR}/src/plugins/intel_gna/legacy/include" diff --git a/src/plugins/auto/CMakeLists.txt b/src/plugins/auto/CMakeLists.txt index 25e6b8b358d..a0fc390b985 100644 --- a/src/plugins/auto/CMakeLists.txt +++ b/src/plugins/auto/CMakeLists.txt @@ -12,24 +12,24 @@ set (TARGET_NAME "openvino_auto_plugin") file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/*.cpp) if(ENABLE_AUTO AND ENABLE_MULTI) - ie_add_plugin(NAME ${TARGET_NAME} + ov_add_plugin(NAME ${TARGET_NAME} DEVICE_NAME "MULTI" PSEUDO_DEVICE SOURCES ${SOURCES} VERSION_DEFINES_FOR src/plugin.cpp) - ie_add_plugin(NAME ${TARGET_NAME} + ov_add_plugin(NAME ${TARGET_NAME} DEVICE_NAME "AUTO" PSEUDO_DEVICE PSEUDO_PLUGIN_FOR "MULTI") elseif(ENABLE_AUTO) - ie_add_plugin(NAME ${TARGET_NAME} + ov_add_plugin(NAME ${TARGET_NAME} DEVICE_NAME "AUTO" PSEUDO_DEVICE SOURCES ${SOURCES} VERSION_DEFINES_FOR src/plugin.cpp) elseif(ENABLE_MULTI) - ie_add_plugin(NAME ${TARGET_NAME} + ov_add_plugin(NAME ${TARGET_NAME} DEVICE_NAME "MULTI" PSEUDO_DEVICE SOURCES ${SOURCES} diff --git a/src/plugins/auto_batch/CMakeLists.txt b/src/plugins/auto_batch/CMakeLists.txt index e8bcf73dc44..8d563a57063 100644 --- a/src/plugins/auto_batch/CMakeLists.txt +++ b/src/plugins/auto_batch/CMakeLists.txt @@ -12,7 +12,7 @@ file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) file(GLOB HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp) -ie_add_plugin(NAME ${TARGET_NAME} +ov_add_plugin(NAME ${TARGET_NAME} DEVICE_NAME "BATCH" PSEUDO_DEVICE SOURCES ${SOURCES} ${HEADERS} diff --git a/src/plugins/hetero/CMakeLists.txt b/src/plugins/hetero/CMakeLists.txt index da48fcc6e88..0d5f6243db8 100644 --- a/src/plugins/hetero/CMakeLists.txt +++ b/src/plugins/hetero/CMakeLists.txt @@ -11,7 +11,7 @@ set (TARGET_NAME "openvino_hetero_plugin") file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) -ie_add_plugin(NAME ${TARGET_NAME} +ov_add_plugin(NAME ${TARGET_NAME} DEVICE_NAME "HETERO" PSEUDO_DEVICE SOURCES ${SOURCES} ${HEADERS} diff --git a/src/plugins/intel_cpu/CMakeLists.txt b/src/plugins/intel_cpu/CMakeLists.txt index 500cfe39a85..3361a80d237 100644 --- a/src/plugins/intel_cpu/CMakeLists.txt +++ b/src/plugins/intel_cpu/CMakeLists.txt @@ -79,7 +79,7 @@ list(REMOVE_ITEM HEADERS ${FILES_TO_REMOVE}) # create plugin -ie_add_plugin(NAME ${TARGET_NAME} +ov_add_plugin(NAME ${TARGET_NAME} DEVICE_NAME "CPU" AS_EXTENSION VERSION_DEFINES_FOR src/plugin.cpp diff --git a/src/plugins/intel_gna/CMakeLists.txt b/src/plugins/intel_gna/CMakeLists.txt index 9122ba98474..374bb23c650 100644 --- a/src/plugins/intel_gna/CMakeLists.txt +++ b/src/plugins/intel_gna/CMakeLists.txt @@ -51,7 +51,7 @@ find_package(libGNA REQUIRED # Shared plugin library # -ie_add_plugin(NAME ${TARGET_NAME} +ov_add_plugin(NAME ${TARGET_NAME} DEVICE_NAME "GNA" SOURCES ${SOURCES} ${HEADERS} VERSION_DEFINES_FOR src/gna_plugin_entry_points.cpp diff --git a/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/CMakeLists.txt b/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/CMakeLists.txt index 303537eb48e..e54175759a5 100644 --- a/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/CMakeLists.txt +++ b/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/CMakeLists.txt @@ -27,7 +27,7 @@ ie_faster_build(${TARGET_NAME} UNITY ) -ie_add_vs_version_file(NAME ${TARGET_NAME} +ov_add_vs_version_file(NAME ${TARGET_NAME} FILEDESCRIPTION "Inference Engine IR v7 reader plugin") target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLUGIN) diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt index 2657518a6a9..948aecfcfec 100644 --- a/src/plugins/intel_gpu/CMakeLists.txt +++ b/src/plugins/intel_gpu/CMakeLists.txt @@ -46,7 +46,7 @@ add_subdirectory(src/graph) file(GLOB_RECURSE PLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/plugin/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/include/intel_gpu/plugin/*.hpp) -ie_add_plugin(NAME ${TARGET_NAME} +ov_add_plugin(NAME ${TARGET_NAME} DEVICE_NAME "GPU" SOURCES ${PLUGIN_SOURCES} VERSION_DEFINES_FOR src/plugin/plugin.cpp) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 106292fb2b6..e77c0803f89 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -19,7 +19,7 @@ endif() # install deployment_manager -ie_cpack_add_component(${OV_CPACK_COMP_DEPLOYMENT_MANAGER} HIDDEN) +ov_cpack_add_component(${OV_CPACK_COMP_DEPLOYMENT_MANAGER} HIDDEN) install(DIRECTORY deployment_manager DESTINATION ${OV_CPACK_TOOLSDIR} diff --git a/tools/compile_tool/CMakeLists.txt b/tools/compile_tool/CMakeLists.txt index 9eb13dc379a..bb66f387449 100644 --- a/tools/compile_tool/CMakeLists.txt +++ b/tools/compile_tool/CMakeLists.txt @@ -34,7 +34,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) # install -ie_cpack_add_component(${OV_CPACK_COMP_CORE_TOOLS} +ov_cpack_add_component(${OV_CPACK_COMP_CORE_TOOLS} HIDDEN DEPENDS ${OV_CPACK_COMP_CORE}) diff --git a/tools/openvino_dev/CMakeLists.txt b/tools/openvino_dev/CMakeLists.txt index f62756f8314..e8b8bf4ad82 100644 --- a/tools/openvino_dev/CMakeLists.txt +++ b/tools/openvino_dev/CMakeLists.txt @@ -33,7 +33,7 @@ set(WHEEL_BUILD "${OpenVINO_VERSION_BUILD}" CACHE STRING "Build number of this r # outbound requirements.txt files for openvino-dev package -ie_cpack_add_component(${OV_CPACK_COMP_DEV_REQ_FILES} HIDDEN) +ov_cpack_add_component(${OV_CPACK_COMP_DEV_REQ_FILES} HIDDEN) set(REQUIREMENTS_IN "${CMAKE_CURRENT_SOURCE_DIR}/requirements_dev.txt.in") set(EXTRAS_LIST _ caffe kaldi mxnet onnx pytorch tensorflow tensorflow2) @@ -93,7 +93,7 @@ endif() # install -ie_cpack_add_component(${OV_CPACK_COMP_PYTHON_WHEELS} HIDDEN) +ov_cpack_add_component(${OV_CPACK_COMP_PYTHON_WHEELS} HIDDEN) install(FILES ${openvino_wheel_path} DESTINATION ${OV_CPACK_WHEELSDIR}