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

Some updates

Browse Source
This commit is contained in:
Ilya Lavrenov
2022-07-17 15:31:08 +08:00
parent b079a9e3a5
commit e31018844d
5 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/debian.cmake
View File

@@ -11,8 +11,10 @@ macro(ov_debian_components)
set(cpack_components_all ${CPACK_COMPONENTS_ALL})
unset(CPACK_COMPONENTS_ALL)
foreach(item ${cpack_components_all})
# filter out some components
# filter out some components, which are not needed to wrapped to .deb package
if(# NOT ${item} MATCHES ".*(python).*" AND
# python wheels are not need to be wrapped by debian packages
NOT item STREQUAL OV_CPACK_COMP_PYTHON_WHEELS AND
# even for case of system TBB we have installation rules for wheels packages
# so, need to skip this explicitly
NOT item MATCHES "^tbb(_dev)?$" AND

1
cmake/developer_package/packaging/packaging.cmake
View File

@@ -85,6 +85,7 @@ macro(ov_define_component_names)
set(OV_CPACK_COMP_PYTHON_IE_API "pyie")
set(OV_CPACK_COMP_PYTHON_NGRAPH "pyngraph")
set(OV_CPACK_COMP_PYTHON_OPENVINO "pyopenvino")
set(OV_CPACK_COMP_PYTHON_WHEELS "python_wheels")
# tools
set(OV_CPACK_COMP_CORE_TOOLS "core_tools")
set(OV_CPACK_COMP_DEV_REQ_FILES "openvino_dev_req_files")

19
src/bindings/c/ov/src/CMakeLists.txt
View File

@@ -36,15 +36,18 @@ export(TARGETS ${TARGET_NAME} NAMESPACE openvino::
# install
ie_cpack_add_component(core_c DEPENDS core)
ie_cpack_add_component(core_c_dev DEPENDS core_c)
ie_cpack_add_component(${OV_CPACK_COMP_CORE_C} DEPENDS ${OV_CPACK_COMP_CORE})
ie_cpack_add_component(${OV_CPACK_COMP_CORE_C_DEV} DEPENDS ${OV_CPACK_COMP_CORE_C})
install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
RUNTIME DESTINATION ${OV_CPACK_RUNTIMEDIR} COMPONENT core_c
ARCHIVE DESTINATION ${OV_CPACK_ARCHIVEDIR} COMPONENT core_c
LIBRARY DESTINATION ${OV_CPACK_LIBRARYDIR} COMPONENT core_c
INCLUDES DESTINATION runtime/include/ie)
RUNTIME DESTINATION ${OV_CPACK_RUNTIMEDIR} COMPONENT ${OV_CPACK_COMP_CORE_C}
ARCHIVE DESTINATION ${OV_CPACK_ARCHIVEDIR} COMPONENT ${OV_CPACK_COMP_CORE_C}
LIBRARY DESTINATION ${OV_CPACK_LIBRARYDIR} COMPONENT ${OV_CPACK_COMP_CORE_C}
NAMELINK_COMPONENT ${OV_CPACK_COMP_CORE_C_DEV}
# TODO: fix to proper location
INCLUDES DESTINATION ${OV_CPACK_INCLUDEDIR}/ie)
install(DIRECTORY ${InferenceEngine_C_API_SOURCE_DIR}/include/
DESTINATION runtime/include/ie
COMPONENT core_c_dev)
# TODO: fix to proper location
DESTINATION ${OV_CPACK_INCLUDEDIR}/ie
COMPONENT ${OV_CPACK_COMP_CORE_C_DEV})

4
src/bindings/python/wheel/CMakeLists.txt
View File

@@ -66,11 +66,11 @@ add_custom_target(ie_wheel ALL DEPENDS ${openvino_wheel_path})
# install
ie_cpack_add_component(python_wheels
ie_cpack_add_component(${OV_CPACK_COMP_PYTHON_WHEELS}
DEPENDS ${OV_CPACK_COMP_PYTHON_OPENVINO}_${PYTHON_VERSION}
${OV_CPACK_COMP_PYTHON_IE_API}_${PYTHON_VERSION}
${OV_CPACK_COMP_PYTHON_NGRAPH}_${PYTHON_VERSION})
install(FILES ${openvino_wheel_path}
DESTINATION ${OV_CPACK_WHEELSDIR}
COMPONENT python_wheels)
COMPONENT ${OV_CPACK_COMP_PYTHON_WHEELS})

7
tools/openvino_dev/CMakeLists.txt
View File

@@ -24,8 +24,11 @@ add_custom_target(openvino_dev_wheel ALL DEPENDS ${openvino_wheel_path})
# install
ie_cpack_add_component(python_wheels)
ie_cpack_add_component(${OV_CPACK_COMP_PYTHON_WHEELS}
DEPENDS ${OV_CPACK_COMP_PYTHON_OPENVINO}_${PYTHON_VERSION}
${OV_CPACK_COMP_PYTHON_IE_API}_${PYTHON_VERSION}
${OV_CPACK_COMP_PYTHON_NGRAPH}_${PYTHON_VERSION})
install(FILES ${openvino_wheel_path}
DESTINATION ${OV_CPACK_WHEELSDIR}
COMPONENT python_wheels)
COMPONENT ${OV_CPACK_COMP_PYTHON_WHEELS})