Skip to content

Commit d7ea6a2

Browse files
committed
chore: move to default envs
1 parent 36742dd commit d7ea6a2

File tree

7 files changed

+2185
-853
lines changed

7 files changed

+2185
-853
lines changed

cuda_bindings/pixi.lock

Lines changed: 2049 additions & 829 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: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ pyglet = ">=2.1.9"
2121
numpy = "*"
2222

2323
[feature.cython-tests.dependencies]
24-
cython = ">=3.2,<3.3" # for tests that exercise APIs from cython
25-
setuptools = "*" # for distutils
26-
gxx = "*" # to compile the generated code
24+
cython = ">=3.2,<3.3" # for tests that exercise APIs from cython
25+
setuptools = "*" # for distutils
26+
gxx = "*" # to compile the generated code
2727
# These are necessary because running the Cython tests requires compiling
2828
# *after* the package is built, and the Cython tests depend on CUDA headers
2929
# transitively (through cuda-bindings)
@@ -57,7 +57,8 @@ cuda = "13"
5757
cuda-version = "13.1.*"
5858

5959
[environments]
60-
cu13 = { features = ["cu13", "test", "cython-tests"], solve-group = "cu13" }
60+
default = { features = ["cu13", "test", "cython-tests"] }
61+
cu13 = { features = ["cu13", "test", "cython-tests"] }
6162

6263
# TODO: check if these can be extracted from pyproject.toml
6364
[package]

cuda_core/pixi.lock

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

cuda_core/pixi.toml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,16 @@ preview = ["pixi-build"]
1010
[workspace.build-variants]
1111
python = ["3.10.*", "3.11.*", "3.12.*", "3.13.*", "3.14.*"]
1212

13-
[dependencies]
14-
cuda-core = { path = "." }
15-
1613
[feature.test.dependencies]
14+
cuda-core = { path = "." }
1715
pytest = "*"
1816
pytest-benchmark = "*"
1917
pytest-randomly = "*"
2018

2119
[feature.cython-tests.dependencies]
22-
cython = ">=3.2,<3.3" # for tests that exercise APIs from cython
23-
setuptools = "*" # for distutils
24-
gxx = "*" # to compile the generated code
20+
cython = ">=3.2,<3.3" # for tests that exercise APIs from cython
21+
setuptools = "*" # for distutils
22+
gxx = "*" # to compile the generated code
2523
# These are necessary because running the Cython tests requires compiling
2624
# *after* the package is built, and the Cython tests depend on CUDA headers
2725
# transitively (through cuda-bindings)
@@ -62,7 +60,12 @@ cuda-version = "12.*"
6260

6361
# We keep both cu12 and cu13 because cuda.core works with either major version
6462
[environments]
65-
cu13 = { features = ["cu13", "test", "cython-tests"], solve-group = "cu13" }
63+
default = { features = [
64+
"cu13",
65+
"test",
66+
"cython-tests",
67+
], solve-group = "default" }
68+
cu13 = { features = ["cu13", "test", "cython-tests"], solve-group = "default" }
6669
cu12 = { features = ["cu12", "test", "cython-tests"], solve-group = "cu12" }
6770

6871
# TODO: check if these can be extracted from pyproject.toml

cuda_pathfinder/pixi.lock

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

cuda_pathfinder/pixi.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ cuda = "13"
2626
cuda-version = ">=13.1,<14"
2727

2828
[environments]
29-
default = { features = ["test"], solve-group = "default" }
29+
default = { features = ["cu13", "test"], solve-group = "default" }
30+
cu13 = { features = ["cu13", "test"], solve-group = "default" }
3031
cu12 = { features = ["cu12", "test"], solve-group = "cu12" }
31-
cu13 = { features = ["cu13", "test"], solve-group = "cu13" }
3232

3333
# TODO: check if these can be extracted from pyproject.toml
3434
[package]

pixi.toml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,15 @@ channels = ["conda-forge"]
77
platforms = ["linux-64", "linux-aarch64", "win-64"]
88

99
[feature.cu12.dependencies]
10-
[feature.cu13.dependencies]
1110

1211
[environments]
1312
cu12 = { features = ["cu12"] }
14-
cu13 = { features = ["cu13"] }
15-
16-
[activation.env]
17-
PIXI_ENVIRONMENT_NAME = "${PIXI_ENVIRONMENT_NAME/default/cu13}"
1813

1914
# Test Tasks
2015
# Runs tests across all sub-packages: pathfinder → bindings → core (dependency order)
21-
# Each sub-package has its own pixi.toml; the -e environment propagates via PIXI_ENVIRONMENT_NAME
16+
# Each sub-package has its own pixi.toml
2217
#
23-
# Usage: pixi run test | pixi run -e cu12 test | pixi run -e cu13 test
18+
# Usage: pixi run test | pixi run -e cu12 test
2419
[target.linux.tasks.test-pathfinder]
2520
cmd = [
2621
"pixi",

0 commit comments

Comments
 (0)