From 5d31a27f573add6df00c262d3f52a836521a5b8c Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Thu, 18 Aug 2022 08:31:23 +0400 Subject: [PATCH] Fix conditions for python when cmake debug prefix is not empty (#12601) --- cmake/developer_package/cpplint/cpplint.cmake | 2 +- .../ncc_naming_style/ncc_naming_style.cmake | 2 +- .../python_requirements.cmake | 4 +-- cmake/features.cmake | 2 +- cmake/test_model_zoo.cmake | 2 +- src/bindings/python/CMakeLists.txt | 34 ++++++++++++------- .../src/compatibility/openvino/CMakeLists.txt | 16 ++++----- .../openvino/inference_engine/CMakeLists.txt | 6 ++-- .../src/compatibility/pyngraph/CMakeLists.txt | 20 +++++------ .../python/src/pyopenvino/CMakeLists.txt | 20 +++++------ .../pyopenvino/frontend/frontend_module.cmake | 2 +- .../pyopenvino/frontend/onnx/CMakeLists.txt | 2 +- .../pyopenvino/frontend/paddle/CMakeLists.txt | 2 +- .../src/pyopenvino/test_utils/CMakeLists.txt | 6 ++-- .../mock/pyngraph_fe_mock_api/CMakeLists.txt | 2 +- src/bindings/python/wheel/CMakeLists.txt | 4 +-- .../src/kernel_selector/CMakeLists.txt | 2 +- .../mock_mo_frontend/CMakeLists.txt | 6 ++-- .../mock_mo_python_api/CMakeLists.txt | 10 +++--- 19 files changed, 76 insertions(+), 68 deletions(-) diff --git a/cmake/developer_package/cpplint/cpplint.cmake b/cmake/developer_package/cpplint/cpplint.cmake index 6a7343ce30e..5e096a1a757 100644 --- a/cmake/developer_package/cpplint/cpplint.cmake +++ b/cmake/developer_package/cpplint/cpplint.cmake @@ -3,7 +3,7 @@ # if(ENABLE_CPPLINT) - find_package(PythonInterp 3 QUIET) + find_host_package(PythonInterp 3 QUIET) if(NOT PYTHONINTERP_FOUND) message(WARNING "Python3 interpreter was not found (required for cpplint check)") diff --git a/cmake/developer_package/ncc_naming_style/ncc_naming_style.cmake b/cmake/developer_package/ncc_naming_style/ncc_naming_style.cmake index 7b97ac521b7..7a02b74cbe5 100644 --- a/cmake/developer_package/ncc_naming_style/ncc_naming_style.cmake +++ b/cmake/developer_package/ncc_naming_style/ncc_naming_style.cmake @@ -11,7 +11,7 @@ set(ncc_style_bin_dir "${CMAKE_CURRENT_BINARY_DIR}/ncc_naming_style") # find python3 -find_package(PythonInterp 3 QUIET) +find_host_package(PythonInterp 3 QUIET) if(NOT PYTHONINTERP_FOUND) message(WARNING "Python3 interpreter was not found (required for ncc naming style check)") set(ENABLE_NCC_STYLE OFF) diff --git a/cmake/developer_package/python_requirements.cmake b/cmake/developer_package/python_requirements.cmake index f1a47aa87d8..532462511b9 100644 --- a/cmake/developer_package/python_requirements.cmake +++ b/cmake/developer_package/python_requirements.cmake @@ -9,7 +9,7 @@ # [MESSAGE_MODE ]) # function(ov_check_pip_package) - find_package(PythonInterp 3 QUIET) + find_host_package(PythonInterp 3 QUIET) set(oneValueOptionalArgs MESSAGE_MODE # Set the type of message: { FATAL_ERROR | WARNING | ... } @@ -65,7 +65,7 @@ endfunction() # [MESSAGE_MODE ]) # function(ov_check_pip_packages) - find_package(PythonInterp 3 QUIET) + find_host_package(PythonInterp 3 QUIET) set(oneValueOptionalArgs MESSAGE_MODE # Set the type of message: { FATAL_ERROR | WARNING | ... } diff --git a/cmake/features.cmake b/cmake/features.cmake index 76f8df0ed62..2eb8356b1a7 100644 --- a/cmake/features.cmake +++ b/cmake/features.cmake @@ -43,7 +43,7 @@ Usage: -DSELECTIVE_BUILD=ON -DSELECTIVE_BUILD_STAT=/path/*.csv" OFF ie_option(ENABLE_ERROR_HIGHLIGHT "Highlight errors and warnings during compile time" OFF) -find_package(PythonInterp 3 QUIET) +find_host_package(PythonInterp 3 QUIET) ie_dependent_option (ENABLE_DOCS "Build docs using Doxygen" OFF "PYTHONINTERP_FOUND" OFF) # diff --git a/cmake/test_model_zoo.cmake b/cmake/test_model_zoo.cmake index 7773e21c723..84c0d20b567 100644 --- a/cmake/test_model_zoo.cmake +++ b/cmake/test_model_zoo.cmake @@ -88,7 +88,7 @@ ov_model_convert("${OpenVINO_SOURCE_DIR}/${rel_path}" if(ENABLE_TESTS) if(ENABLE_OV_ONNX_FRONTEND AND ENABLE_REQUIREMENTS_INSTALL) - find_package(PythonInterp 3 REQUIRED) + find_host_package(PythonInterp 3 REQUIRED) get_filename_component(PYTHON_EXEC_DIR ${PYTHON_EXECUTABLE} DIRECTORY) execute_process(COMMAND "${PYTHON_EXECUTABLE}" -m pip --version diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt index c244d1f2007..0924eb33cfa 100644 --- a/src/bindings/python/CMakeLists.txt +++ b/src/bindings/python/CMakeLists.txt @@ -14,13 +14,7 @@ if(NOT DEFINED OpenVINO_SOURCE_DIR) find_package(InferenceEngineDeveloperPackage REQUIRED) endif() -if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND CMAKE_DEBUG_POSTFIX) - message(FATAL_ERROR "Building python bindings in debug configuration is not supported on your platform.") -endif() - -set(LIBRARY_OUTPUT_DIRECTORY_BIN ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) -set(PYTHON_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) -set(PYTHON_BINDINGS_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +set(PYTHON_SOURCE_DIR ${OpenVINOPython_SOURCE_DIR}/src) # TODO: Remove this condition as 76672 will be fixed if(CMAKE_CROSSCOMPILING AND DEFINED ENV{OE_CMAKE_TOOLCHAIN_FILE}) @@ -37,9 +31,14 @@ set(ie_python_req "cython>=0.29.22") function(ov_check_python_build_conditions) # Try to find python3 find_package(PythonInterp 3 QUIET) - if(PythonInterp_FOUND) + if(PYTHONINTERP_FOUND) # use libraries with the same version as python itself find_package(PythonLibs ${PYTHON_VERSION_STRING} EXACT QUIET) + if(NOT PYTHONLIBS_FOUND) + message(WARNING "Python development libraries are not found. OpenVINO Python API will be turned off (ENABLE_PYTHON is OFF)") + endif() + else() + message(WARNING "Python 3.x interpreter is not found. OpenVINO Python API will be turned off (ENABLE_PYTHON is OFF)") endif() # pyopenvino requirements @@ -64,10 +63,18 @@ function(ov_check_python_build_conditions) if(CYTHON_VERSION VERSION_GREATER_EQUAL 0.29) set(ie_python_req_FOUND ON) else() - message(WARNING "Python module '${ie_python_req}' is missed, IE Python API 1.0 will not be built") + message(WARNING "Python module '${ie_python_req}' is missed, IE Python API 1.0 will not be built (ENABLE_PYTHON is OFF)") endif() endif() + if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND CMAKE_DEBUG_POSTFIX) + set(python_debug ON) + message(WARNING "Building python bindings in debug configuration is not supported on your platform (ENABLE_PYTHON is OFF)") + else() + set(python_debug OFF) + endif() + + set(python_debug ${python_debug} PARENT_SCOPE) set(PYTHONLIBS_FOUND ${PYTHONLIBS_FOUND} PARENT_SCOPE) set(ov_python_reqs_FOUND ${ov_python_reqs_FOUND} PARENT_SCOPE) set(ie_python_req_FOUND ${ie_python_req_FOUND} PARENT_SCOPE) @@ -75,7 +82,7 @@ endfunction() ov_check_python_build_conditions() -ie_dependent_option(ENABLE_PYTHON "enables ie python bridge build" ON "PYTHONLIBS_FOUND;ov_python_reqs_FOUND" OFF) +ie_dependent_option(ENABLE_PYTHON "enables ie python bridge build" ON "PYTHONLIBS_FOUND;ov_python_reqs_FOUND;NOT python_debug" OFF) if(NOT ENABLE_PYTHON) if(CMAKE_SOURCE_DIR STREQUAL OpenVINOPython_SOURCE_DIR) @@ -90,7 +97,7 @@ ov_check_pip_packages(REQUIREMENTS_FILE "${OpenVINOPython_SOURCE_DIR}/wheel/requ RESULT_VAR wheel_req_FOUND MESSAGE_MODE WARNING) -set(WHEEL_CONDITION "PYTHONINTERP_FOUND;ENABLE_PYTHON;wheel_req_FOUND;CMAKE_SOURCE_DIR STREQUAL OpenVINO_SOURCE_DIR") +set(WHEEL_CONDITIONS "PYTHONINTERP_FOUND;ENABLE_PYTHON;wheel_req_FOUND;CMAKE_SOURCE_DIR STREQUAL OpenVINO_SOURCE_DIR") if(LINUX) find_host_program(patchelf_program @@ -98,13 +105,13 @@ if(LINUX) DOC "Path to patchelf tool") if(NOT patchelf_program) message(WARNING "patchelf is not found. It is required to build OpenVINO Runtime wheel. Install via apt-get install patchelf") - list(APPEND WHEEL_CONDITION patchelf_program) + list(APPEND WHEEL_CONDITIONS patchelf_program) endif() endif() # this option should not be a part of InferenceEngineDeveloperPackage # since wheels can be built only together with main OV build -ie_dependent_option(ENABLE_WHEEL "Build wheel packages for PyPI" ON "${WHEEL_CONDITION}" OFF) +ie_dependent_option(ENABLE_WHEEL "Build wheel packages for PyPI" ON "${WHEEL_CONDITIONS}" OFF) # # Build the code @@ -129,6 +136,7 @@ if(ENABLE_WHEEL) endif() if(ENABLE_OV_CORE_UNIT_TESTS AND NOT DISABLE_PYBIND11) + set(LIBRARY_OUTPUT_DIRECTORY_BIN ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) add_subdirectory(tests/mock/mock_py_frontend) add_dependencies(pyopenvino openvino_mock_py_frontend) set_target_properties(openvino_mock_py_frontend PROPERTIES diff --git a/src/bindings/python/src/compatibility/openvino/CMakeLists.txt b/src/bindings/python/src/compatibility/openvino/CMakeLists.txt index 1120a8958a2..e3ef07f0cb8 100644 --- a/src/bindings/python/src/compatibility/openvino/CMakeLists.txt +++ b/src/bindings/python/src/compatibility/openvino/CMakeLists.txt @@ -31,21 +31,21 @@ else() message(STATUS "Found Cython version ${CYTHON_VERSION}") endif() -set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) +set(pyversion 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}_${pyversion}) if(WIN32) - 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/${pyversion}/openvino) 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/${pyversion}/openvino) endif() else() - set(PYTHON_COMPONENT ${OV_CPACK_COMP_PYTHON_IE_API}_${PYTHON_VERSION}) + set(PYTHON_COMPONENT ${OV_CPACK_COMP_PYTHON_IE_API}_${pyversion}) if(WIN32) - set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$/python_api/${PYTHON_VERSION}/openvino) + set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$/python_api/${pyversion}/openvino) else() - set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/python_api/${PYTHON_VERSION}/openvino) + set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/python_api/${pyversion}/openvino) endif() endif() @@ -68,5 +68,5 @@ endif() ie_cpack_add_component(${PYTHON_COMPONENT} HIDDEN) install(FILES requirements.txt - DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION} + DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${pyversion} COMPONENT ${PYTHON_COMPONENT}) diff --git a/src/bindings/python/src/compatibility/openvino/inference_engine/CMakeLists.txt b/src/bindings/python/src/compatibility/openvino/inference_engine/CMakeLists.txt index 63fd23f6ebd..1e0ea97e794 100644 --- a/src/bindings/python/src/compatibility/openvino/inference_engine/CMakeLists.txt +++ b/src/bindings/python/src/compatibility/openvino/inference_engine/CMakeLists.txt @@ -72,13 +72,13 @@ add_custom_command(TARGET ${TARGET_NAME} # install install(TARGETS ${INSTALLED_TARGETS} - RUNTIME DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino/inference_engine + RUNTIME DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${pyversion}/openvino/inference_engine COMPONENT ${PYTHON_COMPONENT} - LIBRARY DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino/inference_engine + LIBRARY DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${pyversion}/openvino/inference_engine COMPONENT ${PYTHON_COMPONENT}) install(PROGRAMS __init__.py - DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino/inference_engine + DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${pyversion}/openvino/inference_engine COMPONENT ${PYTHON_COMPONENT}) add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME} diff --git a/src/bindings/python/src/compatibility/pyngraph/CMakeLists.txt b/src/bindings/python/src/compatibility/pyngraph/CMakeLists.txt index 1f177b7e03c..858eeb08289 100644 --- a/src/bindings/python/src/compatibility/pyngraph/CMakeLists.txt +++ b/src/bindings/python/src/compatibility/pyngraph/CMakeLists.txt @@ -12,14 +12,14 @@ if(NOT DEFINED OpenVINO_SOURCE_DIR) endif() # PYTHON_VERSION_MAJOR and PYTHON_VERSION_MINOR are defined inside pybind11 -set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) -message(STATUS "Python version=${PYTHON_VERSION}") +set(pyversion python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) +message(STATUS "Python version=${pyversion}") if(OpenVINO_SOURCE_DIR) if(WIN32) - set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$/python_api/${PYTHON_VERSION}/) + set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$/python_api/${pyversion}/) else() - set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/python_api/${PYTHON_VERSION}/) + set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/python_api/${pyversion}/) endif() set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PYTHON_BRIDGE_OUTPUT_DIRECTORY}) @@ -72,18 +72,18 @@ if(OpenVINO_SOURCE_DIR OR InferenceEngineDeveloperPackage_FOUND) ie_python_minimal_api(_${PROJECT_NAME}) add_clang_format_target(_${PROJECT_NAME}_clang FOR_TARGETS _${PROJECT_NAME}) - ie_cpack_add_component(${OV_CPACK_COMP_PYTHON_NGRAPH}_${PYTHON_VERSION} HIDDEN) + ie_cpack_add_component(${OV_CPACK_COMP_PYTHON_NGRAPH}_${pyversion} HIDDEN) install(TARGETS _${PROJECT_NAME} - DESTINATION ${OV_CPACK_PYTHONDIR}/${PYTHON_VERSION} - COMPONENT ${OV_CPACK_COMP_PYTHON_NGRAPH}_${PYTHON_VERSION}) + DESTINATION ${OV_CPACK_PYTHONDIR}/${pyversion} + COMPONENT ${OV_CPACK_COMP_PYTHON_NGRAPH}_${pyversion}) install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../ngraph - DESTINATION ${OV_CPACK_PYTHONDIR}/${PYTHON_VERSION} - COMPONENT ${OV_CPACK_COMP_PYTHON_NGRAPH}_${PYTHON_VERSION} + DESTINATION ${OV_CPACK_PYTHONDIR}/${pyversion} + COMPONENT ${OV_CPACK_COMP_PYTHON_NGRAPH}_${pyversion} USE_SOURCE_PERMISSIONS) - install(DIRECTORY ${PYTHON_BINDINGS_ROOT_DIR}/tests_compatibility + install(DIRECTORY ${OpenVINOPython_SOURCE_DIR}/tests_compatibility DESTINATION tests/${PROJECT_NAME} COMPONENT tests EXCLUDE_FROM_ALL) endif() diff --git a/src/bindings/python/src/pyopenvino/CMakeLists.txt b/src/bindings/python/src/pyopenvino/CMakeLists.txt index c6c10ab37b8..46b66b314cd 100644 --- a/src/bindings/python/src/pyopenvino/CMakeLists.txt +++ b/src/bindings/python/src/pyopenvino/CMakeLists.txt @@ -8,14 +8,14 @@ if(NOT DEFINED OpenVINO_SOURCE_DIR) endif() # PYTHON_VERSION_MAJOR and PYTHON_VERSION_MINOR are defined inside pybind11 -set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) -message(STATUS "Python version=${PYTHON_VERSION}") +set(pyversion python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) +message(STATUS "Python version=${pyversion}") if(OpenVINO_SOURCE_DIR) if(WIN32) - set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$/python_api/${PYTHON_VERSION}/openvino) + set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$/python_api/${pyversion}/openvino) else() - set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/python_api/${PYTHON_VERSION}/openvino) + set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/python_api/${pyversion}/openvino) endif() set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PYTHON_BRIDGE_OUTPUT_DIRECTORY}) @@ -92,20 +92,20 @@ if(OpenVINO_SOURCE_DIR OR InferenceEngineDeveloperPackage_FOUND) ie_python_minimal_api(${PROJECT_NAME}) add_clang_format_target(${PROJECT_NAME}_clang FOR_TARGETS ${PROJECT_NAME}) - ie_cpack_add_component(${OV_CPACK_COMP_PYTHON_OPENVINO}_${PYTHON_VERSION} + ie_cpack_add_component(${OV_CPACK_COMP_PYTHON_OPENVINO}_${pyversion} HIDDEN) install(DIRECTORY ${PYTHON_SOURCE_DIR}/openvino - DESTINATION ${OV_CPACK_PYTHONDIR}/${PYTHON_VERSION} - COMPONENT ${OV_CPACK_COMP_PYTHON_OPENVINO}_${PYTHON_VERSION} + DESTINATION ${OV_CPACK_PYTHONDIR}/${pyversion} + COMPONENT ${OV_CPACK_COMP_PYTHON_OPENVINO}_${pyversion} USE_SOURCE_PERMISSIONS PATTERN "test_utils" EXCLUDE) install(TARGETS ${PROJECT_NAME} - DESTINATION ${OV_CPACK_PYTHONDIR}/${PYTHON_VERSION}/openvino - COMPONENT ${OV_CPACK_COMP_PYTHON_OPENVINO}_${PYTHON_VERSION}) + DESTINATION ${OV_CPACK_PYTHONDIR}/${pyversion}/openvino + COMPONENT ${OV_CPACK_COMP_PYTHON_OPENVINO}_${pyversion}) - install(DIRECTORY ${PYTHON_BINDINGS_ROOT_DIR}/tests + install(DIRECTORY ${OpenVINOPython_SOURCE_DIR}/tests DESTINATION tests/${PROJECT_NAME} COMPONENT tests EXCLUDE_FROM_ALL) endif() diff --git a/src/bindings/python/src/pyopenvino/frontend/frontend_module.cmake b/src/bindings/python/src/pyopenvino/frontend/frontend_module.cmake index da3aa7642e1..aacef2d7c3b 100644 --- a/src/bindings/python/src/pyopenvino/frontend/frontend_module.cmake +++ b/src/bindings/python/src/pyopenvino/frontend/frontend_module.cmake @@ -39,6 +39,6 @@ function(frontend_module TARGET FRAMEWORK INSTALL_COMPONENT) ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/__init__.py) install(TARGETS ${TARGET_NAME} - DESTINATION ${OV_CPACK_PYTHONDIR}/${PYTHON_VERSION}/openvino/frontend/${FRAMEWORK} + DESTINATION ${OV_CPACK_PYTHONDIR}/${pyversion}/openvino/frontend/${FRAMEWORK} COMPONENT ${INSTALL_COMPONENT}) endfunction() diff --git a/src/bindings/python/src/pyopenvino/frontend/onnx/CMakeLists.txt b/src/bindings/python/src/pyopenvino/frontend/onnx/CMakeLists.txt index 730b47eeae8..4e5e25c4dae 100644 --- a/src/bindings/python/src/pyopenvino/frontend/onnx/CMakeLists.txt +++ b/src/bindings/python/src/pyopenvino/frontend/onnx/CMakeLists.txt @@ -3,4 +3,4 @@ # include(${pyopenvino_SOURCE_DIR}/frontend/frontend_module.cmake) -frontend_module(py_onnx_frontend onnx ${OV_CPACK_COMP_PYTHON_OPENVINO}_${PYTHON_VERSION}) +frontend_module(py_onnx_frontend onnx ${OV_CPACK_COMP_PYTHON_OPENVINO}_${pyversion}) diff --git a/src/bindings/python/src/pyopenvino/frontend/paddle/CMakeLists.txt b/src/bindings/python/src/pyopenvino/frontend/paddle/CMakeLists.txt index 6bb617e04d8..7394004f6b6 100644 --- a/src/bindings/python/src/pyopenvino/frontend/paddle/CMakeLists.txt +++ b/src/bindings/python/src/pyopenvino/frontend/paddle/CMakeLists.txt @@ -3,4 +3,4 @@ # include(${pyopenvino_SOURCE_DIR}/frontend/frontend_module.cmake) -frontend_module(py_paddle_frontend paddle ${OV_CPACK_COMP_PYTHON_OPENVINO}_${PYTHON_VERSION}) +frontend_module(py_paddle_frontend paddle ${OV_CPACK_COMP_PYTHON_OPENVINO}_${pyversion}) diff --git a/src/bindings/python/src/pyopenvino/test_utils/CMakeLists.txt b/src/bindings/python/src/pyopenvino/test_utils/CMakeLists.txt index 24e5353d563..662795b0226 100644 --- a/src/bindings/python/src/pyopenvino/test_utils/CMakeLists.txt +++ b/src/bindings/python/src/pyopenvino/test_utils/CMakeLists.txt @@ -49,12 +49,12 @@ add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME} # install install(TARGETS ${TARGET_NAME} - RUNTIME DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino/test_utils + RUNTIME DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${pyversion}/openvino/test_utils COMPONENT tests EXCLUDE_FROM_ALL - LIBRARY DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino/test_utils + LIBRARY DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${pyversion}/openvino/test_utils COMPONENT tests EXCLUDE_FROM_ALL) install(PROGRAMS ${PYTHON_SOURCE_DIR}/openvino/test_utils/__init__.py - DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino/test_utils + DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${pyversion}/openvino/test_utils COMPONENT tests EXCLUDE_FROM_ALL) diff --git a/src/bindings/python/tests/mock/pyngraph_fe_mock_api/CMakeLists.txt b/src/bindings/python/tests/mock/pyngraph_fe_mock_api/CMakeLists.txt index 468631564e2..95f492c489c 100644 --- a/src/bindings/python/tests/mock/pyngraph_fe_mock_api/CMakeLists.txt +++ b/src/bindings/python/tests/mock/pyngraph_fe_mock_api/CMakeLists.txt @@ -34,5 +34,5 @@ target_link_libraries(${PYBIND_FE_NAME} PRIVATE ${DEPENDENCIES}) add_clang_format_target(${PYBIND_FE_NAME}_clang FOR_TARGETS ${PYBIND_FE_NAME}) install(TARGETS ${PYBIND_FE_NAME} - DESTINATION ${OV_CPACK_PYTHONDIR}/${PYTHON_VERSION} + DESTINATION ${OV_CPACK_PYTHONDIR}/${pyversion} COMPONENT tests EXCLUDE_FROM_ALL) diff --git a/src/bindings/python/wheel/CMakeLists.txt b/src/bindings/python/wheel/CMakeLists.txt index fb306b16b22..da4b38d635c 100644 --- a/src/bindings/python/wheel/CMakeLists.txt +++ b/src/bindings/python/wheel/CMakeLists.txt @@ -6,11 +6,11 @@ # Common vars used by setup.py # -set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) +set(pyversion python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) set(WHEEL_VERSION "${OpenVINO_VERSION}" CACHE STRING "Version of this release" FORCE) set(WHEEL_BUILD "${OpenVINO_VERSION_BUILD}" CACHE STRING "Build number of this release" FORCE) set(PYTHON_BRIDGE_CPACK_PATH "${OV_CPACK_PYTHONDIR}") -set(PY_PACKAGES_DIR ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}) +set(PY_PACKAGES_DIR ${PYTHON_BRIDGE_CPACK_PATH}/${pyversion}) set(TBB_LIBS_DIR runtime/3rdparty/tbb/lib) if(WIN32) set(TBB_LIBS_DIR runtime/3rdparty/tbb/bin) diff --git a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt index 323f0cda955..a7381c88d65 100644 --- a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt +++ b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt @@ -4,7 +4,7 @@ set(TARGET_NAME "openvino_intel_gpu_kernels") -find_package(PythonInterp 3 QUIET) +find_host_package(PythonInterp 3 QUIET) if(NOT PYTHONINTERP_FOUND) message(WARNING "[clDNN] Project requires Python 3.x interpreter to build (with python loader). CMake could not detect it correctly. If you have installed this interpreter, please disregard this warning or specify PYTHON_EXECUTABLE in CMake command-line." diff --git a/tools/mo/unit_tests/mock_mo_frontend/mock_mo_frontend/CMakeLists.txt b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_frontend/CMakeLists.txt index 875c4471f9d..c71b75f695f 100644 --- a/tools/mo/unit_tests/mock_mo_frontend/mock_mo_frontend/CMakeLists.txt +++ b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_frontend/CMakeLists.txt @@ -24,8 +24,8 @@ if(BUILD_SHARED_LIBS) RUNTIME DESTINATION ${OV_CPACK_RUNTIMEDIR} COMPONENT tests EXCLUDE_FROM_ALL LIBRARY DESTINATION ${OV_CPACK_LIBRARYDIR} COMPONENT tests EXCLUDE_FROM_ALL) else() - set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) + set(pyversion python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) install(TARGETS ${TARGET_FE_NAME} - RUNTIME DESTINATION ${OV_CPACK_PYTHONDIR}/${PYTHON_VERSION}/openvino COMPONENT tests EXCLUDE_FROM_ALL - LIBRARY DESTINATION ${OV_CPACK_PYTHONDIR}/${PYTHON_VERSION}/openvino COMPONENT tests EXCLUDE_FROM_ALL) + RUNTIME DESTINATION ${OV_CPACK_PYTHONDIR}/${pyversion}/openvino COMPONENT tests EXCLUDE_FROM_ALL + LIBRARY DESTINATION ${OV_CPACK_PYTHONDIR}/${pyversion}/openvino COMPONENT tests EXCLUDE_FROM_ALL) endif() diff --git a/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/CMakeLists.txt b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/CMakeLists.txt index 5a2562193ec..2013d78ab70 100644 --- a/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/CMakeLists.txt +++ b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/CMakeLists.txt @@ -7,13 +7,13 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_OLD ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}) set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_OLD ${CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY}) set(CMAKE_PDB_OUTPUT_DIRECTORY_OLD ${CMAKE_PDB_OUTPUT_DIRECTORY}) -set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) -message(STATUS "Python version=${PYTHON_VERSION}") +set(pyversion python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) +message(STATUS "Python version=${pyversion}") if(WIN32) - set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$/python_api/${PYTHON_VERSION}/) + set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$/python_api/${pyversion}/) else() - set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/python_api/${PYTHON_VERSION}/) + set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/python_api/${pyversion}/) endif() set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PYTHON_BRIDGE_OUTPUT_DIRECTORY}) @@ -47,5 +47,5 @@ set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_OLD} set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_PDB_OUTPUT_DIRECTORY_OLD}) install(TARGETS ${PYBIND_FE_NAME} - DESTINATION ${OV_CPACK_PYTHONDIR}/${PYTHON_VERSION} + DESTINATION ${OV_CPACK_PYTHONDIR}/${pyversion} COMPONENT tests EXCLUDE_FROM_ALL)