Skip to content

Commit

Permalink
refactor CUDA versions in dependencies.yaml (#327)
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:
  - https://github.com/jakirkham

URL: #327
  • Loading branch information
jameslamb authored Jan 11, 2024
1 parent c6e6456 commit a93175b
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ repos:
^CHANGELOG.md$
)
- repo: https://github.com/rapidsai/dependency-file-generator
rev: v1.5.2
rev: v1.8.0
hooks:
- id: rapids-dependency-file-generator
args: ["--clean"]
Expand Down
56 changes: 30 additions & 26 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ files:
- build
- build_legate_wheel
- checks
- cudatoolkit
- cuda
- cuda_version
- docs
- notebooks
- py_version
Expand All @@ -19,11 +20,11 @@ files:
test_cpp:
output: none
includes:
- cudatoolkit
- cuda_version
test_python:
output: none
includes:
- cudatoolkit
- cuda_version
- py_version
- test_python
checks:
Expand All @@ -34,7 +35,7 @@ files:
docs:
output: none
includes:
- cudatoolkit
- cuda_version
- docs
- py_version
py_build:
Expand Down Expand Up @@ -130,9 +131,8 @@ dependencies:
packages:
- nvcc_linux-aarch64=11.8
- matrix:
cuda: "12.0"
cuda: "12.*"
packages:
- cuda-version=12.0
- cuda-nvcc
build_legate_wheel:
common:
Expand All @@ -145,42 +145,49 @@ dependencies:
- output_types: [conda, requirements]
packages:
- pre-commit
cudatoolkit:
common:
- output_types: conda
packages:
- nvcomp==3.0.5
cuda_version:
specific:
- output_types: conda
matrices:
- matrix:
cuda: "12.0"
cuda: "11.2"
packages:
- cuda-version=12.0
- cuda-version=11.2
- matrix:
cuda: "11.8"
cuda: "11.4"
packages:
- cuda-version=11.8
- cudatoolkit
- cuda-version=11.4
- matrix:
cuda: "11.5"
packages:
- cuda-version=11.5
- cudatoolkit
- matrix:
cuda: "11.4"
cuda: "11.8"
packages:
- cuda-version=11.4
- cudatoolkit
- cuda-version=11.8
- matrix:
cuda: "11.2"
cuda: "12.0"
packages:
- cuda-version=12.0
cuda:
common:
- output_types: conda
packages:
- nvcomp==3.0.5
specific:
- output_types: conda
matrices:
- matrix:
cuda: "11.*"
packages:
- cuda-version=11.2
- cudatoolkit
- matrix:
cuda: "12.*"
packages:
- output_types: conda
matrices:
- matrix:
cuda: "12.0"
cuda: "12.*"
arch: x86_64
packages:
- libcufile
Expand Down Expand Up @@ -212,9 +219,6 @@ dependencies:
# so 11.2 uses 11.4 packages (the oldest available).
- *libcufile_114
- *libcufile_dev114
# Fallback matrix for aarch64, which doesn't support libcufile.
- matrix:
packages:
docs:
common:
- output_types: [conda, requirements]
Expand Down

0 comments on commit a93175b

Please sign in to comment.