Simplify green context descriptor handling

leofang · leofang · commit da58b7d5e7d7 · 2026-04-25T03:34:57.000Z
diff --git a/cuda_core/cuda/core/_cpp/resource_handles.cpp b/cuda_core/cuda/core/_cpp/resource_handles.cpp
@@ -234,10 +234,6 @@ struct GreenCtxBox {
     CUgreenCtx resource;
 };
 
-struct DevResourceDescBox {
-    CUdevResourceDesc resource;
-};
-
 static const ContextBox* get_box(const ContextHandle& h) noexcept {
     const CUcontext* p = h.get();
     return reinterpret_cast<const ContextBox*>(
@@ -302,13 +298,19 @@ GreenCtxHandle get_context_green_ctx(const ContextHandle& h) noexcept {
     return get_box(h)->h_green_ctx;
 }
 
-GreenCtxHandle create_green_ctx_handle(CUdevResourceDesc desc, CUdevice dev, unsigned int flags) {
-    if (!p_cuGreenCtxCreate || !p_cuGreenCtxDestroy) {
+GreenCtxHandle create_green_ctx_handle(CUdevResource* resources, unsigned int nbResources,
+                                       CUdevice dev, unsigned int flags) {
+    if (!p_cuDevResourceGenerateDesc || !p_cuGreenCtxCreate || !p_cuGreenCtxDestroy) {
         err = CUDA_ERROR_NOT_SUPPORTED;
         return {};
     }
 
     GILReleaseGuard gil;
+    CUdevResourceDesc desc = nullptr;
+    if (CUDA_SUCCESS != (err = p_cuDevResourceGenerateDesc(&desc, resources, nbResources))) {
+        return {};
+    }
+
     CUgreenCtx green_ctx = nullptr;
     if (CUDA_SUCCESS != (err = p_cuGreenCtxCreate(&green_ctx, desc, dev, flags))) {
         return {};
@@ -333,22 +335,6 @@ GreenCtxHandle create_green_ctx_handle_ref(CUgreenCtx green_ctx) {
     return GreenCtxHandle(box, &box->resource);
 }
 
-DevResourceDescHandle create_dev_resource_desc_handle(CUdevResource* resources, unsigned int nbResources) {
-    if (!p_cuDevResourceGenerateDesc) {
-        err = CUDA_ERROR_NOT_SUPPORTED;
-        return {};
-    }
-
-    GILReleaseGuard gil;
-    CUdevResourceDesc desc = nullptr;
-    if (CUDA_SUCCESS != (err = p_cuDevResourceGenerateDesc(&desc, resources, nbResources))) {
-        return {};
-    }
-
-    auto box = std::make_shared<const DevResourceDescBox>(DevResourceDescBox{desc});
-    return DevResourceDescHandle(box, &box->resource);
-}
-
 // Thread-local cache of primary contexts indexed by device ID
 static thread_local std::vector<ContextHandle> primary_context_cache;
 
diff --git a/cuda_core/cuda/core/_cpp/resource_handles.hpp b/cuda_core/cuda/core/_cpp/resource_handles.hpp
@@ -147,7 +147,6 @@ extern NvJitLinkDestroyFn p_nvJitLinkDestroy;
 
 using ContextHandle = std::shared_ptr<const CUcontext>;
 using GreenCtxHandle = std::shared_ptr<const CUgreenCtx>;
-using DevResourceDescHandle = std::shared_ptr<const CUdevResourceDesc>;
 using StreamHandle = std::shared_ptr<const CUstream>;
 using EventHandle = std::shared_ptr<const CUevent>;
 using MemoryPoolHandle = std::shared_ptr<const CUmemoryPool>;
@@ -178,16 +177,13 @@ ContextHandle create_context_handle_from_green_ctx(const GreenCtxHandle& h_green
 // Return the green context dependency associated with a ContextHandle, if any.
 GreenCtxHandle get_context_green_ctx(const ContextHandle& h) noexcept;
 
-// Create an owning green context handle.
-GreenCtxHandle create_green_ctx_handle(CUdevResourceDesc desc, CUdevice dev, unsigned int flags);
+// Create an owning green context handle from a list of device resources.
+GreenCtxHandle create_green_ctx_handle(CUdevResource* resources, unsigned int nbResources,
+                                       CUdevice dev, unsigned int flags);
 
 // Create a non-owning green context handle.
 GreenCtxHandle create_green_ctx_handle_ref(CUgreenCtx ctx);
 
-// Generate a descriptor for a resource list. CUDA exposes no explicit destroy
-// API for CUdevResourceDesc; this handle only carries the opaque value.
-DevResourceDescHandle create_dev_resource_desc_handle(CUdevResource* resources, unsigned int nbResources);
-
 // Get handle to the primary context for a device (with thread-local caching)
 // Returns empty handle on error (caller must check)
 ContextHandle get_primary_context(int device_id);
@@ -532,10 +528,6 @@ inline CUgreenCtx as_cu(const GreenCtxHandle& h) noexcept {
     return h ? *h : nullptr;
 }
 
-inline CUdevResourceDesc as_cu(const DevResourceDescHandle& h) noexcept {
-    return h ? *h : nullptr;
-}
-
 inline CUstream as_cu(const StreamHandle& h) noexcept {
     return h ? *h : nullptr;
 }
@@ -598,10 +590,6 @@ inline std::intptr_t as_intptr(const GreenCtxHandle& h) noexcept {
     return reinterpret_cast<std::intptr_t>(as_cu(h));
 }
 
-inline std::intptr_t as_intptr(const DevResourceDescHandle& h) noexcept {
-    return reinterpret_cast<std::intptr_t>(as_cu(h));
-}
-
 inline std::intptr_t as_intptr(const StreamHandle& h) noexcept {
     return reinterpret_cast<std::intptr_t>(as_cu(h));
 }
@@ -696,10 +684,6 @@ inline PyObject* as_py(const GreenCtxHandle& h) noexcept {
     return detail::make_py("cuda.bindings.driver", "CUgreenCtx", as_intptr(h));
 }
 
-inline PyObject* as_py(const DevResourceDescHandle& h) noexcept {
-    return detail::make_py("cuda.bindings.driver", "CUdevResourceDesc", as_intptr(h));
-}
-
 inline PyObject* as_py(const StreamHandle& h) noexcept {
     return detail::make_py("cuda.bindings.driver", "CUstream", as_intptr(h));
 }
diff --git a/cuda_core/cuda/core/_device.pyx b/cuda_core/cuda/core/_device.pyx
@@ -18,19 +18,15 @@ from cuda.core._device_resources cimport DeviceResources, SMResource, WorkqueueR
 from cuda.core._device_resources import (
     DeviceResources,
     SMResource,
-    SMResourceOptions,
     WorkqueueResource,
-    WorkqueueResourceOptions,
 )
 from cuda.core._event cimport Event as cyEvent
 from cuda.core._event import Event, EventOptions
 from cuda.core._memory._buffer cimport Buffer, MemoryResource
 from cuda.core._resource_handles cimport (
     ContextHandle,
-    DevResourceDescHandle,
     GreenCtxHandle,
     create_context_handle_ref,
-    create_dev_resource_desc_handle,
     create_green_ctx_handle,
     get_primary_context,
     get_last_error,
@@ -1308,7 +1304,6 @@ class Device:
         cdef SMResource sm_res
         cdef WorkqueueResource wq_res
         cdef cydriver.CUdevResource* c_resources = NULL
-        cdef DevResourceDescHandle h_desc
         cdef GreenCtxHandle h_green
 
         if options is None:
@@ -1346,13 +1341,9 @@ class Device:
                 else:
                     raise TypeError(f"Unsupported context resource type: {type(res)}")
 
-            h_desc = create_dev_resource_desc_handle(c_resources, <unsigned int>n_resources)
-            if h_desc.get() == NULL:
-                HANDLE_RETURN(get_last_error())
-                raise RuntimeError("Failed to generate CUDA device resource descriptor")
-
             h_green = create_green_ctx_handle(
-                as_cu(h_desc),
+                c_resources,
+                <unsigned int>n_resources,
                 <cydriver.CUdevice>self._device_id,
                 <unsigned int>cydriver.CUgreenCtxCreate_flags.CU_GREEN_CTX_DEFAULT_STREAM,
             )
diff --git a/cuda_core/cuda/core/_device_resources.pyx b/cuda_core/cuda/core/_device_resources.pyx
@@ -460,22 +460,22 @@ cdef class DeviceResources:
         """Query workqueue resources from this device."""
         _check_green_ctx_support()
         _check_workqueue_support()
-        cdef cydriver.CUdevResource wq_config
-        cdef cydriver.CUdevResource wq
+        cdef cydriver.CUdevResource _wq_config
+        cdef cydriver.CUdevResource _wq
 
         IF CUDA_CORE_BUILD_MAJOR >= 13:
             with nogil:
                 HANDLE_RETURN(cydriver.cuDeviceGetDevResource(
                     <cydriver.CUdevice>self._device_id,
-                    &wq_config,
+                    &_wq_config,
                     cydriver.CUdevResourceType.CU_DEV_RESOURCE_TYPE_WORKQUEUE_CONFIG,
                 ))
                 HANDLE_RETURN(cydriver.cuDeviceGetDevResource(
                     <cydriver.CUdevice>self._device_id,
-                    &wq,
+                    &_wq,
                     cydriver.CUdevResourceType.CU_DEV_RESOURCE_TYPE_WORKQUEUE,
                 ))
-            return WorkqueueResource._from_dev_resources(wq_config, wq)
+            return WorkqueueResource._from_dev_resources(_wq_config, _wq)
         ELSE:
             raise NotImplementedError(
                 "WorkqueueResource requires cuda.core to be built with CUDA 13.x bindings"
diff --git a/cuda_core/cuda/core/_resource_handles.pxd b/cuda_core/cuda/core/_resource_handles.pxd
@@ -21,7 +21,6 @@ cdef extern from "_cpp/resource_handles.hpp" namespace "cuda_core":
     # Handle types
     ctypedef shared_ptr[const cydriver.CUcontext] ContextHandle
     ctypedef shared_ptr[const cydriver.CUgreenCtx] GreenCtxHandle
-    ctypedef shared_ptr[const cydriver.CUdevResourceDesc] DevResourceDescHandle
     ctypedef shared_ptr[const cydriver.CUstream] StreamHandle
     ctypedef shared_ptr[const cydriver.CUevent] EventHandle
     ctypedef shared_ptr[const cydriver.CUmemoryPool] MemoryPoolHandle
@@ -48,7 +47,6 @@ cdef extern from "_cpp/resource_handles.hpp" namespace "cuda_core":
     # as_cu() - extract the raw CUDA handle (inline C++)
     cydriver.CUcontext as_cu(ContextHandle h) noexcept nogil
     cydriver.CUgreenCtx as_cu(GreenCtxHandle h) noexcept nogil
-    cydriver.CUdevResourceDesc as_cu(DevResourceDescHandle h) noexcept nogil
     cydriver.CUstream as_cu(StreamHandle h) noexcept nogil
     cydriver.CUevent as_cu(EventHandle h) noexcept nogil
     cydriver.CUmemoryPool as_cu(MemoryPoolHandle h) noexcept nogil
@@ -66,7 +64,6 @@ cdef extern from "_cpp/resource_handles.hpp" namespace "cuda_core":
     # as_intptr() - extract handle as intptr_t for Python interop (inline C++)
     intptr_t as_intptr(ContextHandle h) noexcept nogil
     intptr_t as_intptr(GreenCtxHandle h) noexcept nogil
-    intptr_t as_intptr(DevResourceDescHandle h) noexcept nogil
     intptr_t as_intptr(StreamHandle h) noexcept nogil
     intptr_t as_intptr(EventHandle h) noexcept nogil
     intptr_t as_intptr(MemoryPoolHandle h) noexcept nogil
@@ -85,7 +82,6 @@ cdef extern from "_cpp/resource_handles.hpp" namespace "cuda_core":
     # as_py() - convert handle to Python wrapper object (inline C++; requires GIL)
     object as_py(ContextHandle h)
     object as_py(GreenCtxHandle h)
-    object as_py(DevResourceDescHandle h)
     object as_py(StreamHandle h)
     object as_py(EventHandle h)
     object as_py(MemoryPoolHandle h)
@@ -118,10 +114,9 @@ cdef ContextHandle create_context_handle_ref(cydriver.CUcontext ctx) except+ nog
 cdef ContextHandle create_context_handle_from_green_ctx(const GreenCtxHandle& h_green_ctx) except+ nogil
 cdef GreenCtxHandle get_context_green_ctx(const ContextHandle& h) noexcept nogil
 cdef GreenCtxHandle create_green_ctx_handle(
-    cydriver.CUdevResourceDesc desc, cydriver.CUdevice dev, unsigned int flags) except+ nogil
+    cydriver.CUdevResource* resources, unsigned int nbResources,
+    cydriver.CUdevice dev, unsigned int flags) except+ nogil
 cdef GreenCtxHandle create_green_ctx_handle_ref(cydriver.CUgreenCtx ctx) except+ nogil
-cdef DevResourceDescHandle create_dev_resource_desc_handle(
-    cydriver.CUdevResource* resources, unsigned int nbResources) except+ nogil
 cdef ContextHandle get_primary_context(int device_id) except+ nogil
 cdef ContextHandle get_current_context() except+ nogil
 
diff --git a/cuda_core/cuda/core/_resource_handles.pyx b/cuda_core/cuda/core/_resource_handles.pyx
@@ -21,7 +21,6 @@ from cuda.bindings cimport cynvjitlink
 from ._resource_handles cimport (
     ContextHandle,
     GreenCtxHandle,
-    DevResourceDescHandle,
     StreamHandle,
     EventHandle,
     MemoryPoolHandle,
@@ -62,11 +61,10 @@ cdef extern from "_cpp/resource_handles.hpp" namespace "cuda_core":
     GreenCtxHandle get_context_green_ctx "cuda_core::get_context_green_ctx" (
         const ContextHandle& h) noexcept nogil
     GreenCtxHandle create_green_ctx_handle "cuda_core::create_green_ctx_handle" (
-        cydriver.CUdevResourceDesc desc, cydriver.CUdevice dev, unsigned int flags) except+ nogil
+        cydriver.CUdevResource* resources, unsigned int nbResources,
+        cydriver.CUdevice dev, unsigned int flags) except+ nogil
     GreenCtxHandle create_green_ctx_handle_ref "cuda_core::create_green_ctx_handle_ref" (
         cydriver.CUgreenCtx ctx) except+ nogil
-    DevResourceDescHandle create_dev_resource_desc_handle "cuda_core::create_dev_resource_desc_handle" (
-        cydriver.CUdevResource* resources, unsigned int nbResources) except+ nogil
     ContextHandle get_primary_context "cuda_core::get_primary_context" (
         int device_id) except+ nogil
     ContextHandle get_current_context "cuda_core::get_current_context" () except+ nogil
