Skip to content

Commit e6b553d

Browse files
authored
fix(core): make pixi lock solve across CUDA variants (#1758)
* fix(core): make pixi lock solve across CUDA variants Align the cuda-core and cuda-bindings Pixi source-package variants with the selected CUDA major and keep local checkout wiring out of the cu12 solve path. This restores cross-platform lock generation after the package and cuda-pathfinder version bumps changed the source metadata. Made-with: Cursor * chore(bindings): refresh pixi lock Regenerate the cuda-bindings lockfile so it matches the updated CUDA variant layout and remains reproducible alongside the core Pixi changes. Made-with: Cursor
1 parent 21f903b commit e6b553d

File tree

6 files changed

+6001
-3521
lines changed

6 files changed

+6001
-3521
lines changed

cuda_bindings/pixi.lock

Lines changed: 4051 additions & 67 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cuda_bindings/pixi.toml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ preview = ["pixi-build"]
99

1010
[workspace.build-variants]
1111
python = ["3.10.*", "3.11.*", "3.12.*", "3.13.*", "3.14.*"]
12+
# Keep source-package metadata aligned with the consuming environment's CUDA major.
13+
cuda-version = ["12.*", "13.2.*"]
1214

1315
[dependencies]
1416
cuda-bindings = { path = "." }
@@ -50,21 +52,21 @@ CUDA_HOME = "$CONDA_PREFIX/targets/sbsa-linux"
5052
[feature.cython-tests.target.win-64.activation.env]
5153
CUDA_HOME = '%CONDA_PREFIX%\Library'
5254

53-
[feature.cu13.system-requirements]
54-
cuda = "13"
55+
[feature.cu12.dependencies]
56+
cuda-version = "12.*"
5557

5658
[feature.cu13.dependencies]
57-
# TODO: make cuda-version a build-variant
5859
cuda-version = "13.2.*"
5960

6061
[environments]
61-
default = { features = ["cu13", "test", "cython-tests"] }
62-
cu13 = { features = ["cu13", "test", "cython-tests"] }
62+
default = { features = ["test", "cython-tests"], solve-group = "default" }
63+
cu13 = { features = ["cu13", "test", "cython-tests"], solve-group = "cu13" }
64+
cu12 = { features = ["cu12", "test", "cython-tests"], solve-group = "cu12" }
6365

6466
# TODO: check if these can be extracted from pyproject.toml
6567
[package]
6668
name = "cuda-bindings"
67-
version = "13.1.0"
69+
version = "13.2.0"
6870

6971
[package.build]
7072
backend = { name = "pixi-build-python", version = "*" }
@@ -92,6 +94,7 @@ CUDA_HOME = '%PREFIX%\Library'
9294

9395
[package.host-dependencies]
9496
python = "*"
97+
cuda-version = "*"
9598
setuptools = ">=80"
9699
setuptools-scm = ">=8"
97100
cython = ">=3.2,<3.3"
@@ -115,11 +118,12 @@ cuda-crt-dev_win-64 = "*"
115118

116119
[package.run-dependencies]
117120
python = "*"
121+
cuda-version = "*"
118122
cuda-pathfinder = { path = "../cuda_pathfinder" }
119123
libnvjitlink = "*"
120124
cuda-nvrtc = "*"
121125
cuda-nvvm = "*"
122-
libnvfatbin = "*"
126+
libnvfatbin = "*"
123127

124128
[package.target.linux.run-dependencies]
125129
libcufile = "*"

cuda_bindings/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ classifiers = [
3131
"Environment :: GPU :: NVIDIA CUDA",
3232
]
3333
dynamic = ["version", "readme"]
34-
dependencies = ["cuda-pathfinder ~=1.1"]
34+
dependencies = ["cuda-pathfinder >=1.4.2"]
3535

3636
[project.optional-dependencies]
3737
all = [

0 commit comments

Comments
 (0)