ci: normalize toolkit configuration and isolate CUDA 13 versions by rwgk · Pull Request #3314 · NVIDIA/cuda-python

rwgk · 2026-10-31T05:02:49Z

— codex GPT-6 on behalf of Ralf —

Layer 1 of 7 of the staged "CUDA 12 bindings on main" stack. Next: #3315. Stack map at the bottom.

What this PR does

Two small preparations. Nothing CI does today changes.

One reader for "which bindings roots exist." ci/tools/bindings_config.py (60 lines) turns the existing cuda.build.version / cuda.prev_build.version pins in ci/versions.yml into two records: cuda_bindings_13 is current (13.4.2), cuda_bindings_12 is maintenance (12.9.1). The pixi pin check is its first consumer. ci/ becomes an importable package, and detect-changes now runs the whole ci/tools/tests suite with pytest (before: only the planner test, via unittest).
CUDA 13 versions stop matching CUDA 12 tags. cuda_bindings_13/pyproject.toml and cuda_python/setup.py narrow the setuptools-scm selector from v*[0-9]* to v13.*. The planned retained CUDA 12 milestone is then excluded from CUDA 13 version derivation.

After this merges

main builds, tests, and releases exactly as before.
A v12.9.11a0 tag on main can no longer disturb CUDA 13 version derivation (covered by test_cuda12_milestone_does_not_change_current_package_versions, which derives its current release tag and expected line from the registry).
Selectors follow the CUDA major, so toolkit-minor updates need no selector edit. Layer 7 (ci: retire legacy branch-based bindings maintenance #3322) adds the metadata consistency check.

Where to look

ci/tools/bindings_config.py: the data model the rest of the stack builds on.
cuda_bindings_13/pyproject.toml and cuda_python/setup.py: the two one-line selector changes.
ci/tools/check_pixi_cuda_version.py: same check as before, now reading the registry.

All changes (10 files, +213 / -25)

ci/tools/bindings_config.py (new): BindingsPackage, BindingsConfig, load_config().
ci/__init__.py, ci/tools/__init__.py (new, empty): make python -m ci.tools.<module> work.
ci/tools/check_pixi_cuda_version.py: read pins through the registry; same checks.
ci/tools/tests/test_bindings_config.py (new): registry normalization, pixi-check drift, and the "CUDA 12 milestone does not change CUDA 13 versions" test (real git repository, real pyproject/setup.py).
.github/workflows/ci.yml: detect-changes installs pytest/pyyaml/setuptools-scm on hardened Python and runs pytest ci/tools/tests.
.github/workflows/ci-nightly.yml: the release-tooling test job installs setuptools-scm too.
.pre-commit-config.yaml: the pixi hook runs as python -m ci.tools.check_pixi_cuda_version and also triggers on the two tool files.
cuda_bindings_13/pyproject.toml, cuda_python/setup.py: --match v13.*.

Validation

Full CI passed at the pre-rebase head 1142000b (run 41171069718, 104 jobs).
Local validation at 77981309e15bed0531b4ca595acf89d4095c90af: 309 CI-tool tests and configured workflow lint passed. Full-stack CI on #3322 passed at 126ed74fb5bbfbc91a04e50557cf936efef4da7f (105 successful jobs; one expected skip).

Stack map: what main can do after each layer merges

Layer	PR	After it merges, `main` ...
1	#3314	behaves exactly as before; CI has one reader for the two bindings roots; CUDA 13 versions can no longer match a `v12.*` tag
2	#3315	lets a developer build, test, and document `cuda_bindings_12/`; the PR-time CPU source-build smoke covers both roots; three CUDA 12 runtime fixes are in
3	#3317	builds the CUDA 12 bindings wheel itself and runs its GPU tests; `cuda.core` and the metapackage still consume `12.9.x` artifacts
4	#3318	uses same-run CUDA 12 wheels everywhere; PR CI no longer reads the `12.9.x` branch
5	#3319	can release CUDA 12 from a `v12.9.N` tag on `main`; CUDA 13 releases are unchanged
6	#3321	builds and tests only what a change needs, per bindings root, reusing baseline artifacts
7	#3322	carries the schema-2 registry, a manual-only backport workflow, a metadata consistency hook, and the maintenance docs; `12.9.x` is frozen

Every layer was designed to be mergeable on its own and had a green full CI run at its pre-rebase head on 2026-10-31. The stack is the "individually mergeable pieces" alternative to #3174-#3182; both stacks reach the same end state except that this one keeps compatibility routes for older artifact sources and retained CUDA 13 tags.

copy-pr-bot · 2026-10-31T05:02:53Z

Auto-sync is disabled for draft pull requests in this repository. Workflows must be run manually.

Contributors can view more details about this message here.

rwgk · 2026-10-31T05:03:51Z

/ok to test 1142000

github-actions · 2026-10-31T05:17:22Z

Doc Preview CI
🚀 View preview at https://nvidia.github.io/cuda-python/pr-preview/pr-3314/
https://nvidia.github.io/cuda-python/pr-preview/pr-3314/cuda-core/
https://nvidia.github.io/cuda-python/pr-preview/pr-3314/cuda-bindings/
https://nvidia.github.io/cuda-python/pr-preview/pr-3314/cuda-pathfinder/
Preview will be ready when the GitHub Pages deployment is complete.

mdboom

The most blocking thing here is hard-coding the minor version in the git describe glob. It means there is an extra step required before tagging and merging a release. My agent seems nothing wrong with making it v13.*, though it would require updating a test here.

mdboom · 2026-11-03T14:27:15Z

+      - name: Set up Python for CI tool tests
+        uses: ./.github/actions/setup-hardened-python
+        with:
+          python-version: "3.12"


Why Python 3.12? We could use the latest, but probably the right conservative thing here to avoid breaking any outside users who might want to compile cuda-python themselves is to use the oldest supported (currently 3.11).

— codex GPT-6 on behalf of Ralf —

Changed the tooling jobs to Python 3.11, exercising the supported lower bound. implementation.

mdboom · 2026-11-03T14:28:23Z

+      - name: Test CI tools
+        run: |
+          python -m pip install pytest==9.1.0 pyyaml==6.0.3 setuptools-scm
+          python -m pytest -v --noconftest ci/tools/tests


Is there an explicit reason for --noconftest? That will be confusing if we ever want a conftest in the future.

— codex GPT-6 on behalf of Ralf —

Removed --noconftest and the stale explanation; these tests now use normal pytest collection. implementation.

mdboom · 2026-11-03T14:31:08Z


 def main() -> int:
-    """Verify cuda_bindings_13/cuda_core pixi pins match ci/versions.yml."""
+    """Verify current bindings and cuda_core pixi pins match ci/versions.yml."""


Makes total sense for now. Maybe it's already higher up in the stack, but we should make sure to come back and add this check to legacy (12) as well. If not already in the stack, let's create an issue or just add a TODO comment here so it doesn't fall through the cracks.

— codex GPT-6 on behalf of Ralf —

#3315 extends this check to the CUDA 12 bindings root. implementation.

mdboom · 2026-11-03T14:36:59Z

 root = ".."
 version_file = "cuda/bindings/_version.py"
-git_describe_command = ["git", "describe", "--dirty", "--tags", "--long", "--match", "v*[0-9]*"]
+git_describe_command = ["git", "describe", "--dirty", "--tags", "--long", "--match", "v13.4.*"]


Note to me: this is a UNIX glob pattern not a regex.

Do we need v13.4.* here? It kind of defeats the purpose of "simply" tagging to make a release, as we would now require a bump to this number at each minor release.

If it /must/ be this way, we need to update the release TODO instructions to add this extra step. By the time we tag the release, it will be too late to update this number, so it shouldn't be forgotten.

— codex GPT-6 on behalf of Ralf —

Changed the selector to v13.*, so toolkit-minor changes need no selector edit. The metadata check and documentation now follow that contract. implementation; metadata check.

mdboom · 2026-11-03T14:37:58Z

    root="..",
    relative_to=__file__,
-    git_describe_command=["git", "describe", "--dirty", "--tags", "--long", "--match", "v*[0-9]*"],
+    git_describe_command=["git", "describe", "--dirty", "--tags", "--long", "--match", "v13.4.*"],


Ditto as above.

— codex GPT-6 on behalf of Ralf —

The metapackage uses the same v13.* selector. implementation.

mdboom · 2026-11-03T15:21:41Z

+
+      - name: Test CI tools
+        run: |
+          python -m pip install pytest==9.1.0 pyyaml==6.0.3 setuptools-scm


Nit: Since ci/tools is now a package, it should have a pyproject.toml and specify its dependencies there (making it easier to run the tests locally). That can be a "side quest", though. Maybe create an issue to come back to it.

EDIT: It looks like #3315 does this.

— codex GPT-6 on behalf of Ralf —

As noted in the edit, #3315 supplies ci/pyproject.toml. implementation.

mdboom · 2026-11-03T15:24:48Z

+from .bindings_config import load_config

 ROOT = Path(__file__).resolve().parents[2]
 VERSIONS_FILE_PATH = ROOT / "ci" / "versions.yml"


Nit: Duplicated from bindings_config.py which should own knowing where the canonical location of this file is. Rather than checking for its existence here, bindings_config.py should (and already does) raise an exception when the file doesn't exist.

— codex GPT-6 on behalf of Ralf —

Removed the duplicate path constant and delegated loading to bindings_config. implementation.

mdboom · 2026-11-03T15:24:57Z

    if not VERSIONS_FILE_PATH.is_file():
        print(f"error: {VERSIONS_FILE_PATH} not found", file=sys.stderr)
        return 2


Remove (see comment above).

— codex GPT-6 on behalf of Ralf —

Removed the check; the configuration loader reports a missing file. implementation.

mdboom · 2026-11-03T15:25:13Z

-        build_version = yaml.safe_load(VERSIONS_FILE_PATH.read_text(encoding="utf-8"))["cuda"]["build"]["version"]
-    except (KeyError, TypeError):
-        print(f"error: cuda.build.version not found in {VERSIONS_FILE_PATH}", file=sys.stderr)
+        current = load_config(VERSIONS_FILE_PATH).package_for_release_status("current")


Suggested change

current = load_config(VERSIONS_FILE_PATH).package_for_release_status("current")

current = load_config().package_for_release_status("current")

— codex GPT-6 on behalf of Ralf —

The caller uses the loader's default configuration path. implementation.

mdboom · 2026-11-03T15:25:42Z

-        print(f"error: cuda.build.version not found in {VERSIONS_FILE_PATH}", file=sys.stderr)
+        current = load_config(VERSIONS_FILE_PATH).package_for_release_status("current")
+    except (KeyError, TypeError, ValueError) as exc:
+        print(f"error: invalid CUDA toolkit pins in {VERSIONS_FILE_PATH}: {exc}", file=sys.stderr)


Suggested change

print(f"error: invalid CUDA toolkit pins in {VERSIONS_FILE_PATH}: {exc}", file=sys.stderr)

print(f"error: invalid CUDA toolkit pins in {bindings_config.DEFAULT_CONFIG}: {exc}", file=sys.stderr)

— codex GPT-6 on behalf of Ralf —

The diagnostic refers to bindings_config.DEFAULT_CONFIG. implementation.

Signed-off-by: Ralf W. Grosse-Kunstleve <[email protected]>

rwgk

— codex GPT-6 on behalf of Ralf —

The blocker in your review is addressed: the bindings and metapackage selectors use v13.*, with matching tests and guidance. Toolkit-minor updates no longer require a selector edit.

All 15 inline comments now have direct replies with source links. The smaller tooling/configuration changes are applied; the CUDA 12 Pixi check and CI package are supplied by #3315. This corrected layer can serve as the common prerequisite for the retained-tag/bootstrap cleanup discussed there.

rwgk added this pull request to stack #3316 October 31, 2026 05:02

github-actions Bot added CI/CD CI/CD infrastructure cuda.bindings Everything related to the cuda.bindings module labels Oct 31, 2026

rwgk added this to the cuda.bindings next milestone Oct 31, 2026

rwgk added the enhancement Any code-related improvements label Oct 31, 2026

rwgk self-assigned this Oct 31, 2026

rwgk force-pushed the rwgk/cb12-staged-01-config branch from 1142000 to 5841a92 Compare November 1, 2026 22:38

mdboom mentioned this pull request Nov 3, 2026

[no-ci] Clarify upstream CTK version control in versions.yml #3338

Merged

mdboom requested changes Nov 3, 2026

View reviewed changes

rwgk added 3 commits November 3, 2026 21:37

ci: normalize toolkit configuration and isolate CUDA 13 versions

3ab81b4

Signed-off-by: Ralf W. Grosse-Kunstleve <[email protected]>

test: derive current SCM fixture version from registry [skip ci]

d04b64d

Signed-off-by: Ralf W. Grosse-Kunstleve <[email protected]>

Address migration review: simplify configuration and tooling

7798130

Signed-off-by: Ralf W. Grosse-Kunstleve <[email protected]>

rwgk force-pushed the rwgk/cb12-staged-01-config branch from 98ed2a6 to 7798130 Compare November 4, 2026 06:08

rwgk commented Nov 4, 2026

View reviewed changes

	current = load_config(VERSIONS_FILE_PATH).package_for_release_status("current")
	current = load_config().package_for_release_status("current")

	print(f"error: invalid CUDA toolkit pins in {VERSIONS_FILE_PATH}: {exc}", file=sys.stderr)
	print(f"error: invalid CUDA toolkit pins in {bindings_config.DEFAULT_CONFIG}: {exc}", file=sys.stderr)

Conversation

rwgk commented Oct 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What this PR does

After this merges

Where to look

Uh oh!

copy-pr-bot Bot commented Oct 31, 2026

Uh oh!

rwgk commented Oct 31, 2026

Uh oh!

github-actions Bot commented Oct 31, 2026

Preview will be ready when the GitHub Pages deployment is complete.

Uh oh!

mdboom left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mdboom Nov 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rwgk left a comment

Choose a reason for hiding this comment

Uh oh!

This branch has not been deployed

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

rwgk commented Oct 31, 2026 •

edited

Loading

mdboom Nov 3, 2026 •

edited

Loading