Skip to content

Split cuda versions for notebook testing - #14722

Merged
rapids-bot[bot] merged 3 commits into
NVIDIA:branch-24.02from
raydouglass:test-notebooks-deps
Jan 9, 2024
Merged

Split cuda versions for notebook testing#14722
rapids-bot[bot] merged 3 commits into
NVIDIA:branch-24.02from
raydouglass:test-notebooks-deps

Conversation

@raydouglass

@raydouglass raydouglass commented Jan 8, 2024

Copy link
Copy Markdown
Contributor

Description

Follow up to #14648

Since rapidsai/docker tests the notebooks on both CUDA 11.8 & 12.0, we need a CUDA 11.8 version of the test_notebooks file key.

Without this change rdfg wlll always generate an environment with cuda-version=12.0 even when the matrix is for CUDA 11.8 and then it will conflict with other repos (as see here).

Checklist

  • I am familiar with the Contributing Guidelines.
  • New or existing tests cover these changes.
  • The documentation is up to date with these changes.

@raydouglass raydouglass added bug Something isn't working non-breaking Non-breaking change labels Jan 8, 2024
@raydouglass
raydouglass marked this pull request as ready for review January 8, 2024 20:00
@raydouglass
raydouglass requested a review from a team as a code owner January 8, 2024 20:00
@raydouglass

Copy link
Copy Markdown
Contributor Author

Environment before:

$ rapids-dependency-file-generator --file_key test_notebooks --matrix "cuda=11.8;arch=$(arch);py=3.10" --output conda
# This file is generated by `rapids-dependency-file-generator`.
# To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`.
channels:
- rapidsai
- rapidsai-nightly
- dask/label/dev
- pytorch
- conda-forge
- nvidia
dependencies:
- cuda-version=12.0
- ipython
- notebook
- python=3.10
- scipy
name: test_notebooks_cuda-118_arch-x86_64_py-310

After this change:

$ rapids-dependency-file-generator --file_key test_notebooks --matrix "cuda=11.8;arch=$(arch);py=3.10" --output conda
# This file is generated by `rapids-dependency-file-generator`.
# To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`.
channels:
- rapidsai
- rapidsai-nightly
- dask/label/dev
- pytorch
- conda-forge
- nvidia
dependencies:
- cuda-version=11.8
- ipython
- notebook
- python=3.10
- scipy
name: test_notebooks_cuda-118_arch-x86_64_py-310

@raydouglass

Copy link
Copy Markdown
Contributor Author

/merge

Comment thread dependencies.yaml Outdated
Co-authored-by: Bradley Dice <bdice@bradleydice.com>
@raydouglass
raydouglass requested a review from bdice January 8, 2024 20:22
@bdice

bdice commented Jan 8, 2024

Copy link
Copy Markdown
Contributor

I updated this branch to include #14723, which should unblock tests.

@rapids-bot
rapids-bot Bot merged commit 9c9de7c into NVIDIA:branch-24.02 Jan 9, 2024
@raydouglass
raydouglass deleted the test-notebooks-deps branch January 9, 2024 00:07
ajschmidt8 pushed a commit that referenced this pull request Jan 11, 2024
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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working non-breaking Non-breaking change

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants