Merge branch 'main' into str-enums

Author: mdboom

cuda_core/cuda/core/graph/_subclasses.pyx

@@ -574,7 +574,7 @@ cdef class HostCallbackNode(GraphNode):
 
     Properties
     ----------
-    callback_fn : callable or None
+    callback : callable or None
         The Python callable (None for ctypes function pointer callbacks).
     """
 
@@ -614,7 +614,7 @@ cdef class HostCallbackNode(GraphNode):
                 f" cfunc=0x{<uintptr_t>self._fn:x}>")
 
     @property
-    def callback_fn(self):
+    def callback(self):
         """The Python callable, or None for ctypes function pointer callbacks."""
         return self._callable
 

cuda_core/docs/source/release/1.0.0-notes.rst

@@ -90,6 +90,10 @@ Breaking changes
   - New: ``kernel.attributes.num_regs`` and
     ``kernel.attributes[some_dev].num_regs``
 
+- Renamed :attr:`graph.HostCallbackNode.callback_fn` to
+  :attr:`graph.HostCallbackNode.callback` to drop the redundant ``_fn`` suffix
+  (`#1945 <https://github.com/NVIDIA/cuda-python/issues/1945>`__).
+
 - Unified the conditional graph API on :class:`~graph.GraphCondition`
   and consistent verbs
   (`#1945 <https://github.com/NVIDIA/cuda-python/issues/1945>`__):

cuda_core/tests/graph/test_graph_definition.py

@@ -387,7 +387,7 @@ def my_callback():
 
     node = g.callback(my_callback)
     return node, {
-        "callback_fn": lambda v: v is my_callback,
+        "callback": lambda v: v is my_callback,
     }