Updated pybind11 to 2.12.0

openvinotoolkit · Apr 20, 2024 · 7cb0272 · 7cb0272
1 parent a6d64cf
commit 7cb0272
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/linux_riscv.yml b/.github/workflows/linux_riscv.yml
@@ -110,6 +110,7 @@ jobs:
             git submodule update --init -- ${OPENVINO_REPO}/thirdparty/telemetry
             git submodule update --init -- ${OPENVINO_REPO}/src/plugins/intel_cpu
             git submodule update --init -- ${OPENVINO_REPO}/thirdparty/open_model_zoo
+            git submodule update --init -- ${OPENVINO_REPO}/src/bindings/python/thirdparty/pybind11
           popd
 
       #
@@ -193,7 +194,6 @@ jobs:
             -DENABLE_PYTHON=ON \
             -DENABLE_WHEEL=ON \
             -DPYTHON_MODULE_EXTENSION=$(riscv64-linux-gnu-python3-config --extension-suffix) \
-            -DPYBIND11_PYTHON_EXECUTABLE_LAST=${OPENVINO_BUILD_DIR}/env/bin/python3.10 \
             -DENABLE_TESTS=ON \
             -DENABLE_PYTHON_PACKAGING=ON \
             -DENABLE_SYSTEM_PROTOBUF=ON \

diff --git a/cmake/developer_package/OpenVINODeveloperScriptsConfig.cmake b/cmake/developer_package/OpenVINODeveloperScriptsConfig.cmake
@@ -222,6 +222,8 @@ set(CMAKE_POLICY_DEFAULT_CMP0111 NEW)
 set(CMAKE_POLICY_DEFAULT_CMP0127 NEW)
 # CMake 3.24+ :prefers to set the timestamps of all extracted contents to the time of the extraction
 set(CMAKE_POLICY_DEFAULT_CMP0135 NEW)
+# CMake 3.27+ :The FindPythonInterp and FindPythonLibs modules are removed.
+set(CMAKE_POLICY_DEFAULT_CMP0148 NEW)
 
 set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "Don't warn about obsolete cmake versions in 3rdparty")
 set(CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION ON CACHE BOOL "Warn about absolute paths in destination")

diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt
@@ -201,6 +201,9 @@ if(Python3_VERSION_MINOR GREATER_EQUAL 11)
 else()
     set(pybind11_min_version 2.8.0)
 endif()
+if(CMAKE_CROSSCOMPILING)
+    set(pybind11_min_version 2.12.0)
+endif()
 
 find_package(Python3 REQUIRED COMPONENTS Interpreter ${python3_development_component})
 find_package(pybind11 ${pybind11_min_version} QUIET)

diff --git a/src/bindings/python/thirdparty/pybind11 b/src/bindings/python/thirdparty/pybind11
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
@@ -30,6 +30,9 @@ if(Python3_VERSION_MINOR GREATER_EQUAL 11)
 else()
     set(pybind11_min_version 2.8.0)
 endif()
+if(CMAKE_CROSSCOMPILING)
+    set(pybind11_min_version 2.12.0)
+endif()
 
 find_package(pybind11 ${pybind11_min_version} QUIET)