Skip to content

Commit

Permalink
refactor CUDA versions in dependencies.yaml (#1303)
Browse files Browse the repository at this point in the history
Contributes to rapidsai/build-planning#7.

Proposes splitting the `cuda-version` dependency in `dependencies.yaml` out to its own thing, separate from the bits of the CUDA Toolkit this project needs.

### Benefits of this change

* prevents accidental inclusion of multiple `cuda-version` version in environments
* reduces update effort (via enabling more use of globs like `"12.*"`)
* improves the chance that errors like "`conda` recipe is missing a dependency" are caught in CI

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - Peter Andreas Entschev (https://github.com/pentschev)
  - Ray Douglass (https://github.com/raydouglass)

URL: #1303
  • Loading branch information
jameslamb authored Jan 11, 2024
1 parent ffdd100 commit d565a17
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ repos:
args: ["--module=dask_cuda", "--ignore-missing-imports"]
pass_filenames: false
- repo: https://github.com/rapidsai/dependency-file-generator
rev: v1.5.1
rev: v1.8.0
hooks:
- id: rapids-dependency-file-generator
args: ["--clean"]
Expand Down
30 changes: 18 additions & 12 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ files:
arch: [x86_64]
includes:
- build_python
- cudatoolkit
- cuda
- cuda_version
- develop
- docs
- py_version
Expand All @@ -16,7 +17,8 @@ files:
test_python:
output: none
includes:
- cudatoolkit
- cuda
- cuda_version
- py_version
- test_python
checks:
Expand All @@ -27,7 +29,8 @@ files:
docs:
output: none
includes:
- cudatoolkit
- cuda
- cuda_version
- docs
- py_version
py_build:
Expand Down Expand Up @@ -75,34 +78,37 @@ dependencies:
- output_types: pyproject
packages:
- tomli ; python_version < '3.11'
cudatoolkit:
cuda_version:
specific:
- output_types: conda
matrices:
- matrix:
cuda: "11.2"
packages:
- cuda-version=11.2
- cudatoolkit
- matrix:
cuda: "11.4"
packages:
- cuda-version=11.4
- cudatoolkit
- matrix:
cuda: "11.5"
packages:
- cuda-version=11.5
- cudatoolkit
- matrix:
cuda: "11.8"
packages:
- cuda-version=11.8
- cudatoolkit
- matrix:
cuda: "12.0"
packages:
- cuda-version=12.0
cuda:
specific:
- output_types: conda
matrices:
- matrix:
cuda: "11.*"
packages:
- cudatoolkit
- matrix:
cuda: "12.*"
packages:
- cuda-nvcc-impl
- cuda-nvrtc
develop:
Expand Down

0 comments on commit d565a17

Please sign in to comment.