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

Fixed python; need to update component name in product config

Browse Source
This commit is contained in:
Ilya Lavrenov 2022-07-17 21:24:22 +08:00
parent e31018844d
commit 4413f0c4a8
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/developer_package/packaging/packaging.cmake
View File

@ -82,7 +82,8 @@ macro(ov_define_component_names)
set(OV_CPACK_COMP_C_SAMPLES "c_samples")
set(OV_CPACK_COMP_PYTHON_SAMPLES "python_samples")
# python
set(OV_CPACK_COMP_PYTHON_IE_API "pyie")
# TODO: rename to pyie and fix product-config as well
set(OV_CPACK_COMP_PYTHON_IE_API "")
set(OV_CPACK_COMP_PYTHON_NGRAPH "pyngraph")
set(OV_CPACK_COMP_PYTHON_OPENVINO "pyopenvino")
set(OV_CPACK_COMP_PYTHON_WHEELS "python_wheels")

6
src/bindings/python/src/compatibility/openvino/CMakeLists.txt
View File

@ -34,14 +34,16 @@ endif()
set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
if(ENABLE_CONDA_FOLDER)
set(PYTHON_COMPONENT conda_${OV_CPACK_COMP_PYTHON_IE_API}_${PYTHON_VERSION})
# set(PYTHON_COMPONENT conda_${OV_CPACK_COMP_PYTHON_IE_API}_${PYTHON_VERSION})
set(PYTHON_COMPONENT conda_${PYTHON_VERSION})
if(WIN32)
set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$<CONFIG>/python_api/Conda/${PYTHON_VERSION}/openvino)
else()
set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/python_api/Conda/${PYTHON_VERSION}/openvino)
endif()
else()
set(PYTHON_COMPONENT ${OV_CPACK_COMP_PYTHON_IE_API}_${PYTHON_VERSION})
# set(PYTHON_COMPONENT ${OV_CPACK_COMP_PYTHON_IE_API}_${PYTHON_VERSION})
set(PYTHON_COMPONENT ${PYTHON_VERSION})
if(WIN32)
set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$<CONFIG>/python_api/${PYTHON_VERSION}/openvino)
else()

4
src/bindings/python/src/pyopenvino/frontend/onnx/CMakeLists.txt
View File

@ -2,5 +2,5 @@
# SPDX-License-Identifier: Apache-2.0
#
include(${PYTHON_SOURCE_DIR}/pyopenvino/frontend/frontend_module.cmake)
frontend_module(py_onnx_frontend onnx pyopenvino_${PYTHON_VERSION})
include(${pyopenvino_SOURCE_DIR}/frontend/frontend_module.cmake)
frontend_module(py_onnx_frontend onnx ${OV_CPACK_COMP_PYTHON_OPENVINO}_${PYTHON_VERSION})

4
src/bindings/python/src/pyopenvino/frontend/paddle/CMakeLists.txt
View File

@ -2,5 +2,5 @@
# SPDX-License-Identifier: Apache-2.0
#
include(${PYTHON_SOURCE_DIR}/pyopenvino/frontend/frontend_module.cmake)
frontend_module(py_paddle_frontend paddle pyopenvino_${PYTHON_VERSION})
include(${pyopenvino_SOURCE_DIR}/frontend/frontend_module.cmake)
frontend_module(py_paddle_frontend paddle ${OV_CPACK_COMP_PYTHON_OPENVINO}_${PYTHON_VERSION})

2
src/bindings/python/src/pyopenvino/frontend/tensorflow/CMakeLists.txt
View File

@ -2,5 +2,5 @@
# SPDX-License-Identifier: Apache-2.0
#
include(${PYTHON_SOURCE_DIR}/pyopenvino/frontend/frontend_module.cmake)
include(${pyopenvino_SOURCE_DIR}/frontend/frontend_module.cmake)
frontend_module(py_tensorflow_frontend tensorflow tests)

1
src/bindings/python/wheel/setup.py
View File

@ -93,6 +93,7 @@ LIB_INSTALL_CFG = {
PY_INSTALL_CFG = {
"ie_py": {
# "name": f"pyie_{PYTHON_VERSION}",
"name": PYTHON_VERSION,
"prefix": "site-packages",
"install_dir": PY_PACKAGES_DIR,