Skip to content

Commit

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

Approvers:
  - Ray Douglass (https://github.com/raydouglass)
  - Ajay Thorve (https://github.com/AjayThorve)

URL: #562
  • Loading branch information
jameslamb authored Jan 11, 2024
1 parent eb7555b commit cd5abc3
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repos:
args: ["--config=.flake8"]
files: python/.*$
- repo: https://github.com/rapidsai/dependency-file-generator
rev: v1.7.1
rev: v1.8.0
hooks:
- id: rapids-dependency-file-generator
args: ["--clean"]
Expand Down
1 change: 1 addition & 0 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dependencies:
- packaging
- pandoc<=2.0.0
- panel>=1.0
- panel>=1.0,<=1.3.4
- pre-commit
- pydata-sphinx-theme
- pytest
Expand Down
1 change: 1 addition & 0 deletions conda/environments/all_cuda-120_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ dependencies:
- packaging
- pandoc<=2.0.0
- panel>=1.0
- panel>=1.0,<=1.3.4
- pre-commit
- pydata-sphinx-theme
- pytest
Expand Down
44 changes: 28 additions & 16 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_wheels
- cudatoolkit
- cuda
- cuda_version
- checks
- docs
- notebook
Expand All @@ -17,13 +18,14 @@ files:
test_python:
output: none
includes:
- cudatoolkit
- cuda
- cuda_version
- py_version
- test_python
test_notebooks:
output: none
includes:
- cudatoolkit
- cuda_version
- notebook
- py_version
checks:
Expand All @@ -34,7 +36,7 @@ files:
docs:
output: none
includes:
- cudatoolkit
- cuda_version
- docs
- py_version
py_build:
Expand Down Expand Up @@ -71,34 +73,41 @@ dependencies:
packages:
- wheel
- setuptools
cudatoolkit:
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:
specific:
- output_types: conda
matrices:
- matrix:
cuda: "11.*"
packages:
- cuda-version=11.2
- cudatoolkit
- matrix:
cuda: "12.*"
packages:
checks:
common:
- output_types: [conda, requirements]
Expand Down Expand Up @@ -177,3 +186,6 @@ dependencies:
- pytest
- pytest-cov
- pytest-xdist
- output_types: conda
packages:
- panel>=1.0,<=1.3.4

0 comments on commit cd5abc3

Please sign in to comment.