diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake index ddbdfd24215..ce41421edcd 100644 --- a/cmake/developer_package/frontends/frontends.cmake +++ b/cmake/developer_package/frontends/frontends.cmake @@ -216,18 +216,18 @@ macro(ov_add_frontend) set(export_set EXPORT OpenVINOTargets) endif() install(TARGETS ${TARGET_NAME} ${export_set} - RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ngraph - ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT ngraph - LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT ngraph) + RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core + ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) else() - ov_install_static_lib(${TARGET_NAME} ngraph) + ov_install_static_lib(${TARGET_NAME} core) endif() if(OV_FRONTEND_LINKABLE_FRONTEND) # install -dev part install(DIRECTORY ${${TARGET_NAME}_INCLUDE_DIR}/${OV_FRONTEND_NAME}_frontend DESTINATION ${FRONTEND_INSTALL_INCLUDE} - COMPONENT ngraph_dev + COMPONENT core_dev FILES_MATCHING PATTERN "*.hpp") set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME frontend::${OV_FRONTEND_NAME}) diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake index f1d0660c175..edb55a45354 100644 --- a/cmake/developer_package/packaging.cmake +++ b/cmake/developer_package/packaging.cmake @@ -16,9 +16,16 @@ function(ie_cpack_set_library_dir) set(IE_CPACK_RUNTIME_PATH bin/${ARCH_FOLDER}/$ PARENT_SCOPE) set(IE_CPACK_ARCHIVE_PATH lib/${ARCH_FOLDER}/$ PARENT_SCOPE) else() - set(IE_CPACK_LIBRARY_PATH lib/${ARCH_FOLDER} PARENT_SCOPE) - set(IE_CPACK_RUNTIME_PATH lib/${ARCH_FOLDER} PARENT_SCOPE) - set(IE_CPACK_ARCHIVE_PATH lib/${ARCH_FOLDER} PARENT_SCOPE) + if(CPACK_GENERATOR STREQUAL "DEB") + # TODO + set(IE_CPACK_LIBRARY_PATH lib PARENT_SCOPE) + set(IE_CPACK_RUNTIME_PATH lib PARENT_SCOPE) + set(IE_CPACK_ARCHIVE_PATH lib PARENT_SCOPE) + else() + set(IE_CPACK_LIBRARY_PATH lib/${ARCH_FOLDER} PARENT_SCOPE) + set(IE_CPACK_RUNTIME_PATH lib/${ARCH_FOLDER} PARENT_SCOPE) + set(IE_CPACK_ARCHIVE_PATH lib/${ARCH_FOLDER} PARENT_SCOPE) + endif() endif() endfunction() @@ -51,9 +58,13 @@ macro(ie_cpack) set(CPACK_COMPONENT_UNSPECIFIED_REQUIRED OFF) set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF) set(CPACK_PACKAGE_VENDOR "Intel Corporation") - set(CPACK_PACKAGE_CONTACT "openvino@intel.com") + set(CPACK_PACKAGE_CONTACT "OpenVINO Developers ") set(CPACK_VERBATIM_VARIABLES ON) set(CPACK_COMPONENTS_ALL ${ARGN}) + set(CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS + OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE) # archive operations can be run in parallels since CMake 3.20 set(CPACK_THREADS 8) @@ -81,21 +92,24 @@ macro(ie_cpack) # generator specific variables if(CPACK_GENERATOR MATCHES "^(7Z|TBZ2|TGZ|TXZ|TZ|ZIP)$") - message(FATAL_ERROR "CPACK_GENERATORCPACK_GENERATORCPACK_GENERATOR") # multiple packages are generated set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) elseif(CPACK_GENERATOR STREQUAL "DEB") # per component configuration # list of components: - # - ngraph # - core # - core_c - # - ngraph_dev # - core_dev # - core_c_dev + # - core_tools + # - c_samples + # - cpp_samples + # - python_samples + # - deployment_manager + # - [install_dependencies] probably should be removed # - licensing # - docs - # - core_tools + # - [setupvars] should be removed # - [python .*] # - (cpu|gpu|hetero) @@ -105,6 +119,8 @@ macro(ie_cpack) set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) # enable dependencies between components set(CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS ON) + # control file permissions + set(CPACK_DEBIAN_PACKAGE_CONTROL_STRICT_PERMISSION ON) # homepage set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://docs.openvino.ai/") # enable for debug cpack run @@ -116,62 +132,177 @@ macro(ie_cpack) set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON) # OpenVINO does not have backward and forward compatibility set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY "=") + # naming convention for debian package files + set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT") + + function(ov_add_lintian_suppression comp) + set(lines ${ARGN}) + list(APPEND lines "copyright-file-contains-full-apache-2-license") + list(APPEND lines "copyright-should-refer-to-common-license-file-for-apache-2") + list(APPEND lines "copyright-without-copyright-notice") + # TODO: fix + list(APPEND lines "changelog-file-missing-in-native-package") + # add SOVERSION + list(APPEND lines "package-must-activate-ldconfig-trigger") + # add SOVERSION + list(APPEND lines "shlib-without-versioned-soname") + # add SOVERSION + list(APPEND lines "sharedobject-in-library-directory-missing-soname") + list(APPEND lines "maintscript-calls-ldconfig postinst") + list(APPEND lines "maintscript-calls-ldconfig postrm") + + foreach(line IN LISTS lines) + set(line "openvino-${comp} binary: ${line}") + if(content) + set(content "${content}\n${line}") + else() + set(content "${line}") + endif() + endforeach() + + set(lintian_override_file "${OpenVINO_BINARY_DIR}/_CPack_Packages/lintian/openvino-${comp}") + file(WRITE ${lintian_override_file} ${content}) + install(FILES ${lintian_override_file} + DESTINATION share/lintian/overrides/ + COMPONENT ${comp}) + endfunction() + + # install debian common files + foreach(comp IN LISTS CPACK_COMPONENTS_ALL) + # copyright + install(FILES "${OpenVINO_SOURCE_DIR}/LICENSE" + DESTINATION share/doc/openvino-${comp}/ + COMPONENT ${comp} + RENAME copyright) + + # TODO: changelog + endforeach() + + # + # OpenVINO Core components including frontends + # # TODO # add preinst script for core to ask about aptin - # ngraph - set(CPACK_COMPONENT_NGRAPH_DESCRIPTION "OpenVINO ngraph") # admin, devel, doc, see https://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections # set(CPACK_DEBIAN_ngraph_PACKAGE_SECTION devel) # see required, important, standard, optional, extra # https://www.debian.org/doc/debian-policy/ch-archive.html#s-priorities # set(CPACK_DEBIAN_ngraph_PACKAGE_PRIORITY standard) - # ngraph-dev - set(CPACK_COMPONENT_NGRAPH_DEV_DESCRIPTION "OpenVINO ngraph development files") - set(CPACK_COMPONENT_NGRAPH_DEV_DEPENDS "ngraph") - # core - set(CPACK_COMPONENT_CORE_DESCRIPTION "OpenVINO core runtime") - set(CPACK_COMPONENT_CORE_DEPENDS "ngraph") + set(CPACK_COMPONENT_CORE_DESCRIPTION "OpenVINO C++ Runtime libraries") + set(CPACK_COMPONENT_CORE_DEPENDS "") # TODO: should be discovered automatically # TODO: install build dependencies libpugixml-dev, libtbb-dev set(CPACK_DEBIAN_CORE_PACKAGE_DEPENDS "libpugixml1v5") - - # hetero - set(CPACK_COMPONENT_hetero_DESCRIPTION "OpenVINO Hetero plugin") - set(CPACK_COMPONENT_HETERO_DEPENDS "core") + ov_add_lintian_suppression(core + "package-name-doesnt-match-sonames" + "script-not-executable usr/share/samples/scripts/utils.sh" + "non-standard-file-perm usr/share/samples/cpp/thirdparty/.*") # core_dev - set(CPACK_COMPONENT_CODE_DEV_DESCRIPTION "OpenVINO core dev runtime") - set(CPACK_COMPONENT_COR_DEV_DEPENDS "ngraph_dev;core") + set(CPACK_COMPONENT_CORE_DEV_DESCRIPTION "OpenVINO C++ Runtime development files") + set(CPACK_COMPONENT_CORE_DEV_DEPENDS "core") + # Looks like it's arch dependent + # set(CPACK_DEBIAN_CORE_DEV_PACKAGE_ARCHITECTURE "all") # set(CPACK_DEBIAN_CORE_PACKAGE_DEPENDS "libtbb-dev") - # set(CPACK_DEBIAN_core_dev_PACKAGE_CONFLICTS "!!!") + # set(CPACK_DEBIAN_CORE_DEV_PACKAGE_CONFLICTS "!!!") + ov_add_lintian_suppression(core_dev + "bad-package-name" + "package-name-doesnt-match-sonames" + "script-not-executable usr/share/samples/scripts/utils.sh" + "non-standard-file-perm usr/share/samples/cpp/thirdparty/.*") # core_c - set(CPACK_COMPONENT_core_c_DESCRIPTION "OpenVINO C core runtime") + set(CPACK_COMPONENT_CORE_C_DESCRIPTION "OpenVINO C Runtime libraries") set(CPACK_COMPONENT_CORE_C_DEPENDS "core") # core_c_dev - set(CPACK_COMPONENT_core_c_dev_DESCRIPTION "OpenVINO C dev runtime") + set(CPACK_COMPONENT_CORE_C_DEV_DESCRIPTION "OpenVINO C Runtime development files") set(CPACK_COMPONENT_CORE_C_DEV_DEPENDS "core_c;core_dev") + # Looks like it's arch dependent + # set(CPACK_DEBIAN_CORE_C_DEV_PACKAGE_ARCHITECTURE "all") # set(CPACK_DEBIAN_core_dev_PACKAGE_CONFLICTS "!!!") - # core tools - set(CPACK_COMPONENT_CORE_TOOLS_DESCRIPTION "OpenVINO Core Tools") - set(CPACK_COMPONENT_CORE_TOOLS_DEPENDS "core") - set(CPACK_DEBIAN_CORE_TOOLS_PACKAGE_RECOMMENDS "openvino-hetero (= ${CPACK_PACKAGE_VERSION})") + # + # Plugins + # + + # hetero + if(ENABLE_HETERO) + set(CPACK_COMPONENT_HETERO_DESCRIPTION "OpenVINO Hetero plugin") + set(CPACK_COMPONENT_HETERO_DEPENDS "core") + endif() + + # multi / auto plugins + if(ENABLE_MULTI) + set(CPACK_COMPONENT_MULTI_DESCRIPTION "OpenVINO Multi / Auto plugin") + set(CPACK_COMPONENT_MULTI_DEPENDS "core") + endif() + + # cpu + if(ENABLE_MKL_DNN) + set(CPACK_COMPONENT_CPU_DESCRIPTION "OpenVINO Intel CPU plugin") + set(CPACK_COMPONENT_CPU_DEPENDS "core") + set(CPACK_DEBIAN_CPU_PACKAGE_SUGGESTS "openvino-multi (= ${CPACK_PACKAGE_VERSION}), openvino-hetero (= ${CPACK_PACKAGE_VERSION})") + endif() + + # gpu + if(ENABLE_INTEL_GPU) + set(CPACK_COMPONENT_GPU_DESCRIPTION "OpenVINO Intel GPU plugin") + set(CPACK_COMPONENT_GPU_DEPENDS "core") + set(CPACK_DEBIAN_GPU_PACKAGE_SUGGESTS "openvino-multi (= ${CPACK_PACKAGE_VERSION}), openvino-hetero (= ${CPACK_PACKAGE_VERSION})") + endif() + + # myriad + if(ENABLE_MYRIAD) + set(CPACK_COMPONENT_MYRIAD_DESCRIPTION "OpenVINO Intel Myriad plugin") + set(CPACK_COMPONENT_MYRIAD_DEPENDS "core") + set(CPACK_DEBIAN_MYRIAD_PACKAGE_SUGGESTS "openvino-multi (= ${CPACK_PACKAGE_VERSION}), openvino-hetero (= ${CPACK_PACKAGE_VERSION})") + endif() + + # gna + if(ENABLE_GNA) + set(CPACK_COMPONENT_GNA_DESCRIPTION "OpenVINO Intel GNA plugin") + set(CPACK_COMPONENT_GNA_DEPENDS "core") + set(CPACK_DEBIAN_GNA_PACKAGE_SUGGESTS "openvino-multi (= ${CPACK_PACKAGE_VERSION}), openvino-hetero (= ${CPACK_PACKAGE_VERSION})") + endif() + + # + # Samples + # + + set(samples_build_deps "cmake, g++, gcc, libc6-dev, make") # cpp_samples set(CPACK_COMPONENT_CPP_SAMPLES_DESCRIPTION "OpenVINO C++ samples") set(CPACK_COMPONENT_CPP_SAMPLES_DEPENDS "core_dev") - set(CPACK_DEBIAN_CPP_SAMPLES_PACKAGE_RECOMMENDS "openvino-hetero (= ${CPACK_PACKAGE_VERSION})") - set(CPACK_DEBIAN_CPP_SAMPLES_PACKAGE_DEPENDS "libgflags-dev, nlohmann-json3-dev, zlib1g-dev") + set(CPACK_DEBIAN_CPP_SAMPLES_PACKAGE_SUGGESTS "openvino-hetero (= ${CPACK_PACKAGE_VERSION})") + set(CPACK_DEBIAN_CPP_SAMPLES_PACKAGE_DEPENDS "libgflags-dev, nlohmann-json3-dev, zlib1g-dev, ${samples_build_deps}") + set(CPACK_DEBIAN_CPP_SAMPLES_PACKAGE_ARCHITECTURE "all") # c_samples set(CPACK_COMPONENT_C_SAMPLES_DESCRIPTION "OpenVINO C samples") set(CPACK_COMPONENT_C_SAMPLES_DEPENDS "core_c_dev") + set(CPACK_DEBIAN_C_SAMPLES_PACKAGE_DEPENDS "${samples_build_deps}") + set(CPACK_DEBIAN_C_SAMPLES_PACKAGE_ARCHITECTURE "all") + + # python_samples + set(CPACK_COMPONENT_PYTHON_SAMPLES_DESCRIPTION "OpenVINO Python samples") + set(CPACK_COMPONENT_PYTHON_SAMPLES_DEPENDS "python3") + set(CPACK_DEBIAN_PYTHON_SAMPLES_PACKAGE_ARCHITECTURE "all") + + # + # other + # + + # deployment manager + set(CPACK_COMPONENT_DEPLOYMENT_MANAGER_DESCRIPTION "OpenVINO Deployment Manager") + set(CPACK_COMPONENT_DEPLOYMENT_MANAGER_DEPENDS "core") + set(CPACK_DEBIAN_DEPLOYMENT_MANAGER_PACKAGE_DEPENDS "python3") + set(CPACK_DEBIAN_DEPLOYMENT_MANAGER_PACKAGE_ARCHITECTURE "all") endif() include(CPack) diff --git a/inference-engine/ie_bridges/python/wheel/CMakeLists.txt b/inference-engine/ie_bridges/python/wheel/CMakeLists.txt index 8ebcc215fd9..b0605186439 100644 --- a/inference-engine/ie_bridges/python/wheel/CMakeLists.txt +++ b/inference-engine/ie_bridges/python/wheel/CMakeLists.txt @@ -74,7 +74,10 @@ add_custom_target(ie_wheel ALL DEPENDS ${openvino_wheel_path}) # install -ie_cpack_add_component(python_wheels) +ie_cpack_add_component(python_wheels + DEPENDS ${PYTHON_COMPONENT}) + # TODO: add components below once ie_bridges are moved to src/bindings/python + # pyngraph_${PYTHON_VERSION} pyopenvino_${PYTHON_VERSION}) install(FILES ${openvino_wheel_path} DESTINATION tools diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index a23da3a3ae3..9d9815f2519 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -24,14 +24,14 @@ ie_cpack_add_component(cpp_samples DEPENDS cpp_samples_deps core) if(UNIX) install(DIRECTORY cpp/ - DESTINATION samples/cpp + DESTINATION share/samples/cpp COMPONENT cpp_samples USE_SOURCE_PERMISSIONS PATTERN *.bat EXCLUDE PATTERN .clang-format EXCLUDE) elseif(WIN32) install(DIRECTORY cpp/ - DESTINATION samples/cpp + DESTINATION share/samples/cpp COMPONENT cpp_samples USE_SOURCE_PERMISSIONS PATTERN *.sh EXCLUDE @@ -44,44 +44,46 @@ ie_cpack_add_component(c_samples DEPENDS core_c) if(UNIX) install(PROGRAMS cpp/build_samples.sh - DESTINATION samples/c + DESTINATION share/samples/c COMPONENT c_samples) elseif(WIN32) install(PROGRAMS cpp/build_samples_msvc.bat - DESTINATION samples/c + DESTINATION share/samples/c COMPONENT c_samples) endif() install(DIRECTORY c - DESTINATION samples + DESTINATION share/samples COMPONENT c_samples PATTERN c/CMakeLists.txt EXCLUDE PATTERN c/.clang-format EXCLUDE) install(FILES cpp/CMakeLists.txt - DESTINATION samples/c + DESTINATION share/samples/c COMPONENT c_samples) # install Python samples -ie_cpack_add_component(python_samples) +if(ENABLE_PYTHON) + ie_cpack_add_component(python_samples) -install(DIRECTORY python/ - DESTINATION samples/python + install(DIRECTORY python/ + DESTINATION share/samples/python USE_SOURCE_PERMISSIONS COMPONENT python_samples) +endif() # install scripts to run samples fast if(UNIX) install(DIRECTORY scripts/ - DESTINATION samples/scripts + DESTINATION share/samples/scripts COMPONENT cpp_samples USE_SOURCE_PERMISSIONS PATTERN *.bat EXCLUDE) elseif(WIN32) install(DIRECTORY scripts/ - DESTINATION samples/scripts + DESTINATION share/samples/scripts COMPONENT cpp_samples USE_SOURCE_PERMISSIONS PATTERN *.sh EXCLUDE) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 48b70380677..1df489a1376 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -122,25 +122,22 @@ export(TARGETS ngraph NAMESPACE openvino:: # Installation logic... #----------------------------------------------------------------------------------------------- -ie_cpack_add_component(ngraph REQUIRED) -ie_cpack_add_component(ngraph_dev REQUIRED DEPENDS ngraph) - install(TARGETS ngraph EXPORT OpenVINOTargets - RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ngraph - ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT ngraph - LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT ngraph + 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 include) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include - COMPONENT ngraph_dev + COMPONENT core_dev FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h") configure_package_config_file(${OpenVINO_SOURCE_DIR}/cmake/templates/ngraphConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake - INSTALL_DESTINATION cmake) + INSTALL_DESTINATION ${IE_CPACK_LIBRARY_PATH}/openvino/cmake) write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake VERSION ${IE_VERSION_MAJOR}.${IE_VERSION_MINOR}.${IE_VERSION_PATCH} @@ -148,5 +145,5 @@ write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake - DESTINATION cmake - COMPONENT ngraph_dev) + DESTINATION ${IE_CPACK_LIBRARY_PATH}/openvino/cmake + COMPONENT core_dev) diff --git a/src/frontends/common/CMakeLists.txt b/src/frontends/common/CMakeLists.txt index 919cae2d091..fa3a4d3cdd6 100644 --- a/src/frontends/common/CMakeLists.txt +++ b/src/frontends/common/CMakeLists.txt @@ -78,18 +78,18 @@ openvino_developer_export_targets(COMPONENT ngraph TARGETS ${TARGET_NAME}) set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME frontend::common) install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets - RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ngraph - ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT ngraph - LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT ngraph) + RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core + ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) install(DIRECTORY ${FRONTEND_INCLUDE_DIR}/common DESTINATION ${FRONTEND_INSTALL_INCLUDE} - COMPONENT ngraph_dev + COMPONENT core_dev FILES_MATCHING PATTERN "*.hpp") install(DIRECTORY ${FRONTEND_INCLUDE_DIR}/ DESTINATION ${FRONTEND_INSTALL_INCLUDE} - COMPONENT ngraph_dev + COMPONENT core_dev FILES_MATCHING PATTERN "manager.hpp") export(TARGETS ${TARGET_NAME} NAMESPACE openvino:: diff --git a/src/frontends/onnx/frontend/CMakeLists.txt b/src/frontends/onnx/frontend/CMakeLists.txt index d671a9fc7a6..fad5a8375d2 100644 --- a/src/frontends/onnx/frontend/CMakeLists.txt +++ b/src/frontends/onnx/frontend/CMakeLists.txt @@ -21,5 +21,5 @@ ov_ncc_naming_style(FOR_TARGET ${TARGET_NAME} install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/onnx_import DESTINATION ${FRONTEND_INSTALL_INCLUDE} - COMPONENT ngraph_dev + COMPONENT core_dev FILES_MATCHING PATTERN "*.hpp") diff --git a/src/inference/CMakeLists.txt b/src/inference/CMakeLists.txt index 8ff0bcfe0f5..bcdd3118848 100644 --- a/src/inference/CMakeLists.txt +++ b/src/inference/CMakeLists.txt @@ -267,8 +267,8 @@ 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) - list(APPEND core_components tbb) + # ie_cpack_add_component(tbb REQUIRED) + # list(APPEND core_components tbb) # install(DIRECTORY "${TBB}/include" # DESTINATION runtime/3rdparty/tbb @@ -310,7 +310,7 @@ endif() # Install Inference Engine ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) -ie_cpack_add_component(core_dev REQUIRED core ngraph_dev) +ie_cpack_add_component(core_dev REQUIRED core) install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" DESTINATION include @@ -349,7 +349,7 @@ ov_install_static_lib(${TARGET_NAME}_plugin_api core) install(EXPORT OpenVINOTargets FILE OpenVINOTargets.cmake NAMESPACE openvino:: - DESTINATION cmake + DESTINATION ${IE_CPACK_LIBRARY_PATH}/openvino/cmake COMPONENT core_dev) set(IE_NGRAPH_DIR "${CMAKE_BINARY_DIR}/src/core") @@ -374,7 +374,7 @@ 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" - INSTALL_DESTINATION cmake + INSTALL_DESTINATION ${IE_CPACK_LIBRARY_PATH}/openvino/cmake PATH_VARS ${PATH_VARS}) configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig.cmake.in" @@ -390,10 +390,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}/cmake/ie_parallel.cmake" - DESTINATION cmake + DESTINATION ${IE_CPACK_LIBRARY_PATH}/openvino/cmake COMPONENT core_dev) install(FILES "${CMAKE_BINARY_DIR}/share/OpenVINOConfig.cmake" "${CMAKE_BINARY_DIR}/OpenVINOConfig-version.cmake" - DESTINATION cmake + DESTINATION ${IE_CPACK_LIBRARY_PATH}/openvino/cmake COMPONENT core_dev) diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index cea7fa453cf..67482029700 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -201,16 +201,26 @@ endif() # install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/gflags - DESTINATION "samples/cpp/thirdparty" + DESTINATION share/samples/cpp/thirdparty + USE_SOURCE_PERMISSIONS COMPONENT cpp_samples - USE_SOURCE_PERMISSIONS) + PATTERN gflags/gflags/test EXCLUDE + PATTERN gflags/gflags/.gitattributes EXCLUDE + PATTERN gflags/gflags/.git EXCLUDE + PATTERN gflags/gflags/.gitmodules EXCLUDE + PATTERN gflags/gflags/.gitignore EXCLUDE) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/zlib - DESTINATION "samples/cpp/thirdparty" + DESTINATION share/samples/cpp/thirdparty + USE_SOURCE_PERMISSIONS COMPONENT cpp_samples - USE_SOURCE_PERMISSIONS) + PATTERN zlib/zlib/.gitignore EXCLUDE + PATTERN zlib/zlib/zlib2ansi EXCLUDE + PATTERN zlib/zlib/configure EXCLUDE + PATTERN zlib/zlib/contrib/dotzlib EXCLUDE + PATTERN zlib/zlib/contrib/vstudio EXCLUDE) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cnpy - DESTINATION "samples/cpp/thirdparty" - COMPONENT cpp_samples - USE_SOURCE_PERMISSIONS) + DESTINATION share/samples/cpp/thirdparty + USE_SOURCE_PERMISSIONS + COMPONENT cpp_samples) diff --git a/thirdparty/onnx/CMakeLists.txt b/thirdparty/onnx/CMakeLists.txt index 0bafecc72c5..7adbef8fa9e 100644 --- a/thirdparty/onnx/CMakeLists.txt +++ b/thirdparty/onnx/CMakeLists.txt @@ -50,9 +50,9 @@ ov_install_static_lib(onnx_proto ngraph) if(NOT BUILD_SHARED_LIBS) if(ONNX_USE_LITE_PROTO) install(TARGETS ${Protobuf_LITE_LIBRARIES} EXPORT ONNXTargets - ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT ngraph) + ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core) else() install(TARGETS ${Protobuf_LIBRARIES} EXPORT ONNXTargets - ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT ngraph) + ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core) endif() endif() diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 5f2c194563f..e0379a4b242 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -16,7 +16,7 @@ add_subdirectory(compile_tool) ie_cpack_add_component(deployment_manager REQUIRED) install(DIRECTORY deployment_manager - DESTINATION tools + DESTINATION share/tools COMPONENT deployment_manager USE_SOURCE_PERMISSIONS) @@ -42,15 +42,16 @@ if(ENABLE_PYTHON) # install BA tool for tests install(FILES benchmark_tool/README.md benchmark_tool/requirements.txt - DESTINATION tools/benchmark_tool + DESTINATION share/tools/benchmark_tool COMPONENT tests EXCLUDE_FROM_ALL) install(PROGRAMS benchmark_tool/benchmark_app.py - DESTINATION tools/benchmark_tool + DESTINATION share/tools/benchmark_tool COMPONENT tests EXCLUDE_FROM_ALL) + # TODO: will be removed # install openvino/tools/benchmark as a python package install(DIRECTORY benchmark_tool/openvino/tools/benchmark DESTINATION python/${PYTHON_VERSION}/openvino/tools diff --git a/tools/compile_tool/CMakeLists.txt b/tools/compile_tool/CMakeLists.txt index 3f9459174be..7ba7b7ae1ae 100644 --- a/tools/compile_tool/CMakeLists.txt +++ b/tools/compile_tool/CMakeLists.txt @@ -37,10 +37,12 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) ie_cpack_add_component(core_tools DEPENDS core) +# TODO: check the proper location install(TARGETS compile_tool - RUNTIME DESTINATION tools/compile_tool - COMPONENT core_tools) + RUNTIME DESTINATION var/tools/compile_tool + COMPONENT core_dev) +# TODO install(FILES README.md - DESTINATION tools/compile_tool - COMPONENT core_tools) + DESTINATION var/tools/compile_tool + COMPONENT core_dev)