Merge branch 'wjakob:master' into master

Author: MaxwellGengYF

cmake/nanobind-config.cmake

@@ -246,15 +246,20 @@ function (nanobind_build_library TARGET_NAME)
   # However, if the directory _does_ exist, then the user is free to choose
   # whether nanobind uses them (based on `NB_USE_SUBMODULE_DEPS`), with a
   # preference to choose them if `NB_USE_SUBMODULE_DEPS` is not defined
-  if (NOT IS_DIRECTORY ${NB_DIR}/ext/robin_map/include OR
-      (DEFINED NB_USE_SUBMODULE_DEPS AND NOT NB_USE_SUBMODULE_DEPS))
+  if(IS_DIRECTORY ${NB_DIR}/ext/robin_map/include 
+      AND (DEFINED NB_USE_SUBMODULE_DEPS AND NB_USE_SUBMODULE_DEPS)
+      AND NOT TARGET tsl::robin_map
+    )
+    add_library(tsl::robin_map INTERFACE IMPORTED)
+    set_target_properties(tsl::robin_map PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES ${NB_DIR}/ext/robin_map/include)
+  endif()
+
+  if(NOT TARGET tsl::robin_map)
     include(CMakeFindDependencyMacro)
-    find_dependency(tsl-robin-map)
-    target_link_libraries(${TARGET_NAME} PRIVATE tsl::robin_map)
-  else()
-    target_include_directories(${TARGET_NAME} PRIVATE
-      ${NB_DIR}/ext/robin_map/include)
+    find_dependency(tsl-robin-map CONFIG REQUIRED)
   endif()
+  target_link_libraries(${TARGET_NAME} PRIVATE tsl::robin_map)
 
   target_include_directories(${TARGET_NAME} ${AS_SYSINCLUDE} PUBLIC
     ${Python_INCLUDE_DIRS}
@@ -352,7 +357,7 @@ function(nanobind_add_module name)
     set(ARG_STABLE_ABI FALSE)
   endif()
 
-  if (NB_ABI MATCHES "t")
+  if (NB_ABI MATCHES "[0-9]t")
     # Free-threaded Python interpreters don't support building a nanobind
     # module that uses the stable ABI.
     set(ARG_STABLE_ABI FALSE)

docs/typing.rst

@@ -714,6 +714,6 @@ you may use the special ``\from`` escape code to import them:
        def lookup(array: Array[T], index: Literal[0] = 0) -> _Opt[T]:
            \doc
 
-You may also add free-form text the beginning or the end of the generated stub.
-To do so, add an entry that matches on ``module_name.__prefix__`` or
-``module_name.__suffix__``.
+You may also add free-form text the beginning or the end of the generated stub
+module or of a class. To do so, add an entry that matches on ``name.__prefix__``
+or ``name.__suffix__`` where ``name`` is the name of the module or class.

include/nanobind/nanobind.h

@@ -29,6 +29,7 @@
 // Core C++ headers that nanobind depends on
 #include <cstddef>
 #include <cstdint>
+#include <cstdlib>
 #include <exception>
 #include <stdexcept>
 #include <type_traits>

include/nanobind/trampoline.h

@@ -26,7 +26,7 @@ NB_CORE void trampoline_leave(ticket *ticket) noexcept;
 template <size_t Size> struct trampoline {
     mutable void *data[2 * Size + 1];
 
-    NB_INLINE trampoline(void *ptr) { trampoline_new(data, Size, ptr); }
+    NB_INLINE constexpr trampoline(void *ptr) { trampoline_new(data, Size, ptr); }
     NB_INLINE ~trampoline() { trampoline_release(data, Size); }
 
     NB_INLINE handle base() const { return (PyObject *) data[0]; }

src/common.cpp

@@ -451,13 +451,23 @@ void setattr(PyObject *obj, PyObject *key, PyObject *value) {
 }
 
 void delattr(PyObject *obj, const char *key) {
+#if defined(Py_LIMITED_API) && PY_LIMITED_API < 0x030D0000
+    int rv = PyObject_SetAttrString(obj, key, nullptr);
+#else
     int rv = PyObject_DelAttrString(obj, key);
+#endif
+
     if (rv)
         raise_python_error();
 }
 
 void delattr(PyObject *obj, PyObject *key) {
+#if defined(Py_LIMITED_API) && PY_LIMITED_API < 0x030D0000
+    int rv = PyObject_SetAttr(obj, key, nullptr);
+#else
     int rv = PyObject_DelAttr(obj, key);
+#endif
+
     if (rv)
         raise_python_error();
 }

src/nb_ndarray.cpp

@@ -704,6 +704,9 @@ ndarray_handle *ndarray_import(PyObject *src, const ndarray_config *c,
                 case (uint8_t) dlpack::dtype_code::Float:
                     prefix = "float";
                     break;
+                case (uint8_t) dlpack::dtype_code::Bfloat:
+                    prefix = "bfloat";
+                    break;
                 case (uint8_t) dlpack::dtype_code::Complex:
                     prefix = "complex";
                     break;

src/stubgen.py

@@ -567,8 +567,10 @@ def put_type(self, tp: NbType, name: Optional[str]):
                 self.put_docstr(docstr)
                 if len(tp_dict):
                     self.write("\n")
+            self.apply_pattern(self.prefix + ".__prefix__", None)
             for k, v in tp_dict.items():
                 self.put(v, k, tp)
+            self.apply_pattern(self.prefix + ".__suffix__", None)
             if output_len == len(self.output):
                 self.write_ln("pass\n")
             self.depth -= 1

tests/pattern_file.nb

@@ -17,3 +17,9 @@ test_typing_ext.__prefix__:
 
 test_typing_ext.__suffix__:
     # a suffix
+
+test_typing_ext.Foo.__prefix__:
+    # a class prefix
+
+test_typing_ext.Foo.__suffix__:
+    # a class suffix

tests/test_classes.cpp

@@ -747,4 +747,34 @@ NB_MODULE(test_classes_ext, m) {
         .def_prop_ro_static("x", [](nb::handle /*unused*/) { return 42; });
     nb::class_<StaticPropertyOverride2, StaticPropertyOverride>(m, "StaticPropertyOverride2")
         .def_prop_ro_static("x", [](nb::handle /*unused*/) { return 43; });
+
+
+    // nanobind::detail::trampoline's constructor must be constexpr otherwise
+    // the trampoline will not compile under MSVC
+    struct ConstexprClass {
+        constexpr ConstexprClass(int i) : something(i) {}
+        virtual ~ConstexprClass() = default;
+
+        virtual int getInt() const {
+            return 1;
+        };
+
+        int something;
+    };
+
+    struct PyConstexprClass : ConstexprClass {
+        NB_TRAMPOLINE(ConstexprClass, 1);
+
+        int getInt() const override {
+            NB_OVERRIDE(getInt);
+        }
+    };
+
+    auto constexpr_class = nb::class_<ConstexprClass, PyConstexprClass>(m, "ConstexprClass")
+        .def(nb::init<int>())
+        .def("getInt", &ConstexprClass::getInt);
+
+    m.def("constexpr_call_getInt", [](ConstexprClass *c) {
+        return c->getInt();
+    });
 }

tests/test_classes.py

@@ -981,3 +981,11 @@ class SubSubClass(SubClass):
     # Clean up
     del x
     gc.collect()
+
+def test51_constexpr_trampoline():
+    class PyConstexprClass(t.ConstexprClass):
+        def getInt(self):
+            return 42
+
+    c = PyConstexprClass(4)
+    assert t.constexpr_call_getInt(c) == 42