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

Fixed for debian packaging

Browse Source
This commit is contained in:
Ilya Lavrenov
2021-12-27 17:53:30 +03:00
parent ab53b80e56
commit 5c2b9a97d5
20 changed files with 159 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/dependencies.cmake
View File

@@ -88,7 +88,7 @@ if(THREADING STREQUAL "OMP")
ie_cpack_add_component(omp REQUIRED)
file(GLOB_RECURSE source_list "${OMP}/*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
install(FILES ${source_list}
DESTINATION "runtime/3rdparty/omp/lib"
DESTINATION runtime/3rdparty/omp/lib
COMPONENT omp)
endif()

4
cmake/developer_package/IEDevScriptsConfig.cmake
View File

@@ -14,8 +14,8 @@ set(CMAKE_MODULE_PATH "${IEDevScripts_DIR}")
function(set_ci_build_number)
set(repo_root "${CMAKE_SOURCE_DIR}")
include(version)
foreach(var CI_BUILD_NUMBER IE_VERSION IE_VERSION_BUILD
IE_VERSION_MAJOR IE_VERSION_MINOR IE_VERSION_PATCH)
foreach(var CI_BUILD_NUMBER OpenVINO_VERSION OpenVINO_VERSION_BUILD
OpenVINO_VERSION_MAJOR OpenVINO_VERSION_MINOR OpenVINO_VERSION_PATCH)
if(NOT DEFINED ${var})
message(FATAL_ERROR "${var} version component is not defined")
endif()

6
cmake/developer_package/frontends/frontends.cmake
View File

@@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
#
set(FRONTEND_INSTALL_INCLUDE "runtime/include/")
set(FRONTEND_INSTALL_INCLUDE "include/")
set(FRONTEND_NAME_PREFIX "ov_")
set(FRONTEND_NAME_SUFFIX "_frontend")
@@ -178,7 +178,7 @@ macro(ov_add_frontend)
ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
set_target_properties(${TARGET_NAME} PROPERTIES SOVERSION 2022.1.1)
set_target_properties(${TARGET_NAME} PROPERTIES SOVERSION ${OpenVINO_VERSION})
target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime ${OV_FRONTEND_LINK_LIBRARIES})
@@ -229,7 +229,7 @@ macro(ov_add_frontend)
endif()
if(OV_FRONTEND_LINKABLE_FRONTEND)
# install -dev part
# install library development files
install(DIRECTORY ${${TARGET_NAME}_INCLUDE_DIR}/openvino
DESTINATION ${FRONTEND_INSTALL_INCLUDE}/
COMPONENT core_dev

22
cmake/developer_package/packaging.cmake
View File

@@ -4,6 +4,7 @@
include(CMakeParseArguments)
include(CPackComponent)
include(GNUInstallDirs)
#
# ie_cpack_set_library_dir()
@@ -17,10 +18,9 @@ function(ie_cpack_set_library_dir)
set(IE_CPACK_ARCHIVE_PATH lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
else()
if(CPACK_GENERATOR STREQUAL "DEB")
# TODO: support other architectures
set(IE_CPACK_LIBRARY_PATH lib/x86_64-linux-gnu PARENT_SCOPE)
set(IE_CPACK_RUNTIME_PATH lib/x86_64-linux-gnu PARENT_SCOPE)
set(IE_CPACK_ARCHIVE_PATH lib/x86_64-linux-gnu PARENT_SCOPE)
set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR}/${CMAKE_LIBRARY_ARCHITECTURE} PARENT_SCOPE)
set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_LIBDIR}/${CMAKE_LIBRARY_ARCHITECTURE} PARENT_SCOPE)
set(IE_CPACK_ARCHIVE_PATH ${CMAKE_INSTALL_LIBDIR}/${CMAKE_LIBRARY_ARCHITECTURE} PARENT_SCOPE)
else()
set(IE_CPACK_LIBRARY_PATH lib/${ARCH_FOLDER} PARENT_SCOPE)
set(IE_CPACK_RUNTIME_PATH lib/${ARCH_FOLDER} PARENT_SCOPE)
@@ -116,7 +116,7 @@ macro(ie_cpack)
set(CPACK_STRIP_FILES ON)
endif()
string(REPLACE "/" "_" CPACK_PACKAGE_VERSION "2022.1.1")
string(REPLACE "/" "_" CPACK_PACKAGE_VERSION "${OpenVINO_VERSION}")
if(WIN32)
set(CPACK_PACKAGE_NAME openvino_${CMAKE_BUILD_TYPE})
else()
@@ -124,8 +124,8 @@ macro(ie_cpack)
endif()
foreach(ver MAJOR MINOR PATCH)
if(DEFINED IE_VERSION_${ver})
set(CPACK_PACKAGE_VERSION_${ver} ${IE_VERSION_${ver}})
if(DEFINED OpenVINO_VERSION_${ver})
set(CPACK_PACKAGE_VERSION_${ver} ${OpenVINO_VERSION_${ver}})
endif()
endforeach()
@@ -398,10 +398,10 @@ macro(ie_cpack)
set(package_name "${CPACK_DEBIAN_${ucomp}_PACKAGE_NAME}")
# copyright
install(FILES "${OpenVINO_SOURCE_DIR}/LICENSE"
DESTINATION share/doc/${package_name}/
COMPONENT ${comp}
RENAME copyright)
# install(FILES "${OpenVINO_SOURCE_DIR}/LICENSE"
# DESTINATION share/doc/${package_name}/
# COMPONENT ${comp}
# RENAME copyright)
# TODO: install changelog

4
cmake/developer_package/plugins/plugins.cmake
View File

@@ -77,8 +77,6 @@ function(ie_add_plugin)
endif()
endif()
set_target_properties(${IE_PLUGIN_NAME} PROPERTIES SOVERSION 2022.1.1)
ie_add_vs_version_file(NAME ${IE_PLUGIN_NAME}
FILEDESCRIPTION "Inference Engine ${IE_PLUGIN_DEVICE_NAME} device plugin library")
@@ -138,6 +136,8 @@ function(ie_add_plugin)
ie_cpack_add_component(${install_component} REQUIRED DEPENDS core)
if(BUILD_SHARED_LIBS)
# TODO: install for openvino<ver> folder for side by side installation
# since the plugins (CMake MODULEs) cannot be versioned
install(TARGETS ${IE_PLUGIN_NAME}
LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH}
COMPONENT ${install_component}

37
cmake/developer_package/version.cmake
View File

@@ -27,19 +27,21 @@ function (commitHash VAR)
endfunction()
macro(ie_parse_ci_build_number)
set(IE_VERSION_BUILD 000)
set(OpenVINO_VERSION_BUILD 000)
set(IE_VERSION_BUILD ${OpenVINO_VERSION_BUILD})
if(CI_BUILD_NUMBER MATCHES "^([0-9]+)\.([0-9]+)\.([0-9]+)\-([0-9]+)\-.*")
set(IE_VERSION_MAJOR ${CMAKE_MATCH_1})
set(IE_VERSION_MINOR ${CMAKE_MATCH_2})
set(IE_VERSION_PATCH ${CMAKE_MATCH_3})
set(IE_VERSION_BUILD ${CMAKE_MATCH_4})
set(OpenVINO_VERSION_MAJOR ${CMAKE_MATCH_1})
set(OpenVINO_VERSION_MINOR ${CMAKE_MATCH_2})
set(OpenVINO_VERSION_PATCH ${CMAKE_MATCH_3})
set(OpenVINO_VERSION_BUILD ${CMAKE_MATCH_4})
endif()
if(NOT DEFINED repo_root)
message(FATAL_ERROR "repo_root is not defined")
endif()
macro(ie_get_hpp_version)
macro(ov_get_hpp_version)
if(NOT DEFINED OpenVINO_SOURCE_DIR)
return()
endif()
@@ -59,11 +61,12 @@ macro(ie_parse_ci_build_number)
foreach(suffix MAJOR MINOR PATCH)
set(ie_version_name "IE_VERSION_${suffix}")
set(ov_version_name "OPENVINO_VERSION_${suffix}")
set(ov_version_name "OpenVINO_VERSION_${suffix}")
set(ov_version_name_hpp "OPENVINO_VERSION_${suffix}")
string(REGEX REPLACE ".+${ie_version_name}[ ]+([0-9]+).*" "\\1"
${ie_version_name}_HPP "${IE_VERSION_PARTS}")
string(REGEX REPLACE ".+${ov_version_name}[ ]+([0-9]+).*" "\\1"
string(REGEX REPLACE ".+${ov_version_name_hpp}[ ]+([0-9]+).*" "\\1"
${ov_version_name}_HPP "${OV_VERSION_PARTS}")
if(NOT ${ie_version_name}_HPP EQUAL ${ov_version_name}_HPP)
@@ -72,26 +75,26 @@ macro(ie_parse_ci_build_number)
endif()
endforeach()
set(ie_hpp_version_is_found ON)
set(ov_hpp_version_is_found ON)
endmacro()
# detect OpenVINO version via ie_version.hpp
ie_get_hpp_version()
# detect OpenVINO version via openvino/core/version.hpp and ie_version.hpp
ov_get_hpp_version()
if(ie_hpp_version_is_found)
foreach(var IE_VERSION_MAJOR IE_VERSION_MINOR IE_VERSION_PATCH)
if(ov_hpp_version_is_found)
foreach(var OpenVINO_VERSION_MAJOR OpenVINO_VERSION_MINOR OpenVINO_VERSION_PATCH)
if(DEFINED ${var} AND NOT ${var} EQUAL ${var}_HPP)
message(FATAL_ERROR "${var} parsed from CI_BUILD_NUMBER (${${var}}) \
and from ie_version.hpp (${${var}_HPP}) are different")
and from openvino/core/version.hpp (${${var}_HPP}) are different")
else()
# CI_BUILD_NUMBER is not defined well, take info from ie_verison.hpp as a baseline
# CI_BUILD_NUMBER is not defined well, take info from openvino/core/version.hpp as a baseline
set(${var} ${${var}_HPP})
endif()
endforeach()
endif()
set(IE_VERSION "${IE_VERSION_MAJOR}.${IE_VERSION_MINOR}.${IE_VERSION_PATCH}")
message(STATUS "OpenVINO version is ${IE_VERSION}")
set(OpenVINO_VERSION "${OpenVINO_VERSION_MAJOR}.${OpenVINO_VERSION_MINOR}.${OpenVINO_VERSION_PATCH}")
message(STATUS "OpenVINO version is ${OpenVINO_VERSION} (Build ${OpenVINO_VERSION_BUILD})")
endmacro()
if (DEFINED ENV{CI_BUILD_NUMBER})

6
cmake/developer_package/vs_version/vs_version.cmake
View File

@@ -2,9 +2,9 @@
# SPDX-License-Identifier: Apache-2.0
#
set(IE_VS_VER_FILEVERSION_QUAD "${IE_VERSION_MAJOR},${IE_VERSION_MINOR},${IE_VERSION_PATCH},0")
set(IE_VS_VER_PRODUCTVERSION_QUAD "${IE_VERSION_MAJOR},${IE_VERSION_MINOR},${IE_VERSION_PATCH},0")
set(IE_VS_VER_FILEVERSION_STR "${IE_VERSION_MAJOR}.${IE_VERSION_MINOR}.${IE_VERSION_PATCH}.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(IE_VS_VER_COMPANY_NAME_STR "Intel Corporation")
set(IE_VS_VER_PRODUCTVERSION_STR "${CI_BUILD_NUMBER}")

6
cmake/templates/InferenceEngineConfig-version.cmake.in
View File

@@ -2,9 +2,9 @@
# SPDX-License-Identifier: Apache-2.0
#
set(PACKAGE_VERSION_MAJOR @IE_VERSION_MAJOR@)
set(PACKAGE_VERSION_MINOR @IE_VERSION_MINOR@)
set(PACKAGE_VERSION_PATCH @IE_VERSION_PATCH@)
set(PACKAGE_VERSION_MAJOR @OpenVINO_VERSION_MAJOR@)
set(PACKAGE_VERSION_MINOR @OpenVINO_VERSION_MINOR@)
set(PACKAGE_VERSION_PATCH @OpenVINO_VERSION_PATCH@)
set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")
set(PACKAGE_VERSION_EXACT False)

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

@@ -2,9 +2,9 @@
# SPDX-License-Identifier: Apache-2.0
#
set(PACKAGE_VERSION_MAJOR @IE_VERSION_MAJOR@)
set(PACKAGE_VERSION_MINOR @IE_VERSION_MINOR@)
set(PACKAGE_VERSION_PATCH @IE_VERSION_PATCH@)
set(PACKAGE_VERSION_MAJOR @OpenVINO_VERSION_MAJOR@)
set(PACKAGE_VERSION_MINOR @OpenVINO_VERSION_MINOR@)
set(PACKAGE_VERSION_PATCH @OpenVINO_VERSION_PATCH@)
set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")
set(PACKAGE_VERSION_EXACT False)

2
licensing/CMakeLists.txt
View File

@@ -9,7 +9,7 @@
ie_cpack_add_component(${OV_COMP_LICENSING})
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
DESTINATION share/doc/openvino/licensing
DESTINATION share/doc/openvino${OpenVINO_VERSION}/licensing
COMPONENT ${OV_COMP_LICENSING}
PATTERN CMakeLists.txt EXCLUDE
PATTERN dev-third-party-programs.txt EXCLUDE

14
samples/CMakeLists.txt
View File

@@ -24,14 +24,14 @@ ie_cpack_add_component(${OV_COMP_CPP_SAMPLES} DEPENDS ${OV_COMP_CORE_DEV})
if(UNIX)
install(DIRECTORY cpp/
DESTINATION share/openvino/samples/cpp
DESTINATION share/openvino${OpenVINO_VERSION}/samples/cpp
COMPONENT ${OV_COMP_CPP_SAMPLES}
USE_SOURCE_PERMISSIONS
PATTERN *.bat EXCLUDE
PATTERN .clang-format EXCLUDE)
elseif(WIN32)
install(DIRECTORY cpp/
DESTINATION share/openvino/samples/cpp
DESTINATION share/openvino${OpenVINO_VERSION}/samples/cpp
COMPONENT ${OV_COMP_CPP_SAMPLES}
USE_SOURCE_PERMISSIONS
PATTERN *.sh EXCLUDE
@@ -44,22 +44,22 @@ ie_cpack_add_component(${OV_COMP_C_SAMPLES} DEPENDS ${OV_COMP_CORE_C})
if(UNIX)
install(PROGRAMS cpp/build_samples.sh
DESTINATION share/openvino/samples/c
DESTINATION share/openvino${OpenVINO_VERSION}/samples/c
COMPONENT ${OV_COMP_C_SAMPLES})
elseif(WIN32)
install(PROGRAMS cpp/build_samples_msvc.bat
DESTINATION share/openvino/samples/c
DESTINATION share/openvino${OpenVINO_VERSION}/samples/c
COMPONENT ${OV_COMP_C_SAMPLES})
endif()
install(DIRECTORY c
DESTINATION share/openvino/samples
DESTINATION share/openvino${OpenVINO_VERSION}/samples
COMPONENT ${OV_COMP_C_SAMPLES}
PATTERN c/CMakeLists.txt EXCLUDE
PATTERN c/.clang-format EXCLUDE)
install(FILES cpp/CMakeLists.txt
DESTINATION share/openvino/samples/c
DESTINATION share/openvino${OpenVINO_VERSION}/samples/c
COMPONENT ${OV_COMP_C_SAMPLES})
# install Python samples
@@ -68,7 +68,7 @@ if(ENABLE_PYTHON)
ie_cpack_add_component(${OV_COMP_PYTHON_SAMPLES})
install(DIRECTORY python/
DESTINATION share/openvino/samples/python
DESTINATION share/openvino${OpenVINO_VERSION}/samples/python
USE_SOURCE_PERMISSIONS
COMPONENT ${OV_COMP_PYTHON_SAMPLES})
endif()

45
scripts/CMakeLists.txt
View File

@@ -28,32 +28,39 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}"
# install setupvars
# ie_cpack_add_component(setupvars REQUIRED)
if(NOT CPACK_GENERATOR STREQUAL "DEB")
ie_cpack_add_component(setupvars REQUIRED)
# if(UNIX)
# set(_setupvars_file setupvars/setupvars.sh)
# elseif(WIN32)
# set(_setupvars_file setupvars/setupvars.bat)
# if (USE_BUILD_TYPE_SUBFOLDER AND CMAKE_BUILD_TYPE AND NOT CMAKE_BUILD_TYPE EQUAL "Debug")
# # Patch primary configuration in setupvars.bat which is "Release" by default.
# # Note setupvars secondary configuration is always "Debug".
# file(READ "${_setupvars_file}" _setupvars_content)
# string(REPLACE "Release" ${CMAKE_BUILD_TYPE} _setupvars_content "${_setupvars_content}")
# set(_setupvars_file "${CMAKE_BINARY_DIR}/${_setupvars_file}")
# file(WRITE "${_setupvars_file}" "${_setupvars_content}")
# endif()
# endif()
if(UNIX)
set(_setupvars_file setupvars/setupvars.sh)
elseif(WIN32)
set(_setupvars_file setupvars/setupvars.bat)
if (USE_BUILD_TYPE_SUBFOLDER AND CMAKE_BUILD_TYPE AND NOT CMAKE_BUILD_TYPE EQUAL "Debug")
# Patch primary configuration in setupvars.bat which is "Release" by default.
# Note setupvars secondary configuration is always "Debug".
file(READ "${_setupvars_file}" _setupvars_content)
string(REPLACE "Release" ${CMAKE_BUILD_TYPE} _setupvars_content "${_setupvars_content}")
set(_setupvars_file "${CMAKE_BINARY_DIR}/${_setupvars_file}")
file(WRITE "${_setupvars_file}" "${_setupvars_content}")
endif()
endif()
# install(PROGRAMS "${_setupvars_file}"
# DESTINATION .
# COMPONENT setupvars)
install(PROGRAMS "${_setupvars_file}"
DESTINATION .
COMPONENT setupvars)
endif()
# install install_dependencies
if(UNIX)
if(CPACK_GENERATOR STREQUAL "DEB")
set(deb_exclude PATTERN "install_dependencies/install_openvino_dependencies.sh" EXCLUDE)
endif()
ie_cpack_add_component(${OV_COMP_INSTALL_DEPENDENCIES} REQUIRED)
install(DIRECTORY install_dependencies/
DESTINATION share/openvino/install_dependencies
DESTINATION share/openvino${OpenVINO_VERSION}/install_dependencies
USE_SOURCE_PERMISSIONS
COMPONENT ${OV_COMP_INSTALL_DEPENDENCIES}
USE_SOURCE_PERMISSIONS)
${deb_exclude})
endif()

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

@@ -31,7 +31,7 @@ ie_add_vs_version_file(NAME ${TARGET_NAME}
# export
set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME runtime::c
SOVERSION 2022.1.1)
SOVERSION ${OpenVINO_VERSION})
export(TARGETS ${TARGET_NAME} NAMESPACE openvino::
APPEND FILE "${CMAKE_BINARY_DIR}/OpenVINOTargets.cmake")

94
src/cmake/install_tbb.cmake
View File

@@ -17,57 +17,59 @@ endif()
# install TBB
# define variables for InferenceEngineConfig.cmake
if(THREADING MATCHES "^(TBB|TBB_AUTO)$")
set(IE_TBB_DIR "${TBB_DIR}")
list(APPEND PATH_VARS "IE_TBB_DIR")
endif()
if(NOT CPACK_GENERATOR STREQUAL "DEB")
# define variables for OpenVINOConfig.cmake
if(THREADING MATCHES "^(TBB|TBB_AUTO)$")
set(IE_TBB_DIR "${TBB_DIR}")
list(APPEND PATH_VARS "IE_TBB_DIR")
endif()
if(install_tbbbind)
set(IE_TBBBIND_DIR "${TBBBIND_2_5}")
list(APPEND PATH_VARS "IE_TBBBIND_DIR")
endif()
if(install_tbbbind)
set(IE_TBBBIND_DIR "${TBBBIND_2_5}")
list(APPEND PATH_VARS "IE_TBBBIND_DIR")
endif()
# install only downloaded TBB, system one is not installed
if(THREADING MATCHES "^(TBB|TBB_AUTO)$" AND TBBROOT MATCHES ${TEMP})
ie_cpack_add_component(tbb REQUIRED)
ie_cpack_add_component(tbb_dev REQUIRED)
list(APPEND core_components tbb)
list(APPEND core_dev_components tbb_dev)
# install only downloaded TBB, system one is not installed
if(THREADING MATCHES "^(TBB|TBB_AUTO)$" AND TBBROOT MATCHES ${TEMP})
ie_cpack_add_component(tbb REQUIRED)
ie_cpack_add_component(tbb_dev REQUIRED)
list(APPEND core_components tbb)
list(APPEND core_dev_components tbb_dev)
install(DIRECTORY "${TBB}/lib"
DESTINATION runtime/3rdparty/tbb
COMPONENT tbb)
# Windows only
if(EXISTS "${TBB}/bin")
install(DIRECTORY "${TBB}/bin"
install(DIRECTORY "${TBB}/lib"
DESTINATION runtime/3rdparty/tbb
COMPONENT tbb)
# Windows only
if(EXISTS "${TBB}/bin")
install(DIRECTORY "${TBB}/bin"
DESTINATION runtime/3rdparty/tbb
COMPONENT tbb)
endif()
install(FILES "${TBB}/LICENSE"
DESTINATION runtime/3rdparty/tbb
COMPONENT tbb)
set(IE_TBB_DIR_INSTALL "3rdparty/tbb/cmake")
install(FILES "${TBB}/cmake/TBBConfig.cmake"
"${TBB}/cmake/TBBConfigVersion.cmake"
DESTINATION runtime/${IE_TBB_DIR_INSTALL}
COMPONENT tbb_dev)
install(DIRECTORY "${TBB}/include"
DESTINATION runtime/3rdparty/tbb
COMPONENT tbb_dev)
endif()
install(FILES "${TBB}/LICENSE"
DESTINATION runtime/3rdparty/tbb
COMPONENT tbb)
set(IE_TBB_DIR_INSTALL "3rdparty/tbb/cmake")
install(FILES "${TBB}/cmake/TBBConfig.cmake"
"${TBB}/cmake/TBBConfigVersion.cmake"
DESTINATION runtime/${IE_TBB_DIR_INSTALL}
COMPONENT tbb_dev)
install(DIRECTORY "${TBB}/include"
DESTINATION runtime/3rdparty/tbb
COMPONENT tbb_dev)
endif()
if(install_tbbbind)
install(DIRECTORY "${TBBBIND_2_5}/lib"
DESTINATION runtime/3rdparty/tbb_bind_2_5
COMPONENT tbb)
install(FILES "${TBBBIND_2_5}/LICENSE"
DESTINATION runtime/3rdparty/tbb_bind_2_5
COMPONENT tbb)
set(IE_TBBBIND_DIR_INSTALL "3rdparty/tbb_bind_2_5/cmake")
install(FILES "${TBBBIND_2_5}/cmake/TBBBIND_2_5Config.cmake"
DESTINATION runtime/${IE_TBBBIND_DIR_INSTALL}
COMPONENT tbb_dev)
if(install_tbbbind)
install(DIRECTORY "${TBBBIND_2_5}/lib"
DESTINATION runtime/3rdparty/tbb_bind_2_5
COMPONENT tbb)
install(FILES "${TBBBIND_2_5}/LICENSE"
DESTINATION runtime/3rdparty/tbb_bind_2_5
COMPONENT tbb)
set(IE_TBBBIND_DIR_INSTALL "3rdparty/tbb_bind_2_5/cmake")
install(FILES "${TBBBIND_2_5}/cmake/TBBBIND_2_5Config.cmake"
DESTINATION runtime/${IE_TBBBIND_DIR_INSTALL}
COMPONENT tbb_dev)
endif()
endif()

20
src/cmake/ov_runtime.cmake
View File

@@ -59,8 +59,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core
INCLUDES DESTINATION runtime/include
runtime/include/ie)
INCLUDES DESTINATION include
include/ie)
# --------------- OpenVINO runtime library dev ------------------------------
@@ -89,10 +89,9 @@ ov_install_static_lib(${TARGET_NAME}_dev core)
# Install OpenVINO runtime
set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME openvino
SOVERSION 2022.1.1)
SOVERSION ${OpenVINO_VERSION})
list(APPEND PATH_VARS "IE_INCLUDE_DIR" "OV_CORE_DIR"
"IE_PARALLEL_CMAKE")
list(APPEND PATH_VARS "IE_INCLUDE_DIR")
ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
ie_cpack_add_component(core_dev REQUIRED DEPENDS core ${core_dev_components})
@@ -118,13 +117,11 @@ endif()
install(EXPORT OpenVINOTargets
FILE OpenVINOTargets.cmake
NAMESPACE openvino::
DESTINATION runtime/cmake
DESTINATION ${IE_CPACK_LIBRARY_PATH}/cmake/openvino${OpenVINO_VERSION}
COMPONENT core_dev)
set(OV_CORE_DIR "${CMAKE_BINARY_DIR}/src/core")
set(PUBLIC_HEADERS_DIR "${OpenVINO_SOURCE_DIR}/src/inference/include")
set(IE_INCLUDE_DIR "${PUBLIC_HEADERS_DIR}/ie")
set(IE_PARALLEL_CMAKE "${OpenVINO_SOURCE_DIR}/src/cmake/ie_parallel.cmake")
configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig.cmake.in"
"${CMAKE_BINARY_DIR}/InferenceEngineConfig.cmake"
@@ -137,10 +134,8 @@ configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOCo
PATH_VARS ${PATH_VARS})
set(IE_INCLUDE_DIR "include/ie")
set(OV_CORE_DIR ".")
set(IE_TBB_DIR "${IE_TBB_DIR_INSTALL}")
set(IE_TBBBIND_DIR "${IE_TBBBIND_DIR_INSTALL}")
set(IE_PARALLEL_CMAKE "cmake/ie_parallel.cmake")
configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig.cmake.in"
"${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake"
@@ -159,11 +154,10 @@ configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cm
install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake"
"${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake"
"${OpenVINO_SOURCE_DIR}/src/cmake/ie_parallel.cmake"
DESTINATION runtime/cmake
DESTINATION ${IE_CPACK_LIBRARY_PATH}/cmake/inferenceengine${OpenVINO_VERSION}
COMPONENT core_dev)
install(FILES "${CMAKE_BINARY_DIR}/share/OpenVINOConfig.cmake"
"${CMAKE_BINARY_DIR}/OpenVINOConfig-version.cmake"
DESTINATION runtime/cmake
DESTINATION ${IE_CPACK_LIBRARY_PATH}/cmake/openvino${OpenVINO_VERSION}
COMPONENT core_dev)

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

@@ -121,7 +121,7 @@ set(library_sources $<TARGET_OBJECTS:${TARGET_NAME}_obj>)
if(ENABLE_GAPI_PREPROCESSING)
if(BUILD_SHARED_LIBS)
set(library_type SHARED)
set(library_type MODULE)
else()
set(library_type STATIC)
endif()
@@ -145,8 +145,6 @@ if(ENABLE_GAPI_PREPROCESSING)
target_link_libraries(ov_runtime PRIVATE ${TARGET_NAME})
endif()
set_target_properties(${TARGET_NAME} PROPERTIES SOVERSION 2022.1.1)
# Workaround to avoid warnings caused with bug in the avx512intrin.h of GCC5
if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND
(CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 5.5))

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

@@ -35,11 +35,10 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
ie_mark_target_as_cc(${TARGET_NAME})
set_target_properties(${TARGET_NAME} PROPERTIES SOVERSION 2022.1.1)
# LTO
set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
# install
ov_install_static_lib(${TARGET_NAME} core)

6
src/core/CMakeLists.txt
View File

@@ -127,13 +127,13 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
configure_package_config_file(${OpenVINO_SOURCE_DIR}/cmake/templates/ngraphConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake
INSTALL_DESTINATION ${IE_CPACK_LIBRARY_PATH}/openvino/cmake)
INSTALL_DESTINATION ${IE_CPACK_LIBRARY_PATH}/cmake/ngraph${OpenVINO_VERSION})
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake
VERSION ${IE_VERSION_MAJOR}.${IE_VERSION_MINOR}.${IE_VERSION_PATCH}
VERSION ${OpenVINO_VERSION_MAJOR}.${OpenVINO_VERSION_MINOR}.${OpenVINO_VERSION_PATCH}
COMPATIBILITY SameMajorVersion)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake
DESTINATION ${IE_CPACK_LIBRARY_PATH}/openvino/cmake
DESTINATION ${IE_CPACK_LIBRARY_PATH}/cmake/ngraph${OpenVINO_VERSION}
COMPONENT core_dev)

8
thirdparty/CMakeLists.txt vendored
View File

@@ -205,21 +205,21 @@ ov_install_static_lib(nlohmann_json_schema_validator openvino_common)
#
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/gflags
DESTINATION share/openvino/samples/cpp/thirdparty
DESTINATION share/openvino${OpenVINO_VERSION}/samples/cpp/thirdparty
COMPONENT ${OV_COMP_CPP_SAMPLES}
USE_SOURCE_PERMISSIONS)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/zlib
DESTINATION share/openvino/samples/cpp/thirdparty
DESTINATION share/openvino${OpenVINO_VERSION}/samples/cpp/thirdparty
COMPONENT ${OV_COMP_CPP_SAMPLES}
USE_SOURCE_PERMISSIONS)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cnpy
DESTINATION share/openvino/samples/cpp/thirdparty
DESTINATION share/openvino${OpenVINO_VERSION}/samples/cpp/thirdparty
COMPONENT ${OV_COMP_CPP_SAMPLES}
USE_SOURCE_PERMISSIONS)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/json
DESTINATION share/openvino/samples/cpp/thirdparty
DESTINATION share/openvino${OpenVINO_VERSION}/samples/cpp/thirdparty
COMPONENT ${OV_COMP_CPP_SAMPLES}
USE_SOURCE_PERMISSIONS)

16
tools/CMakeLists.txt
View File

@@ -13,12 +13,14 @@ add_subdirectory(compile_tool)
# install deployment_manager
ie_cpack_add_component(deployment_manager REQUIRED)
if(NOT CPACK_GENERATOR STREQUAL "DEB")
ie_cpack_add_component(deployment_manager REQUIRED)
install(DIRECTORY deployment_manager
DESTINATION share/openvino/tools
COMPONENT deployment_manager
USE_SOURCE_PERMISSIONS)
install(DIRECTORY deployment_manager
DESTINATION share/openvino/tools
COMPONENT deployment_manager
USE_SOURCE_PERMISSIONS)
endif()
# outbound requirements.txt files for openvino-dev package
@@ -42,8 +44,12 @@ foreach(EXTRAS ${EXTRAS_LIST})
EXCLUDE_FROM_ALL)
endforeach()
# MO
add_subdirectory(mo)
# POT
file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/pot/version.txt ${CI_BUILD_NUMBER})
# build and install openvino-dev wheel