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

Improvements

Browse Source
This commit is contained in:
Ilya Lavrenov committed 2021-12-05 20:50:19 +03:00
1 parent c13d7795ef
commit 29252a7d96
9 files changed
+78 -70
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cmake/developer_package/packaging.cmake
+45 -17
View File
@@ -101,7 +101,6 @@ macro(ie_cpack)
# - core_c
# - core_dev
# - core_c_dev
# - core_tools
# - c_samples
# - cpp_samples
# - python_samples
@@ -109,7 +108,6 @@ macro(ie_cpack)
# - [install_dependencies] probably should be removed
# - licensing
# - docs
# - [setupvars] should be removed
# - [python .*]
# - (cpu|gpu|hetero)
@@ -160,24 +158,15 @@ macro(ie_cpack)
endif()
endforeach()
set(lintian_override_file "${OpenVINO_BINARY_DIR}/_CPack_Packages/lintian/openvino-${comp}")
string(TOUPPER "${comp}" ucomp)
set(package_name "${CPACK_DEBIAN_${ucomp}_PACKAGE_NAME}")
set(lintian_override_file "${OpenVINO_BINARY_DIR}/_CPack_Packages/lintian/${package_name}")
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
#
@@ -193,7 +182,8 @@ macro(ie_cpack)
# core
set(CPACK_COMPONENT_CORE_DESCRIPTION "OpenVINO C++ Runtime libraries")
set(CPACK_COMPONENT_CORE_DEPENDS "")
set(CPACK_DEBIAN_CORE_PACKAGE_NAME "libopenvino-core")
set(CPACK_COMPONENT_CORE_DEV_DEPENDS "install_dependencies;licensing")
# TODO: should be discovered automatically
# TODO: install build dependencies libpugixml-dev, libtbb-dev
set(CPACK_DEBIAN_CORE_PACKAGE_DEPENDS "libpugixml1v5")
@@ -205,6 +195,7 @@ macro(ie_cpack)
# core_dev
set(CPACK_COMPONENT_CORE_DEV_DESCRIPTION "OpenVINO C++ Runtime development files")
set(CPACK_COMPONENT_CORE_DEV_DEPENDS "core")
set(CPACK_DEBIAN_CORE_DEV_PACKAGE_NAME "libopenvino-core-dev")
# Looks like it's arch dependent
# set(CPACK_DEBIAN_CORE_DEV_PACKAGE_ARCHITECTURE "all")
# set(CPACK_DEBIAN_CORE_PACKAGE_DEPENDS "libtbb-dev")
@@ -218,13 +209,15 @@ macro(ie_cpack)
# core_c
set(CPACK_COMPONENT_CORE_C_DESCRIPTION "OpenVINO C Runtime libraries")
set(CPACK_COMPONENT_CORE_C_DEPENDS "core")
set(CPACK_DEBIAN_CORE_C_PACKAGE_NAME "libopenvino-core-c")
# core_c_dev
set(CPACK_COMPONENT_CORE_C_DEV_DESCRIPTION "OpenVINO C Runtime development files")
set(CPACK_COMPONENT_CORE_C_DEV_DEPENDS "core_c;core_dev")
set(CPACK_DEBIAN_CORE_C_DEV_PACKAGE_NAME "libopenvino-core-c-dev")
# Looks like it's arch dependent
# set(CPACK_DEBIAN_CORE_C_DEV_PACKAGE_ARCHITECTURE "all")
# set(CPACK_DEBIAN_core_dev_PACKAGE_CONFLICTS "!!!")
# set(CPACK_DEBIAN_CORE_C_DEV_PACKAGE_CONFLICTS "!!!")
#
# Plugins
@@ -234,18 +227,21 @@ macro(ie_cpack)
if(ENABLE_HETERO)
set(CPACK_COMPONENT_HETERO_DESCRIPTION "OpenVINO Hetero plugin")
set(CPACK_COMPONENT_HETERO_DEPENDS "core")
set(CPACK_DEBIAN_HETERO_PACKAGE_NAME "libopenvino-hetero")
endif()
# multi / auto plugins
if(ENABLE_MULTI)
set(CPACK_COMPONENT_MULTI_DESCRIPTION "OpenVINO Multi / Auto plugin")
set(CPACK_COMPONENT_MULTI_DEPENDS "core")
set(CPACK_DEBIAN_MULTI_PACKAGE_NAME "libopenvino-multi")
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_NAME "libopenvino-intel-cpu")
set(CPACK_DEBIAN_CPU_PACKAGE_SUGGESTS "openvino-multi (= ${CPACK_PACKAGE_VERSION}), openvino-hetero (= ${CPACK_PACKAGE_VERSION})")
endif()
@@ -253,6 +249,7 @@ macro(ie_cpack)
if(ENABLE_INTEL_GPU)
set(CPACK_COMPONENT_GPU_DESCRIPTION "OpenVINO Intel GPU plugin")
set(CPACK_COMPONENT_GPU_DEPENDS "core")
set(CPACK_DEBIAN_GPU_PACKAGE_NAME "libopenvino-intel-gpu")
set(CPACK_DEBIAN_GPU_PACKAGE_SUGGESTS "openvino-multi (= ${CPACK_PACKAGE_VERSION}), openvino-hetero (= ${CPACK_PACKAGE_VERSION})")
endif()
@@ -260,6 +257,7 @@ macro(ie_cpack)
if(ENABLE_MYRIAD)
set(CPACK_COMPONENT_MYRIAD_DESCRIPTION "OpenVINO Intel Myriad plugin")
set(CPACK_COMPONENT_MYRIAD_DEPENDS "core")
set(CPACK_DEBIAN_MYRIAD_PACKAGE_NAME "libopenvino-intel-myriad")
set(CPACK_DEBIAN_MYRIAD_PACKAGE_SUGGESTS "openvino-multi (= ${CPACK_PACKAGE_VERSION}), openvino-hetero (= ${CPACK_PACKAGE_VERSION})")
endif()
@@ -267,6 +265,7 @@ macro(ie_cpack)
if(ENABLE_GNA)
set(CPACK_COMPONENT_GNA_DESCRIPTION "OpenVINO Intel GNA plugin")
set(CPACK_COMPONENT_GNA_DEPENDS "core")
set(CPACK_DEBIAN_GNA_PACKAGE_NAME "libopenvino-intel-gna")
set(CPACK_DEBIAN_GNA_PACKAGE_SUGGESTS "openvino-multi (= ${CPACK_PACKAGE_VERSION}), openvino-hetero (= ${CPACK_PACKAGE_VERSION})")
endif()
@@ -279,6 +278,7 @@ macro(ie_cpack)
# 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_NAME "libopenvino-samples-cpp")
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")
@@ -286,23 +286,51 @@ macro(ie_cpack)
# 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_NAME "libopenvino-samples-c")
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_NAME "libopenvino-samples-python")
set(CPACK_DEBIAN_PYTHON_SAMPLES_PACKAGE_ARCHITECTURE "all")
#
# other
#
# deployment manager
# deployment manager for runtime
set(CPACK_COMPONENT_DEPLOYMENT_MANAGER_DESCRIPTION "OpenVINO Deployment Manager")
set(CPACK_COMPONENT_DEPLOYMENT_MANAGER_DEPENDS "core")
set(CPACK_DEBIAN_DEPLOYMENT_MANAGER_PACKAGE_NAME "libopenvino-deployment-manager")
set(CPACK_DEBIAN_DEPLOYMENT_MANAGER_PACKAGE_DEPENDS "python3")
set(CPACK_DEBIAN_DEPLOYMENT_MANAGER_PACKAGE_ARCHITECTURE "all")
# install dependencies
set(CPACK_COMPONENT_INSTALL_DEPENDENCIES_DESCRIPTION "OpenVINO install dependencies")
set(CPACK_DEBIAN_INSTALL_DEPENDENCIES_PACKAGE_NAME "libopenvino-install-dependencies")
set(CPACK_DEBIAN_INSTALL_DEPENDENCIES_PACKAGE_DEPENDS "python3, TODO")
set(CPACK_DEBIAN_INSTALL_DEPENDENCIES_PACKAGE_ARCHITECTURE "all")
# licensing
set(CPACK_COMPONENT_LICENSING_DESCRIPTION "OpenVINO lincences")
set(CPACK_DEBIAN_LICENSING_PACKAGE_NAME "libopenvino-licensing")
set(CPACK_DEBIAN_LICENSING_PACKAGE_ARCHITECTURE "all")
# install debian common files
foreach(comp IN LISTS CPACK_COMPONENTS_ALL)
string(TOUPPER "${comp}" ucomp)
set(package_name "${CPACK_DEBIAN_${ucomp}_PACKAGE_NAME}")
# copyright
install(FILES "${OpenVINO_SOURCE_DIR}/LICENSE"
DESTINATION share/doc/${package_name}/
COMPONENT ${comp}
RENAME copyright)
# TODO: changelog
endforeach()
endif()
include(CPack)
cmake/templates/OpenVINOConfig.cmake.in
+1 -1
View File
@@ -151,7 +151,7 @@ endfunction()
set(_ov_package_prefix_dir "${PACKAGE_PREFIX_DIR}")
set(THREADING "@THREADING@")
if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND)
if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND NOT TBB_FOUND AND OFF)
set_and_check(_tbb_dir "@PACKAGE_IE_TBB_DIR@")
_ov_find_dependency(TBB
COMPONENTS tbb tbbmalloc
licensing/CMakeLists.txt
+2 -2
View File
@@ -8,7 +8,7 @@
ie_cpack_add_component(licensing)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION .
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
DESTINATION share/doc/openvino/licensing
COMPONENT licensing
PATTERN CMakeLists.txt EXCLUDE)
samples/CMakeLists.txt
+12 -12
View File
@@ -20,18 +20,18 @@ openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reade
# install C++ samples
ie_cpack_add_component(cpp_samples DEPENDS cpp_samples_deps core)
ie_cpack_add_component(cpp_samples DEPENDS core)
if(UNIX)
install(DIRECTORY cpp/
DESTINATION share/samples/cpp
DESTINATION share/openvino/samples/cpp
COMPONENT cpp_samples
USE_SOURCE_PERMISSIONS
PATTERN *.bat EXCLUDE
PATTERN .clang-format EXCLUDE)
elseif(WIN32)
install(DIRECTORY cpp/
DESTINATION share/samples/cpp
DESTINATION share/openvino/samples/cpp
COMPONENT cpp_samples
USE_SOURCE_PERMISSIONS
PATTERN *.sh EXCLUDE
@@ -44,22 +44,22 @@ ie_cpack_add_component(c_samples DEPENDS core_c)
if(UNIX)
install(PROGRAMS cpp/build_samples.sh
DESTINATION share/samples/c
DESTINATION share/openvino/samples/c
COMPONENT c_samples)
elseif(WIN32)
install(PROGRAMS cpp/build_samples_msvc.bat
DESTINATION share/samples/c
DESTINATION share/openvino/samples/c
COMPONENT c_samples)
endif()
install(DIRECTORY c
DESTINATION share/samples
DESTINATION share/openvino/samples
COMPONENT c_samples
PATTERN c/CMakeLists.txt EXCLUDE
PATTERN c/.clang-format EXCLUDE)
install(FILES cpp/CMakeLists.txt
DESTINATION share/samples/c
DESTINATION share/openvino/samples/c
COMPONENT c_samples)
# install Python samples
@@ -68,22 +68,22 @@ if(ENABLE_PYTHON)
ie_cpack_add_component(python_samples)
install(DIRECTORY python/
DESTINATION share/samples/python
USE_SOURCE_PERMISSIONS
COMPONENT python_samples)
DESTINATION share/openvino/samples/python
USE_SOURCE_PERMISSIONS
COMPONENT python_samples)
endif()
# install scripts to run samples fast
if(UNIX)
install(DIRECTORY scripts/
DESTINATION share/samples/scripts
DESTINATION share/openvino/samples/scripts
COMPONENT cpp_samples
USE_SOURCE_PERMISSIONS
PATTERN *.bat EXCLUDE)
elseif(WIN32)
install(DIRECTORY scripts/
DESTINATION share/samples/scripts
DESTINATION share/openvino/samples/scripts
COMPONENT cpp_samples
USE_SOURCE_PERMISSIONS
PATTERN *.sh EXCLUDE)
samples/cpp/build_samples.sh
+1 -19
View File
@@ -54,26 +54,8 @@ trap 'error ${LINENO}' ERR
SAMPLES_PATH="$( cd "$( dirname "${BASH_SOURCE[0]-$0}" )" && pwd )"
printf "\nSetting environment variables for building samples...\n"
if [ -z "$INTEL_OPENVINO_DIR" ]; then
if [ -e "$SAMPLES_PATH/../../setupvars.sh" ]; then
setvars_path="$SAMPLES_PATH/../../setupvars.sh"
else
printf "Error: Failed to set the environment variables automatically. To fix, run the following command:\n source <INSTALL_DIR>/setupvars.sh\n where INSTALL_DIR is the OpenVINO installation directory.\n\n"
exit 1
fi
if ! source "$setvars_path" ; then
printf "Unable to run ./setupvars.sh. Please check its presence. \n\n"
exit 1
fi
else
# case for run with `sudo -E`
source "$INTEL_OPENVINO_DIR/setupvars.sh"
fi
if ! command -v cmake &>/dev/null; then
printf "\n\nCMAKE is not installed. It is required to build Inference Engine samples. Please install it. \n\n"
printf "\n\nCMAKE is not installed. It is required to build OpenVINO samples. Please install it. \n\n"
exit 1
fi
scripts/CMakeLists.txt
+11 -11
View File
@@ -27,24 +27,24 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}"
# install setupvars
ie_cpack_add_component(setupvars REQUIRED)
# ie_cpack_add_component(setupvars REQUIRED)
if(UNIX)
install(PROGRAMS setupvars/setupvars.sh
DESTINATION .
COMPONENT setupvars)
elseif(WIN32)
install(PROGRAMS setupvars/setupvars.bat
DESTINATION .
COMPONENT setupvars)
endif()
# if(UNIX)
# install(PROGRAMS setupvars/setupvars.sh
# DESTINATION .
# COMPONENT setupvars)
# elseif(WIN32)
# install(PROGRAMS setupvars/setupvars.bat
# DESTINATION .
# COMPONENT setupvars)
# endif()
# install install_dependencies
if(UNIX)
ie_cpack_add_component(install_dependencies REQUIRED)
install(DIRECTORY install_dependencies/
DESTINATION install_dependencies
DESTINATION share/openvino/install_dependencies
COMPONENT install_dependencies
USE_SOURCE_PERMISSIONS)
endif()
thirdparty/CMakeLists.txt
Vendored
+3 -3
View File
@@ -201,7 +201,7 @@ endif()
#
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/gflags
DESTINATION share/samples/cpp/thirdparty
DESTINATION share/openvino/samples/cpp/thirdparty
USE_SOURCE_PERMISSIONS
COMPONENT cpp_samples
PATTERN gflags/gflags/test EXCLUDE
@@ -211,7 +211,7 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/gflags
PATTERN gflags/gflags/.gitignore EXCLUDE)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/zlib
DESTINATION share/samples/cpp/thirdparty
DESTINATION share/openvino/samples/cpp/thirdparty
USE_SOURCE_PERMISSIONS
COMPONENT cpp_samples
PATTERN zlib/zlib/.gitignore EXCLUDE
@@ -221,6 +221,6 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/zlib
PATTERN zlib/zlib/contrib/vstudio EXCLUDE)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cnpy
DESTINATION share/samples/cpp/thirdparty
DESTINATION share/openvino/samples/cpp/thirdparty
USE_SOURCE_PERMISSIONS
COMPONENT cpp_samples)
tools/CMakeLists.txt
+1 -1
View File
@@ -16,7 +16,7 @@ add_subdirectory(compile_tool)
ie_cpack_add_component(deployment_manager REQUIRED)
install(DIRECTORY deployment_manager
DESTINATION share/tools
DESTINATION share/openvino/tools
COMPONENT deployment_manager
USE_SOURCE_PERMISSIONS)
tools/compile_tool/CMakeLists.txt
+2 -4
View File
@@ -35,14 +35,12 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
# install
ie_cpack_add_component(core_tools DEPENDS core)
# TODO: check the proper location
install(TARGETS compile_tool
RUNTIME DESTINATION var/tools/compile_tool
RUNTIME DESTINATION share/openvino/tools/compile_tool
COMPONENT core_dev)
# TODO
install(FILES README.md
DESTINATION var/tools/compile_tool
DESTINATION share/openvino/tools/compile_tool
COMPONENT core_dev)