Merge branch 'main' into remove-deprecated

Author: mdboom

.pre-commit-config.yaml

@@ -123,7 +123,7 @@ repos:
         pass_filenames: false
         args: [--config-file=cuda_core/pyproject.toml, cuda_core/cuda/core]
         additional_dependencies:
-          - numpy
+          - numpy==2.4.2
 
   - repo: https://github.com/rhysd/actionlint
     rev: "914e7df21a07ef503a81201c76d2b11c789d3fca"  # frozen: v1.7.12

ci/tools/validate-release-wheels

@@ -9,11 +9,12 @@
 from __future__ import annotations
 
 import argparse
-import re
 import sys
 from collections import defaultdict
 from pathlib import Path
 
+from check_release_notes import parse_version_from_tag
+
 COMPONENT_TO_DISTRIBUTIONS: dict[str, set[str]] = {
     "cuda-core": {"cuda_core"},
     "cuda-bindings": {"cuda_bindings"},
@@ -22,11 +23,13 @@ COMPONENT_TO_DISTRIBUTIONS: dict[str, set[str]] = {
     "all": {"cuda_core", "cuda_bindings", "cuda_pathfinder", "cuda_python"},
 }
 
-TAG_PATTERNS = (
-    re.compile(r"^v(?P<version>\d+\.\d+\.\d+)"),
-    re.compile(r"^cuda-core-v(?P<version>\d+\.\d+\.\d+)"),
-    re.compile(r"^cuda-pathfinder-v(?P<version>\d+\.\d+\.\d+)"),
-)
+COMPONENT_TO_TAG_COMPONENTS: dict[str, tuple[str, ...]] = {
+    "cuda-core": ("cuda-core",),
+    "cuda-bindings": ("cuda-bindings",),
+    "cuda-pathfinder": ("cuda-pathfinder",),
+    "cuda-python": ("cuda-python",),
+    "all": ("cuda-core", "cuda-bindings", "cuda-pathfinder", "cuda-python"),
+}
 
 
 def parse_args() -> argparse.Namespace:
@@ -42,15 +45,18 @@ def parse_args() -> argparse.Namespace:
     return parser.parse_args()
 
 
-def version_from_tag(tag: str) -> str:
-    for pattern in TAG_PATTERNS:
-        match = pattern.match(tag)
-        if match:
-            return match.group("version")
+def version_from_tag(tag: str, component: str) -> str:
+    versions = {
+        version
+        for tag_component in COMPONENT_TO_TAG_COMPONENTS[component]
+        if (version := parse_version_from_tag(tag, tag_component)) is not None
+    }
+    if len(versions) == 1:
+        return versions.pop()
     raise ValueError(
         "Unsupported git tag format "
-        f"{tag!r}; expected tags beginning with vX.Y.Z, cuda-core-vX.Y.Z, "
-        "or cuda-pathfinder-vX.Y.Z."
+        f"{tag!r} for component {component!r}; expected vX.Y.Z[.postN], "
+        "cuda-core-vX.Y.Z[.postN], or cuda-pathfinder-vX.Y.Z[.postN]."
     )
 
 
@@ -64,7 +70,12 @@ def parse_wheel_dist_and_version(path: Path) -> tuple[str, str]:
 
 def main() -> int:
     args = parse_args()
-    expected_version = version_from_tag(args.git_tag)
+    try:
+        expected_version = version_from_tag(args.git_tag, args.component)
+    except ValueError as exc:
+        print(f"Error: {exc}", file=sys.stderr)
+        return 1
+
     expected_distributions = COMPONENT_TO_DISTRIBUTIONS[args.component]
     wheel_dir = Path(args.wheel_dir)
 

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

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2021-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1630+gadce055ea.d20260422. Do not modify it directly.
+# This code was automatically generated with version 13.3.0. Do not modify it directly.
 include "../cyruntime_types.pxi"
 
 include "../_lib/cyruntime/cyruntime.pxd"

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

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2021-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1630+gadce055ea.d20260422. Do not modify it directly.
+# This code was automatically generated with version 13.3.0. Do not modify it directly.
 include "../cyruntime_functions.pxi"
 
 import os

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

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2021-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1630+gadce055ea.d20260422. Do not modify it directly.
+# This code was automatically generated with version 13.3.0. Do not modify it directly.
 cdef extern from "":
     """
     #define CUDA_API_PER_THREAD_DEFAULT_STREAM

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

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2021-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1630+gadce055ea.d20260422. Do not modify it directly.
+# This code was automatically generated with version 13.3.0. Do not modify it directly.
 cdef extern from "":
     """
     #define CUDA_API_PER_THREAD_DEFAULT_STREAM

cuda_bindings/cuda/bindings/_internal/_fast_enum.py

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
-# This code was automatically generated across versions from 12.9.1 to 13.3.0, generator version 0.3.1.dev1719+g565f73f4e. Do not modify it directly.
+# This code was automatically generated across versions from 12.0.1 to 13.3.0. Do not modify it directly.
 
 
 """

cuda_bindings/cuda/bindings/_internal/cudla.pxd

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-# This code was automatically generated across versions from 1.5.0 to 13.3.0, generator version 0.3.1.dev1465+gc5c5c8652. Do not modify it directly.
+# This code was automatically generated across versions from 1.5.0 to 13.3.0. Do not modify it directly.
 
 from ..cycudla cimport *
 

cuda_bindings/cuda/bindings/_internal/cudla_linux.pyx

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-# This code was automatically generated across versions from 1.5.0 to 13.3.0, generator version 0.3.1.dev1465+gc5c5c8652. Do not modify it directly.
+# This code was automatically generated across versions from 1.5.0 to 13.3.0. Do not modify it directly.
 
 from libc.stdint cimport intptr_t, uintptr_t
 

cuda_bindings/cuda/bindings/_internal/cufile.pxd

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-# This code was automatically generated across versions from 12.9.1 to 13.2.0, generator version 0.3.1.dev1422+gf4812259e.d20260318. Do not modify it directly.
+# This code was automatically generated across versions from 12.9.1 to 13.3.0. Do not modify it directly.
 
 from ..cycufile cimport *