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

Use different cpack name for conda Python API build (#6701)

Browse Source 
* Add prefix for conda build to cpack name for python api

* use PYTHON_COMPONENT variable
This commit is contained in:
Alexey Suhov 2021-07-20 13:49:27 +03:00 committed by GitHub
parent c2c6fe59da
commit d7e97ee2e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
inference-engine/ie_bridges/python/CMakeLists.txt
View File

@ -43,12 +43,14 @@ else()
endif() endif()
if(ENABLE_CONDA_FOLDER) if(ENABLE_CONDA_FOLDER)
set(PYTHON_COMPONENT conda_${PYTHON_VERSION})
if(WIN32) if(WIN32)
set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$<CONFIG>/python_api/Conda/${PYTHON_VERSION}/openvino) set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$<CONFIG>/python_api/Conda/${PYTHON_VERSION}/openvino)
else() else()
set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/python_api/Conda/${PYTHON_VERSION}/openvino) set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/python_api/Conda/${PYTHON_VERSION}/openvino)
endif() endif()
else() else()
set(PYTHON_COMPONENT ${PYTHON_VERSION})
if(WIN32) if(WIN32)
set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$<CONFIG>/python_api/${PYTHON_VERSION}/openvino) set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$<CONFIG>/python_api/${PYTHON_VERSION}/openvino)
else() else()
@ -74,19 +76,19 @@ endif()
# install # install
ie_cpack_add_component(${PYTHON_VERSION}) ie_cpack_add_component(${PYTHON_COMPONENT})
install(FILES requirements.txt install(FILES requirements.txt
DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION} DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}
COMPONENT ${PYTHON_VERSION}) COMPONENT ${PYTHON_COMPONENT})
install(FILES requirements.txt install(FILES requirements.txt
DESTINATION ${PYTHON_BRIDGE_CPACK_PATH} DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}
COMPONENT ${PYTHON_VERSION}) COMPONENT ${PYTHON_COMPONENT})
install(PROGRAMS src/openvino/__init__.py install(PROGRAMS src/openvino/__init__.py
DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino
COMPONENT ${PYTHON_VERSION}) COMPONENT ${PYTHON_COMPONENT})
# install Python samples # install Python samples
@ -96,4 +98,4 @@ install(DIRECTORY sample/
DESTINATION ${IE_CPACK_IE_DIR}/samples/python DESTINATION ${IE_CPACK_IE_DIR}/samples/python
COMPONENT python_samples) COMPONENT python_samples)
ie_cpack(${PYTHON_VERSION} python_samples) ie_cpack(${PYTHON_COMPONENT} python_samples)

6
inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt
View File

@ -70,12 +70,12 @@ add_custom_command(TARGET ${TARGET_NAME}
# install # install
install(TARGETS ${INSTALLED_TARGETS} install(TARGETS ${INSTALLED_TARGETS}
RUNTIME DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino/inference_engine COMPONENT ${PYTHON_VERSION} RUNTIME DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino/inference_engine COMPONENT ${PYTHON_COMPONENT}
LIBRARY DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino/inference_engine COMPONENT ${PYTHON_VERSION}) LIBRARY DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino/inference_engine COMPONENT ${PYTHON_COMPONENT})
install(PROGRAMS __init__.py install(PROGRAMS __init__.py
DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino/inference_engine DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino/inference_engine
COMPONENT ${PYTHON_VERSION}) COMPONENT ${PYTHON_COMPONENT})
add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME} add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}
EXCLUDE_PATTERNS ".*\\.cxx;.*\\.pxd;.*\\.pyx") EXCLUDE_PATTERNS ".*\\.cxx;.*\\.pxd;.*\\.pyx")

8
inference-engine/ie_bridges/python/src/openvino/offline_transformations/CMakeLists.txt
View File

@ -54,12 +54,12 @@ add_custom_command(TARGET ${TARGET_NAME}
# install # install
# TODO: use ${PYTHON_VERSION}_dev component below # TODO: use ${PYTHON_VERSION}_dev component below
# ie_cpack_add_component(${PYTHON_VERSION}_dev DEPENDS ${PYTHON_VERSION}) # ie_cpack_add_component(${PYTHON_VERSION}_dev DEPENDS ${PYTHON_COMPONENT})
install(TARGETS ${TARGET_NAME} install(TARGETS ${TARGET_NAME}
RUNTIME DESTINATION python/${PYTHON_VERSION}/openvino/offline_transformations COMPONENT ${PYTHON_VERSION} RUNTIME DESTINATION python/${PYTHON_VERSION}/openvino/offline_transformations COMPONENT ${PYTHON_COMPONENT}
LIBRARY DESTINATION python/${PYTHON_VERSION}/openvino/offline_transformations COMPONENT ${PYTHON_VERSION}) LIBRARY DESTINATION python/${PYTHON_VERSION}/openvino/offline_transformations COMPONENT ${PYTHON_COMPONENT})
install(PROGRAMS __init__.py install(PROGRAMS __init__.py
DESTINATION python/${PYTHON_VERSION}/openvino/offline_transformations DESTINATION python/${PYTHON_VERSION}/openvino/offline_transformations
COMPONENT ${PYTHON_VERSION}) COMPONENT ${PYTHON_COMPONENT})