Merge remote-tracking branch 'upstream/main' into cuda.core.system-events

Author: mdboom

.github/workflows/backport.yml

@@ -9,14 +9,25 @@ on:
     types: [closed, labeled]
     branches:
       - main
+  workflow_dispatch:
+    inputs:
+      backport-branch:
+        description: "Branch to backport commits onto"
+        required: false
+        type: string
+      pull-request:
+        description: "PR to backport"
+        required: true
+        type: number
+
 
 permissions:
   contents: write       # so it can comment
   pull-requests: write  # so it can create pull requests
 
 jobs:
-  backport:
-    name: Backport pull request
+  backport-from-pr:
+    name: Backport directly from a pull request
     if: ${{ github.repository_owner == 'nvidia' &&
             github.event.pull_request.merged == true &&
             contains( github.event.pull_request.labels.*.name, 'to-be-backported')
@@ -38,3 +49,28 @@ jobs:
           copy_labels_pattern: true
           copy_requested_reviewers: true
           target_branches: ${{ env.OLD_BRANCH }}
+  backport-to-branch:
+    name: Backport a specific PR against a specific branch
+    if: github.repository_owner == 'nvidia' && github.event_name == 'workflow_dispatch'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8  # v6.0.1
+
+      - name: Load branch from environment name
+        if: inputs.backport-branch == null
+        run: |
+          BACKPORT_BRANCH=$(yq '.backport_branch' ci/versions.yml)
+          echo "BACKPORT_BRANCH=${BRANCH}" >> $GITHUB_ENV
+
+      - name: Load branch name from input
+        if: inputs.backport-branch != null
+        run: echo "BACKPORT_BRANCH=${{ inputs.backport-branch }}" >> $GITHUB_ENV
+
+      - name: Create backport pull requests
+        uses: korthout/backport-action@c656f5d5851037b2b38fb5db2691a03fa229e3b2  # v4.0.1
+        with:
+          copy_assignees: true
+          copy_labels_pattern: true
+          copy_requested_reviewers: true
+          target_branches: ${{ env.BACKPORT_BRANCH }}
+          source_pr_number: ${{ inputs.pull-request }}

cuda_bindings/pixi.lock

@@ -105,6 +105,7 @@ def get_sources(mod_name):
         sources = [f"cuda/core/{mod_name}.pyx"]
 
         # Add module-specific .cpp file from _cpp/ directory if it exists
+        # Example: _resource_handles.pyx finds _cpp/resource_handles.cpp.
         cpp_file = f"cuda/core/_cpp/{mod_name.lstrip('_')}.cpp"
         if os.path.exists(cpp_file):
             sources.append(cpp_file)

cuda_core/build_hooks.py

@@ -15,15 +15,6 @@
 
 import importlib
 
-# The _resource_handles module exports a PyCapsule dispatch table that other
-# extension modules access via PyCapsule_Import. We import it here to ensure
-# it's loaded before other modules try to use it.
-#
-# We use importlib.import_module with the full path to avoid triggering
-# circular import issues that can occur with relative imports during
-# package initialization.
-_resource_handles = importlib.import_module("cuda.core._resource_handles")
-
 subdir = f"cu{cuda_major}"
 try:
     versioned_mod = importlib.import_module(f".{subdir}", __package__)