Skip to content

Commit

Permalink
refactor CUDA versions in dependencies.yaml (#14733)
Browse files Browse the repository at this point in the history
Follow-up to #14644. 

Contributes to rapidsai/build-planning#7.

Similar to rapidsai/rmm#1422, this proposes splitting the `cuda-version` dependency in `dependencies.yaml` out to its own thing, separate from the bits of the CUDA Toolkit `cudf` needs.

Some other simplifications:

* removes the notebook-specific stuff added in #14722 (which I think were added specifically because `cuda-version` and CTK stuff was coupled)
* consolidates two sections with selectors only based on CUDA `{major}.{minor}`

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

Approvers:
   - Ray Douglass (https://github.com/raydouglass)
   - Bradley Dice (https://github.com/bdice)
   - Vyas Ramasubramani (https://github.com/vyasr)
  • Loading branch information
jameslamb committed Jan 11, 2024
1 parent 85acdc6 commit 0d87bb7
Showing 1 changed file with 37 additions and 32 deletions.
69 changes: 37 additions & 32 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ files:
- build_wheels
- build_python_common
- build_python_cudf
- cudatoolkit
- cuda
- cuda_version
- develop
- docs
- libarrow_build
Expand All @@ -29,31 +30,32 @@ files:
test_cpp:
output: none
includes:
- cudatoolkit
- test_cpp
- cuda_version
- libarrow_run
- test_cpp
test_python:
output: none
includes:
- cudatoolkit
- cuda_version
- py_version
- pyarrow_run
- test_python_common
- test_python_cudf
- test_python_dask_cudf
- pyarrow_run
test_java:
output: none
includes:
- build_all
- cuda
- cuda_version
- libarrow_run
- cudatoolkit
- test_java
test_notebooks:
output: none
includes:
- cuda_version
- notebooks
- py_version
- notebook_cuda_version
checks:
output: none
includes:
Expand All @@ -62,7 +64,8 @@ files:
docs:
output: none
includes:
- cudatoolkit
- cuda
- cuda_version
- docs
- libarrow_run
- py_version
Expand Down Expand Up @@ -333,37 +336,51 @@ dependencies:
# Allow runtime version to float up to minor version
# Disallow pyarrow 14.0.0 due to a CVE
- pyarrow>=14.0.1,<15.0.0a0
cudatoolkit:
cuda_version:
specific:
- output_types: conda
matrices:
- matrix:
cuda: "12.*"
cuda: "11.2"
packages:
- cuda-cudart-dev
- cuda-nvrtc-dev
- cuda-nvtx-dev
- libcurand-dev
- matrix: # Fallback for CUDA 11 or no matrix
- cuda-version=11.2
- matrix:
cuda: "11.4"
packages:
- cudatoolkit
- output_types: conda
matrices:
- cuda-version=11.4
- matrix:
cuda: "11.5"
packages:
- cuda-version=11.5
- matrix:
cuda: "11.8"
packages:
- cuda-version=11.8
- matrix:
cuda: "12.0"
packages:
- cuda-version=12.0
cuda:
specific:
- output_types: conda
matrices:
- matrix:
cuda: "12.*"
packages:
- cuda-cudart-dev
- cuda-nvrtc-dev
- cuda-nvtx-dev
- libcurand-dev
- matrix:
cuda: "11.8"
packages:
- cuda-version=11.8
- cudatoolkit
- cuda-nvtx=11.8
- libcurand-dev=10.3.0.86
- libcurand=10.3.0.86
- matrix:
cuda: "11.5"
packages:
- cuda-version=11.5
- cudatoolkit
- cuda-nvtx=11.5
# Can't hard pin the version since 11.x is missing many
Expand All @@ -373,15 +390,13 @@ dependencies:
- matrix:
cuda: "11.4"
packages:
- cuda-version=11.4
- cudatoolkit
- &cudanvtx114 cuda-nvtx=11.4
- &libcurand_dev114 libcurand-dev>=10.2.5.43,<=10.2.5.120
- &libcurand114 libcurand>=10.2.5.43,<=10.2.5.120
- matrix:
cuda: "11.2"
packages:
- cuda-version=11.2
- cudatoolkit
# The NVIDIA channel doesn't publish pkgs older than 11.4 for
# these libs, so 11.2 uses 11.4 packages (the oldest
Expand Down Expand Up @@ -753,13 +768,3 @@ dependencies:
packages:
- ipython
- openpyxl
notebook_cuda_version:
specific:
- output_types: conda
matrices:
- matrix: {cuda: "12.0"}
packages:
- cuda-version=12.0
- matrix: {cuda: "11.8"}
packages:
- cuda-version=11.8

0 comments on commit 0d87bb7

Please sign in to comment.