Use FindPython3.cmake (#19847)
* Use FindPython3.cmake
* Fixed compilation on macOS 14 with new core development tools
* Try to use Python3_SOABI instead of PYTHON_MODULE_EXTENSION
* Use Development.Module
* Keep specifying only Python3_EXECUTABLE
* Print PYTHON_MODULE_EXTENSION
* Added check for minimal cmake version for python API
* Returned Python3_INCLUDE_DIR for cross-compilation case
* Try to allow cmake older than 3.18
* Use build python interpreter to check cython dependency
* revert changes in .ci/openvino-onnx/Dockerfile
* removed unused code
* Fixed issue with variables scope
* Experiment: remove include dirs
* Corrected docs
* Use pybind11 function to set extension
* Revert "Experiment: remove include dirs"
This reverts commit 6f7f90211c.
* Refactor ConvolutionBackpropDataLayerTest, ConvolutionLayerTest, DeformableConvolutionLayerTest (#19810)
* Refactor ConvolutionBackpropDataLayerTest
* Refactor ConvolutionLayerTest
* Refactor DeformableConvolutionLayerTest
* Apply comments
* Apply comments
* Fix
* Updated minimum cmake version for Windows
* Simplified check
* Removed useless message status
* Use puiblic option
---------
Co-authored-by: Oleg Pipikin <oleg.pipikin@intel.com>
This commit is contained in:
1 parent
7852b44c5f
commit
8349849e1c
53 files changed
+237
-238
No files matched your search
@@ -6,11 +6,11 @@
|
||||
# Define proper package name
|
||||
#
|
||||
|
||||
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import wheel.vendored.packaging.tags as tags ; print(f'{tags.interpreter_name()}{tags.interpreter_version()}')"
|
||||
execute_process(COMMAND ${Python3_EXECUTABLE} -c "import wheel.vendored.packaging.tags as tags ; print(f'{tags.interpreter_name()}{tags.interpreter_version()}')"
|
||||
OUTPUT_VARIABLE PYTHON_TAG OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import wheel.bdist_wheel ; print(f'{wheel.bdist_wheel.get_abi_tag()}')"
|
||||
execute_process(COMMAND ${Python3_EXECUTABLE} -c "import wheel.bdist_wheel ; print(f'{wheel.bdist_wheel.get_abi_tag()}')"
|
||||
OUTPUT_VARIABLE ABI_TAG OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import wheel.vendored.packaging.tags as tags ; print(f'{next(tags.platform_tags())}')"
|
||||
execute_process(COMMAND ${Python3_EXECUTABLE} -c "import wheel.vendored.packaging.tags as tags ; print(f'{next(tags.platform_tags())}')"
|
||||
OUTPUT_VARIABLE PLATFORM_TAG OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
|
||||
# defines wheel architecture part of `PLATFORM_TAG`
|
||||
@@ -81,7 +81,7 @@ set(openvino_wheel_path "${openvino_wheels_output_dir}/${openvino_wheel_name}")
|
||||
# create target for openvino.wheel
|
||||
#
|
||||
|
||||
execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip --version
|
||||
execute_process(COMMAND ${Python3_EXECUTABLE} -m pip --version
|
||||
OUTPUT_VARIABLE pip_version OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
|
||||
string(REGEX MATCH "pip[ ]+([\\.0-9]*)" pip_version "${pip_version}")
|
||||
@@ -89,7 +89,7 @@ set(pip_version ${CMAKE_MATCH_1})
|
||||
|
||||
if(pip_version VERSION_GREATER_EQUAL 22.0)
|
||||
set(wheel_build_command
|
||||
${PYTHON_EXECUTABLE} -m pip wheel
|
||||
${Python3_EXECUTABLE} -m pip wheel
|
||||
--no-deps
|
||||
--wheel-dir ${openvino_wheels_output_dir}
|
||||
# --verbose
|
||||
@@ -98,7 +98,7 @@ if(pip_version VERSION_GREATER_EQUAL 22.0)
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
else()
|
||||
set(wheel_build_command
|
||||
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/setup.py"
|
||||
${Python3_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/setup.py"
|
||||
--quiet
|
||||
--no-user-cfg
|
||||
bdist_wheel
|
||||
@@ -119,7 +119,7 @@ add_custom_command(OUTPUT ${openvino_wheel_path}
|
||||
set(fdupes_report ${CMAKE_CURRENT_BINARY_DIR}/fdupes_report.txt)
|
||||
add_custom_command(OUTPUT "${fdupes_report}"
|
||||
COMMAND ${CMAKE_COMMAND}
|
||||
-D PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
|
||||
-D Python3_EXECUTABLE=${Python3_EXECUTABLE}
|
||||
-D WORKING_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}
|
||||
-D WHEEL_VERSION=${WHEEL_VERSION}
|
||||
-D PACKAGE_FILE=${openvino_wheel_path}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
foreach(var PYTHON_EXECUTABLE WORKING_DIRECTORY REPORT_FILE WHEEL_VERSION PACKAGE_FILE CMAKE_SHARED_LIBRARY_SUFFIX)
|
||||
foreach(var Python3_EXECUTABLE WORKING_DIRECTORY REPORT_FILE WHEEL_VERSION PACKAGE_FILE CMAKE_SHARED_LIBRARY_SUFFIX)
|
||||
if(NOT DEFINED ${var})
|
||||
message(FATAL_ERROR "Variable ${var} is not defined")
|
||||
endif()
|
||||
@@ -20,7 +20,7 @@ endif()
|
||||
|
||||
get_filename_component(wheel_name "${PACKAGE_FILE}" NAME)
|
||||
|
||||
execute_process(COMMAND ${PYTHON_EXECUTABLE} -m wheel unpack ${PACKAGE_FILE}
|
||||
execute_process(COMMAND ${Python3_EXECUTABLE} -m wheel unpack ${PACKAGE_FILE}
|
||||
WORKING_DIRECTORY ${WORKING_DIRECTORY}
|
||||
OUTPUT_VARIABLE output_message
|
||||
ERROR_VARIABLE error_message
|
||||
|
||||
@@ -253,7 +253,7 @@ class CustomBuild(build):
|
||||
binary_dir = os.path.join(self.build_temp, binary_dir)
|
||||
self.announce(f"Configuring {comp} cmake project", level=3)
|
||||
self.spawn(["cmake", f"-DOpenVINODeveloperPackage_DIR={OPENVINO_BINARY_DIR}",
|
||||
f"-DPYTHON_EXECUTABLE={sys.executable}",
|
||||
f"-DPython3_EXECUTABLE={sys.executable}",
|
||||
f"-DCPACK_GENERATOR={CPACK_GENERATOR}",
|
||||
f"-DCMAKE_BUILD_TYPE={CONFIG}",
|
||||
"-DENABLE_WHEEL=OFF",
|
||||
|
||||
Reference in new issue
Block a user