Skip to content

Commit

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

Approvers:
  - Vyas Ramasubramani (https://github.com/vyasr)
  - Bradley Dice (https://github.com/bdice)
  - Ray Douglass (https://github.com/raydouglass)

URL: #4084
  • Loading branch information
jameslamb authored Jan 11, 2024
1 parent 35ae8ef commit b22dd99
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ repos:
pass_filenames: false
additional_dependencies: [gitpython]
- repo: https://github.com/rapidsai/dependency-file-generator
rev: v1.5.1
rev: v1.8.0
hooks:
- id: rapids-dependency-file-generator
args: ["--clean"]
47 changes: 27 additions & 20 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ files:
- checks
- common_build
- cpp_build
- cudatoolkit
- cuda
- cuda_version
- docs
- python_build_wheel
- python_build_cythonize
Expand Down Expand Up @@ -37,27 +38,27 @@ files:
docs:
output: none
includes:
- cudatoolkit
- cuda_version
- docs
- py_version
- depends_on_pylibcugraphops
test_cpp:
output: none
includes:
- cudatoolkit
- cuda_version
- test_cpp
test_notebooks:
output: none
includes:
- cudatoolkit
- cuda_version
- py_version
- test_notebook
- test_python_common
- test_python_cugraph
test_python:
output: none
includes:
- cudatoolkit
- cuda_version
- depends_on_cudf
- py_version
- test_python_common
Expand Down Expand Up @@ -273,33 +274,40 @@ dependencies:
- output_types: [conda, requirements]
packages:
- pre-commit
cudatoolkit:
cuda_version:
specific:
- output_types: [conda]
- 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: "12.*"
packages:
- matrix:
cuda: "11.*"
packages:
- cuda-version=11.2
- cudatoolkit
common_build:
common:
Expand Down Expand Up @@ -344,9 +352,8 @@ dependencies:
packages:
- nvcc_linux-aarch64=11.8
- matrix:
cuda: "12.0"
cuda: "12.*"
packages:
- cuda-version=12.0
- cuda-nvcc
docs:
common:
Expand Down

0 comments on commit b22dd99

Please sign in to comment.