Skip to content
This repository was archived by the owner on Sep 18, 2025. It is now read-only.

refactor dependency-file-generator handling of cupy, default to CUDA 12 in fallback dependency lists#1059

Merged
rapids-bot[bot] merged 2 commits intorapidsai:branch-0.40from
jameslamb:misc/refactoring
Jul 25, 2024
Merged

refactor dependency-file-generator handling of cupy, default to CUDA 12 in fallback dependency lists#1059
rapids-bot[bot] merged 2 commits intorapidsai:branch-0.40from
jameslamb:misc/refactoring

Conversation

@jameslamb
Copy link
Member

Follow-up to #1057.

Implements the following suggestions based on review comments from @jakirkham and @bdice there:

  • splits cupy out into its own list in dependencies.yaml, to allow removing some cuda_suffixed: "false" blocks that were otherwise redundant
  • passes --matrix-entry 'cuda=12.x' in docs builds, to make it clearer that those builds are just trying to match cuda: "12.*" and are not at all dependent on any particular minor version of CUDA

Also proposes defaulting to cupy-cuda12x in pyproject.toml, as part of rapidsai/build-planning#68.

- cupy>=12.0.0
# NOTE: This is intentionally not broken into groups by a 'cuda_suffixed' selector like
# other packages with -cu{nn}x suffixes in this file.
# All RAPIDS wheel builds (including in devcontainers) expect cupy to be suffixed.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is exactly the language I'm proposing over in rapidsai/cugraph#4552 (comment) as well

@jameslamb jameslamb marked this pull request as ready for review July 25, 2024 16:23
@jameslamb jameslamb requested a review from a team as a code owner July 25, 2024 16:23
@jameslamb jameslamb requested a review from msarahan July 25, 2024 16:23
@jameslamb jameslamb changed the title WIP: refactor dependency-file-generator handling of cupy refactor dependency-file-generator handling of cupy Jul 25, 2024
@jameslamb jameslamb requested review from bdice and jakirkham July 25, 2024 16:24
@jameslamb jameslamb changed the title refactor dependency-file-generator handling of cupy refactor dependency-file-generator handling of cupy, default to CUDA 12 in fallback dependency lists Jul 25, 2024
@jameslamb
Copy link
Member Author

/merge

@rapids-bot rapids-bot bot merged commit b0cbd6e into rapidsai:branch-0.40 Jul 25, 2024
@jameslamb jameslamb deleted the misc/refactoring branch July 25, 2024 19:51
Copy link
Member

@jakirkham jakirkham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks James! 🙏

- |
pip install \
-C rapidsai.matrix-entry="cuda=12.2;cuda_suffixed=true" \
-C rapidsai.matrix-entry="cuda=12.x;cuda_suffixed=true" \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! 😄

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants