Merge branch 'main' into skip-jit-example-old-driver

Author: leofang

.github/workflows/restricted-paths-guard.yml

@@ -33,6 +33,18 @@ jobs:
 
           # Workflow policy inputs
           REVIEW_LABEL: Needs-Restricted-Paths-Review
+          # Temporary testing recipe for agents:
+          # 1. Change pull_request_target to pull_request.
+          # 2. Set DRY_RUN_REVIEW_LABEL_WRITES to true.
+          # 3. Add a dummy comment or whitespace-only change in
+          #    cuda_bindings/README.md to trigger restricted-path detection
+          #    without affecting build/package behavior.
+          # 4. Replace both trusted case patterns below with DRY_RUN_NEVER_MATCH
+          #    so the test does not depend on the tester's GitHub identity:
+          #    MEMBER|OWNER and admin|maintain|write|triage.
+          # 5. Commit these changes as a temporary dry-run test commit and revert
+          #    that commit before merge.
+          DRY_RUN_REVIEW_LABEL_WRITES: false
 
           # API request context/auth
           GH_TOKEN: ${{ github.token }}
@@ -125,11 +137,25 @@ jobs:
             echo '```'
           }
 
+          build_review_label_comment() {
+            printf '%s\n\n%s\n\n%s\n\n%s\n\n%s\n' \
+              "\`$REVIEW_LABEL\` was assigned by \`CI: Restricted Paths Guard\`." \
+              "For details, open [this workflow run]($RUN_URL) and click **Summary**." \
+              "For external contributors: thank you for your interest in improving CUDA Python. The \`cuda_bindings/\` package is distributed under the [NVIDIA Software License](https://github.com/NVIDIA/cuda-python/blob/main/cuda_bindings/LICENSE), which does not allow us to accept external contributions to files under \`cuda_bindings/\` in this repository." \
+              "Please close this PR. If your changes also include updates outside \`cuda_bindings/\`, please open a new PR containing only those changes so we can review them separately under the applicable license." \
+              "If you are an NVIDIA employee and believe this label was applied in error, no action is needed; a maintainer will review and remove the label if appropriate."
+          }
+
+          write_review_label_comment_dry_run() {
+            echo "- **Dry-run comment body**:"
+            echo '```markdown'
+            build_review_label_comment
+            echo '```'
+          }
+
           post_review_label_comment() {
             local comment_body
-            printf -v comment_body '%s\n\n%s\n' \
-              "\`$REVIEW_LABEL\` was assigned by \`CI: Restricted Paths Guard\`." \
-              "For details, open [this workflow run]($RUN_URL) and click **Summary**."
+            comment_body=$(build_review_label_comment)
 
             if gh api "repos/$REPO/issues/$PR_NUMBER/comments" \
               -f body="$comment_body" >/dev/null; then
@@ -242,6 +268,16 @@ jobs:
           if [ "$NEEDS_REVIEW_LABEL" = "true" ]; then
             if [ "$LABEL_ALREADY_PRESENT" = "true" ]; then
               LABEL_ACTION="already present"
+            elif [ "$DRY_RUN_REVIEW_LABEL_WRITES" = "true" ]; then
+              LABEL_ACTION="would add (dry run)"
+              COMMENT_ACTION="would post (dry run)"
+              {
+                echo "## Restricted Paths Guard Dry Run"
+                echo ""
+                echo "- **Would add label**: \`$REVIEW_LABEL\`"
+                echo ""
+                write_review_label_comment_dry_run
+              } >> "$GITHUB_STEP_SUMMARY"
             elif ! gh pr edit "$PR_NUMBER" --repo "$REPO" --add-label "$REVIEW_LABEL"; then
               echo "::error::Failed to add the $REVIEW_LABEL label."
               {

cuda_bindings/build_hooks.py

@@ -109,13 +109,32 @@ def __init__(self, name, members):
         self._name = name
         self._member_names = []
         self._member_types = []
+        self._member_declarators = []
         for var_name, var_type, _ in members:
-            var_type = var_type[0]
-            var_type = var_type.removeprefix("struct ")
-            var_type = var_type.removeprefix("union ")
+            base_type = var_type[0]
+            base_type = base_type.removeprefix("struct ")
+            base_type = base_type.removeprefix("union ")
 
             self._member_names += [var_name]
-            self._member_types += [var_type]
+            self._member_types += [base_type]
+            self._member_declarators += [tuple(var_type[1:])]
+
+    def member_type(self, member_name):
+        try:
+            return self._member_types[self._member_names.index(member_name)]
+        except ValueError:
+            return None
+
+    def member_array_length(self, member_name):
+        try:
+            declarators = self._member_declarators[self._member_names.index(member_name)]
+        except ValueError:
+            return None
+
+        for declarator in declarators:
+            if isinstance(declarator, list) and len(declarator) == 1:
+                return declarator[0]
+        return None
 
     def discoverMembers(self, memberDict, prefix, seen=None):
         if seen is None:
@@ -192,6 +211,7 @@ def _parse_headers(header_dict, include_path_list, parser_caching):
         # Since we only support 64 bit architectures, we can inline the sizeof(T*) to 8 and then compute the
         # result in Python. The arithmetic expression is preserved to help with clarity and understanding
         r"char reserved\[52 - sizeof\(CUcheckpointGpuPair \*\)\];": rf"char reserved[{52 - 8}];",
+        r"char reserved\[64 - sizeof\(CUcheckpointGpuPair \*\) - sizeof\(unsigned int\)\];": rf"char reserved[{64 - 8 - 4}];",
     }
 
     print(f'Parsing headers in "{include_path_list}" (Caching = {parser_caching})', flush=True)
@@ -341,6 +361,13 @@ def _build_cuda_bindings(debug=False):
     found_types, found_functions, found_values, found_struct, struct_list = _parse_headers(
         header_dict, include_path_list, parser_caching
     )
+    struct_field_types = {}
+    struct_field_array_lengths = {}
+    for struct_name, struct in struct_list.items():
+        for member_name in struct._member_names:
+            key = f"{struct_name}.{member_name}"
+            struct_field_types[key] = struct.member_type(member_name)
+            struct_field_array_lengths[key] = struct.member_array_length(member_name)
 
     # Generate code from .in templates
     path_list = [
@@ -363,6 +390,8 @@ def _build_cuda_bindings(debug=False):
         "found_values": found_values,
         "found_struct": found_struct,
         "struct_list": struct_list,
+        "struct_field_types": struct_field_types,
+        "struct_field_array_lengths": struct_field_array_lengths,
         "os": os,
         "sys": sys,
         "platform": platform,

cuda_bindings/cuda/bindings/_bindings/cydriver.pxd.in

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2021-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
-# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1719+g565f73f4e. Do not modify it directly.
+# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1711+g875fec45. Do not modify it directly.
 from cuda.bindings.cydriver cimport *
 
 {{if 'cuGetErrorString' in found_functions}}

cuda_bindings/cuda/bindings/_bindings/cydriver.pyx.in

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2021-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
-# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1719+g565f73f4e. Do not modify it directly.
+# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1711+g875fec45. Do not modify it directly.
 {{if 'Windows' == platform.system()}}
 import os
 cimport cuda.bindings._lib.windll as windll

cuda_bindings/cuda/bindings/cydriver.pxd.in

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2021-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
-# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1719+g565f73f4e. Do not modify it directly.
+# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1711+g875fec45. Do not modify it directly.
 
 from libc.stdint cimport uint32_t, uint64_t
 
@@ -2458,9 +2458,21 @@ cdef extern from "cuda.h":
     ctypedef CUcheckpointGpuPair_st CUcheckpointGpuPair
 
     cdef struct CUcheckpointRestoreArgs_st:
+        {{if 'CUcheckpointRestoreArgs_st.gpuPairs' in found_struct}}
         CUcheckpointGpuPair* gpuPairs
+        {{endif}}
+        {{if 'CUcheckpointRestoreArgs_st.gpuPairsCount' in found_struct}}
         unsigned int gpuPairsCount
-        char reserved[52]
+        {{endif}}
+        {{if struct_field_types.get('CUcheckpointRestoreArgs_st.reserved') == 'char'}}
+        char reserved[{{struct_field_array_lengths['CUcheckpointRestoreArgs_st.reserved']}}]
+        {{endif}}
+        {{if struct_field_types.get('CUcheckpointRestoreArgs_st.reserved') == 'cuuint64_t'}}
+        cuuint64_t reserved[{{struct_field_array_lengths['CUcheckpointRestoreArgs_st.reserved']}}]
+        {{endif}}
+        {{if 'CUcheckpointRestoreArgs_st.reserved1' in found_struct}}
+        cuuint64_t reserved1
+        {{endif}}
 
     ctypedef CUcheckpointRestoreArgs_st CUcheckpointRestoreArgs
 

cuda_bindings/cuda/bindings/cydriver.pyx.in

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2021-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
-# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1719+g565f73f4e. Do not modify it directly.
+# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1711+g875fec45. Do not modify it directly.
 cimport cuda.bindings._bindings.cydriver as cydriver
 
 {{if 'cuGetErrorString' in found_functions}}

cuda_bindings/cuda/bindings/driver.pxd.in

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2021-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
-# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1719+g565f73f4e. Do not modify it directly.
+# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1711+g875fec45. Do not modify it directly.
 cimport cuda.bindings.cydriver as cydriver
 
 include "_lib/utils.pxd"
@@ -5335,10 +5335,18 @@ cdef class CUcheckpointRestoreArgs_st:
     gpuPairsCount : unsigned int
         Number of gpu pairs to remap
     {{endif}}
-    {{if 'CUcheckpointRestoreArgs_st.reserved' in found_struct}}
+    {{if struct_field_types.get('CUcheckpointRestoreArgs_st.reserved') == 'char'}}
     reserved : bytes
         Reserved for future use, must be zeroed
     {{endif}}
+    {{if struct_field_types.get('CUcheckpointRestoreArgs_st.reserved') == 'cuuint64_t'}}
+    reserved : list[cuuint64_t]
+        Reserved for future use, must be zeroed
+    {{endif}}
+    {{if 'CUcheckpointRestoreArgs_st.reserved1' in found_struct}}
+    reserved1 : cuuint64_t
+        Reserved for future use, must be zeroed
+    {{endif}}
 
     Methods
     -------
@@ -5351,6 +5359,9 @@ cdef class CUcheckpointRestoreArgs_st:
     cdef size_t _gpuPairs_length
     cdef cydriver.CUcheckpointGpuPair* _gpuPairs
     {{endif}}
+    {{if 'CUcheckpointRestoreArgs_st.reserved1' in found_struct}}
+    cdef cuuint64_t _reserved1
+    {{endif}}
 {{endif}}
 {{if 'CUcheckpointUnlockArgs_st' in found_struct}}
 
@@ -11226,10 +11237,18 @@ cdef class CUcheckpointRestoreArgs(CUcheckpointRestoreArgs_st):
     gpuPairsCount : unsigned int
         Number of gpu pairs to remap
     {{endif}}
-    {{if 'CUcheckpointRestoreArgs_st.reserved' in found_struct}}
+    {{if struct_field_types.get('CUcheckpointRestoreArgs_st.reserved') == 'char'}}
     reserved : bytes
         Reserved for future use, must be zeroed
     {{endif}}
+    {{if struct_field_types.get('CUcheckpointRestoreArgs_st.reserved') == 'cuuint64_t'}}
+    reserved : list[cuuint64_t]
+        Reserved for future use, must be zeroed
+    {{endif}}
+    {{if 'CUcheckpointRestoreArgs_st.reserved1' in found_struct}}
+    reserved1 : cuuint64_t
+        Reserved for future use, must be zeroed
+    {{endif}}
 
     Methods
     -------