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

Added NPU to Debian packages (#22800) 

### Details:
 - *item1*
 - *...*

### Tickets:
 - *ticket-id*
This commit is contained in:
Ilya Lavrenov 2024-02-14 10:56:27 +04:00 committed by GitHub
parent a4946f05fb
commit 6bc7562f28
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/developer_package/packaging/debian/debian.cmake
View File

@ -153,7 +153,7 @@ macro(ov_debian_specific_settings)
list(APPEND CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${config}")
endforeach()
else()
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
list(APPEND CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
endif()
else()
message(FATAL_ERROR "CMAKE_LIBRARY_OUTPUT_DIRECTORY is empty")

25
cmake/packaging/debian.cmake
View File

@ -51,8 +51,8 @@ macro(ov_cpack_settings)
NOT item MATCHES "^${OV_CPACK_COMP_PYTHON_OPENVINO}_python.*" AND
# because in case of .deb package, pyopenvino_package_python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR} is installed
(NOT item MATCHES "^${OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE}_python.*" OR ENABLE_PYTHON_PACKAGING) AND
# temporary block NVIDIA and NPU
NOT item MATCHES "^(nvidia|npu)$" AND
# temporary block nvidia
NOT item STREQUAL "nvidia" AND
# don't install Intel OpenMP
NOT item STREQUAL "omp" AND
# the same for pugixml
@ -181,6 +181,27 @@ macro(ov_cpack_settings)
set(gpu_copyright "generic")
endif()
# intel-npu
if(ENABLE_INTEL_NPU OR BUILD_npu OR BUILD_vpux-plugin OR BUILD_applications.ai.vpu-accelerators.vpux-plugin)
set(CPACK_COMPONENT_NPU_DESCRIPTION "Intel® Neural Processing Unit inference plugin")
set(CPACK_COMPONENT_NPU_DEPENDS "${OV_CPACK_COMP_CORE}")
set(CPACK_DEBIAN_NPU_PACKAGE_NAME "libopenvino-intel-npu-plugin-${cpack_name_ver}")
set(CPACK_DEBIAN_NPU_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm}")
_ov_add_plugin(npu OFF)
set(npu_copyright "generic")
# NPU plugin also builds level-zero as thirdparty
# let's add it to the list of dependency search directories to avoid missing dependncy on libze_loader.so.1
if(OV_GENERATOR_MULTI_CONFIG)
# $<CONFIG> generator expression does not work in this place, have to add all possible configs
foreach(config IN LISTS CMAKE_CONFIGURATION_TYPES)
list(APPEND CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS "${CMAKE_BINARY_DIR}/lib/${config}")
endforeach()
else()
list(APPEND CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS "${CMAKE_BINARY_DIR}/lib")
endif()
endif()
# # add pseudo plugins are recommended to core component
# if(pseudo_plugins_recommends)
# # see https://superuser.com/questions/70031/what-is-the-difference-between-recommended-and-suggested-packages-ubuntu.

13
cmake/packaging/rpm.cmake
View File

@ -37,8 +37,8 @@ macro(ov_cpack_settings)
NOT item MATCHES "^${OV_CPACK_COMP_PYTHON_OPENVINO}_python.*" AND
# because in case of .rpm package, pyopenvino_package_python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR} is installed
(NOT item MATCHES "^${OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE}_python.*" OR ENABLE_PYTHON_PACKAGING) AND
# temporary block NVIDIA and NPU
NOT item MATCHES "^(nvidia|npu)$" AND
# temporary block nvidia
NOT item STREQUAL "nvidia" AND
# don't install Intel OpenMP
NOT item STREQUAL "omp" AND
# the same for pugixml
@ -177,6 +177,15 @@ macro(ov_cpack_settings)
set(gpu_copyright "generic")
endif()
# intel-npu
if(ENABLE_INTEL_NPU OR BUILD_npu OR BUILD_vpux-plugin OR BUILD_applications.ai.vpu-accelerators.vpux-plugin)
set(CPACK_COMPONENT_NPU_DESCRIPTION "Intel® Neural Processing Unit inference plugin")
set(CPACK_RPM_NPU_PACKAGE_REQUIRES "${core_package}")
set(CPACK_RPM_NPU_PACKAGE_NAME "libopenvino-intel-npu-plugin-${cpack_name_ver}")
_ov_add_package(plugin_packages npu)
set(npu_copyright "generic")
endif()
#
# Frontends
#

1
docs/articles_en/get-started/install-openvino-overview/install-openvino-linux-header/install-openvino-apt.rst
View File

@ -13,7 +13,6 @@ Install Intel® Distribution of OpenVINO™ Toolkit for Linux Using APT Reposito
Note that the APT distribution:
* offers both C/C++ and Python APIs
* does not offer support for NPU inference
* is dedicated to Linux users only
* additionally includes code samples

1
docs/articles_en/get-started/install-openvino-overview/install-openvino-shared/install-openvino-pip.rst
View File

@ -16,7 +16,6 @@ Install Intel® Distribution of OpenVINO™ Toolkit from PyPI Repository
* offers the Python API only
* is dedicated to users of all major OSes: Windows, Linux, and macOS
(all x86_64 / arm64 architectures)
* Windows and Linux do not offer support for NPU inference
* macOS offers support only for CPU inference
.. tab-set::