Backport #1411 (#1415)

mdboom · web-flow · commit 008b4291cea0 · 2025-12-19T19:01:43.000Z
* Backport #1411 * Search for cuda_bindings wheel locally * Secondary fixes * Ruff * Simplify import
diff --git a/.github/ISSUE_TEMPLATE/release_checklist.yml b/.github/ISSUE_TEMPLATE/release_checklist.yml
@@ -20,7 +20,6 @@ body:
         - label: File an internal nvbug to communicate test plan & release schedule with QA
         - label: Ensure all pending PRs are reviewed, tested, and merged
         - label: Check (or update if needed) the dependency requirements
-        - label: Bump the version
         - label: Create a public rc tag
         - label: "Point QA to fetch public artifacts (wheels) from the GHA run ID, example: `gh run download 12323257563 -p \"cuda-core*\" -R NVIDIA/cuda-python`"
         - label: Wait for QA reports and fix any issues found
diff --git a/.github/workflows/test-wheel-linux.yml b/.github/workflows/test-wheel-linux.yml
@@ -247,8 +247,6 @@ jobs:
           LOCAL_CTK: ${{ matrix.LOCAL_CTK }}
         run: run-tests bindings
 
-
-
       - name: Ensure cuda-python installable
         run: |
           if [[ "${{ matrix.LOCAL_CTK }}" == 1 ]]; then
diff --git a/.gitignore b/.gitignore
@@ -47,6 +47,9 @@ cuda_bindings/cuda/bindings/nvrtc.pxd
 cuda_bindings/cuda/bindings/nvrtc.pyx
 cuda_bindings/cuda/bindings/utils/_get_handle.pyx
 
+# Version files from setuptools_scm
+_version.py
+
 # Distribution / packaging
 .Python
 build/
diff --git a/cuda_bindings/cuda/bindings/_version.py b/cuda_bindings/cuda/bindings/_version.py
diff --git a/cuda_bindings/pyproject.toml b/cuda_bindings/pyproject.toml
@@ -2,7 +2,12 @@
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
 [build-system]
-requires = ["setuptools>=77.0.0", "cython>=3.2,<3.3", "pyclibrary>=0.1.7"]
+requires = [
+    "setuptools>=80.0.0", 
+    "setuptools-scm[simple]>=8",
+    "cython>=3.2,<3.3", 
+    "pyclibrary>=0.1.7"
+]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -55,7 +60,6 @@ Documentation = "https://nvidia.github.io/cuda-python/"
 include = ["cuda*"]
 
 [tool.setuptools.dynamic]
-version = { attr = "cuda.bindings._version.__version__" }
 readme = { file = ["DESCRIPTION.rst"], content-type = "text/x-rst" }
 
 [tool.ruff]
@@ -113,3 +117,10 @@ exclude = ["cuda/bindings/_version.py"]
   "UP022",
   "E402", # module level import not at top of file
   "F841"] # F841 complains about unused variables, but some assignments have side-effects that could be useful for tests (func calls for example)
+
+[tool.setuptools_scm]
+root = ".."
+version_file = "cuda/bindings/_version.py"
+# We deliberately do not want to include the version suffixes (a/b/rc) in cuda-bindings versioning
+tag_regex = "^(?P<version>v\\d+\\.\\d+\\.\\d+)"
+git_describe_command = ["git", "describe", "--dirty", "--tags", "--long", "--match", "v*[0-9]*"]
diff --git a/cuda_core/cuda/core/_version.py b/cuda_core/cuda/core/_version.py
diff --git a/cuda_core/pyproject.toml b/cuda_core/pyproject.toml
@@ -3,7 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 [build-system]
-requires = ["setuptools>=77.0.0", "Cython>=3.1"]
+requires = [
+    "setuptools>=80.0.0", 
+    "setuptools_scm[simple]>=8",
+    "Cython>=3.1"
+]
 build-backend = "setuptools.build_meta"
 
 
@@ -65,7 +69,6 @@ include = ["cuda.core*"]
 "cuda.core.experimental.include" = ["*.h", "*.hpp", "*.cuh"]
 
 [tool.setuptools.dynamic]
-version = { attr = "cuda.core._version.__version__" }
 readme = { file = ["DESCRIPTION.rst"], content-type = "text/x-rst" }
 
 [tool.ruff]
@@ -106,3 +109,10 @@ exclude = ["cuda/core/_version.py"]
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401"]
 "setup.py" = ["F401"]
+
+[tool.setuptools_scm]
+root = ".."
+version_file = "cuda/core/_version.py"
+# We deliberately do not want to include the version suffixes (a/b/rc) in cuda-core versioning
+tag_regex = "^cuda-core-(?P<version>v\\d+\\.\\d+\\.\\d+)"
+git_describe_command = ["git", "describe", "--dirty", "--tags", "--long", "--match", "cuda-core-v*[0-9]*"]
diff --git a/cuda_pathfinder/cuda/pathfinder/__init__.py b/cuda_pathfinder/cuda/pathfinder/__init__.py
@@ -1,10 +1,11 @@
 # SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+from cuda.pathfinder._version import __version__  # noqa: F401
+
 from cuda.pathfinder._dynamic_libs.load_dl_common import DynamicLibNotFoundError as DynamicLibNotFoundError
 from cuda.pathfinder._dynamic_libs.load_dl_common import LoadedDL as LoadedDL
 from cuda.pathfinder._dynamic_libs.load_nvidia_dynamic_lib import load_nvidia_dynamic_lib as load_nvidia_dynamic_lib
 from cuda.pathfinder._dynamic_libs.supported_nvidia_libs import (
     SUPPORTED_LIBNAMES as SUPPORTED_NVIDIA_LIBNAMES,  # noqa: F401
 )
-from cuda.pathfinder._version import __version__ as __version__
diff --git a/cuda_pathfinder/cuda/pathfinder/_version.py b/cuda_pathfinder/cuda/pathfinder/_version.py
diff --git a/cuda_pathfinder/pyproject.toml b/cuda_pathfinder/pyproject.toml
@@ -58,9 +58,16 @@ version = { attr = "cuda.pathfinder._version.__version__" }
 readme = { file = ["DESCRIPTION.rst"], content-type = "text/x-rst" }
 
 [build-system]
-requires = ["setuptools>=64", "wheel"]
+requires = ["setuptools>=80", "setuptools_scm[simple]>=8", "wheel"]
 build-backend = "setuptools.build_meta"
 
+[tool.setuptools_scm]
+root = ".."
+version_file = "cuda/pathfinder/_version.py"
+# We deliberately do not want to include the version suffixes (a/b/rc) in cuda-pathfinder versioning
+tag_regex = "^cuda-pathfinder-(?P<version>v\\d+\\.\\d+\\.\\d+)"
+git_describe_command = [ "git", "describe", "--dirty", "--tags", "--long", "--match", "cuda-pathfinder-v*[0-9]*" ]
+
 [tool.ruff]
 line-length = 120
 preview = true
diff --git a/cuda_python/pyproject.toml b/cuda_python/pyproject.toml
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
 [build-system]
-requires = ["setuptools>=77.0.0",]
+requires = ["setuptools>=80.0.0", "setuptools_scm[simple]>=8"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -41,3 +41,7 @@ issues = "https://github.com/NVIDIA/cuda-python/issues/"
 
 [tool.ruff]
 line-length = 120
+
+# The [tool.setuptools_scm] section is handled in setup.py since we need to
+# dynamically set the dependency to cuda_bindings based on the dynamically
+# determinded version
diff --git a/cuda_python/setup.py b/cuda_python/setup.py
@@ -2,23 +2,36 @@
 #
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
-import ast
+from packaging.version import Version
 from setuptools import setup
+from setuptools_scm import get_version
+
+version = get_version(
+    root="..",
+    relative_to=__file__,
+    # We deliberately do not want to include the version suffixes (a/b/rc) in cuda-python versioning
+    tag_regex="^(?P<version>v\\d+\\.\\d+\\.\\d+)",
+    git_describe_command=["git", "describe", "--dirty", "--tags", "--long", "--match", "v*[0-9]*"],
+)
+
+
+base_version = Version(version).base_version
+
+
+if base_version == version:
+    # Tagged release
+    matcher = "~="
+else:
+    # Pre-release version
+    matcher = "=="
 
-# We want to keep the version in sync with cuda.bindings, but setuptools would not let
-# us to refer to any files outside of the project root, so we have to employ our own
-# run-time lookup using setup()...
-with open("../cuda_bindings/cuda/bindings/_version.py") as f:
-    for line in f:
-        if line.startswith("__version__"):
-            version = ast.parse(line).body[0].value.value
 
 setup(
     version=version,
     install_requires=[
-        f"cuda-bindings~={version}",
+        f"cuda-bindings{matcher}{version}",
     ],
     extras_require={
-        "all": [f"cuda-bindings[all]~={version}"],
+        "all": [f"cuda-bindings[all]{matcher}{version}"],
     },
 )
