fix stubgen failure pybind11

Author: makslevental

.ci/all_requirements.txt

@@ -193,8 +193,10 @@ ml-dtypes==0.5.1 ; python_version < "3.13" \
     --hash=sha256:c9945669d3dadf8acb40ec2e57d38c985d8c285ea73af57fc5b09872c516106d \
     --hash=sha256:d13755f8e8445b3870114e5b6240facaa7cb0c3361e54beba3e07fa912a6e12b \
     --hash=sha256:fd918d4e6a4e0c110e2e05be7a7814d10dc1b95872accbf6512b80a109b71ae1
-    # via -r ./mlir/python/requirements.txt
-nanobind @ git+https://github.com/wjakob/nanobind
+    # via -r mlir/python/requirements.txt
+nanobind==2.7.0 \
+    --hash=sha256:73b12d0e751d140d6c1bf4b215e18818a8debfdb374f08dc3776ad208d808e74 \
+    --hash=sha256:f9f1b160580c50dcf37b6495a0fd5ec61dc0d95dae5f8004f87dd9ad7eb46b34
     # via -r mlir/python/requirements.txt
 numpy==2.0.2 \
     --hash=sha256:0123ffdaa88fa4ab64835dcbde75dcdf89c453c922f18dced6e27c90d1d0ec5a \

.ci/monolithic-linux.sh

@@ -34,7 +34,6 @@ lit_args="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml --use-unique-outpu
 start-group "CMake"
 export PIP_BREAK_SYSTEM_PACKAGES=1
 pip install -q -r "${MONOREPO_ROOT}"/.ci/all_requirements.txt
-pip install "nanobind @ git+https://github.com/wjakob/nanobind"
 
 # Set the system llvm-symbolizer as preferred.
 export LLVM_SYMBOLIZER_PATH=`which llvm-symbolizer`

.ci/monolithic-windows.sh

@@ -20,7 +20,6 @@ targets="${2}"
 
 start-group "CMake"
 pip install -q -r "${MONOREPO_ROOT}"/.ci/all_requirements.txt
-pip install "nanobind @ git+https://github.com/wjakob/nanobind"
 pip install typing_extensions
 
 export CC=cl

mlir/cmake/modules/AddMLIRPython.cmake

@@ -151,7 +151,7 @@ endfunction()
 function(declare_mlir_python_extension name)
   cmake_parse_arguments(ARG
     ""
-    "ROOT_DIR;MODULE_NAME;ADD_TO_PARENT;PYTHON_BINDINGS_LIBRARY"
+    "ROOT_DIR;MODULE_NAME;ADD_TO_PARENT;PYTHON_BINDINGS_LIBRARY;GENERATE_TYPE_STUBS"
     "SOURCES;PRIVATE_LINK_LIBS;EMBED_CAPI_LINK_LIBS"
     ${ARGN})
 
@@ -163,17 +163,24 @@ function(declare_mlir_python_extension name)
   if(NOT ARG_PYTHON_BINDINGS_LIBRARY)
     set(ARG_PYTHON_BINDINGS_LIBRARY "pybind11")
   endif()
+  if(ARG_PYTHON_BINDINGS_LIBRARY STREQUAL "pybind11")
+    set(ARG_GENERATE_TYPE_STUBS OFF)
+  endif()
+  if(NOT DEFINED ARG_GENERATE_TYPE_STUBS)
+    set(ARG_GENERATE_TYPE_STUBS ON)
+  endif()
 
   add_library(${name} INTERFACE)
   set_target_properties(${name} PROPERTIES
     # Yes: Leading-lowercase property names are load bearing and the recommended
     # way to do this: https://gitlab.kitware.com/cmake/cmake/-/issues/19261
-    EXPORT_PROPERTIES "mlir_python_SOURCES_TYPE;mlir_python_EXTENSION_MODULE_NAME;mlir_python_EMBED_CAPI_LINK_LIBS;mlir_python_DEPENDS;mlir_python_BINDINGS_LIBRARY"
+    EXPORT_PROPERTIES "mlir_python_SOURCES_TYPE;mlir_python_EXTENSION_MODULE_NAME;mlir_python_EMBED_CAPI_LINK_LIBS;mlir_python_DEPENDS;mlir_python_BINDINGS_LIBRARY;mlir_python_GENERATE_TYPE_STUBS"
     mlir_python_SOURCES_TYPE extension
     mlir_python_EXTENSION_MODULE_NAME "${ARG_MODULE_NAME}"
     mlir_python_EMBED_CAPI_LINK_LIBS "${ARG_EMBED_CAPI_LINK_LIBS}"
     mlir_python_DEPENDS ""
     mlir_python_BINDINGS_LIBRARY "${ARG_PYTHON_BINDINGS_LIBRARY}"
+    mlir_python_GENERATE_TYPE_STUBS "${ARG_GENERATE_TYPE_STUBS}"
   )
 
   # Set the interface source and link_libs properties of the target
@@ -276,19 +283,22 @@ function(add_mlir_python_modules name)
       )
       add_dependencies(${modules_target} ${_extension_target})
       mlir_python_setup_extension_rpath(${_extension_target})
-      generate_type_stubs(
-        ${_module_name}
-        ${_extension_target}
-        "${modules_target}.extension._mlir.dso"
-        "${CMAKE_CURRENT_SOURCE_DIR}/mlir/_mlir_libs/_mlir"
-      )
-      declare_mlir_python_sources(
-        "${MLIR_PYTHON_PACKAGE_PREFIX}.${_module_name}_type_stub_gen"
-        ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/mlir"
-        ADD_TO_PARENT "${sources_target}"
-        SOURCES_GLOB "_mlir_libs/${_module_name}/**/*.pyi"
-      )
-      add_dependencies("${modules_target}" "${NB_STUBGEN_CUSTOM_TARGET}")
+      get_target_property(_generate_type_stubs ${sources_target} mlir_python_GENERATE_TYPE_STUBS)
+      if(_generate_type_stubs)
+        generate_type_stubs(
+          ${_module_name}
+          ${_extension_target}
+          "${modules_target}.extension._mlir.dso"
+          "${CMAKE_CURRENT_SOURCE_DIR}/mlir/_mlir_libs/_mlir"
+        )
+        declare_mlir_python_sources(
+          "${MLIR_PYTHON_PACKAGE_PREFIX}.${_module_name}_type_stub_gen"
+          ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/mlir"
+          ADD_TO_PARENT "${sources_target}"
+          SOURCES_GLOB "_mlir_libs/${_module_name}/**/*.pyi"
+        )
+        add_dependencies("${modules_target}" "${NB_STUBGEN_CUSTOM_TARGET}")
+      endif()
     else()
       message(SEND_ERROR "Unrecognized source type '${_source_type}' for python source target ${sources_target}")
       return()

mlir/python/requirements.txt

@@ -1,6 +1,7 @@
-nanobind @ git+https://github.com/wjakob/nanobind
+nanobind>=2.4, <3.0
 numpy>=1.19.5, <=2.1.2
 pybind11>=2.10.0, <=2.13.6
 PyYAML>=5.4.0, <=6.0.1
 ml_dtypes>=0.1.0, <=0.6.0; python_version<"3.13"   # provides several NumPy dtype extensions, including the bf16
 ml_dtypes>=0.5.0, <=0.6.0; python_version>="3.13"
+typing_extensions