-
Notifications
You must be signed in to change notification settings - Fork 237
Update CuPy and NumPy dependency specs #3058
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from 3 commits
b50fd22
0337940
4900437
beb60f2
d6a63e1
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -367,21 +367,31 @@ dependencies: | |
| common: | ||
| - output_types: conda | ||
| packages: | ||
| - cupy>=13.6.0,!=14.0.0,!=14.1.0 | ||
| - cupy>=14.0.1,!=14.1.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. | ||
| specific: | ||
| - output_types: [requirements, pyproject] | ||
| - output_types: requirements | ||
| matrices: | ||
| - matrix: | ||
| cuda: "12.*" | ||
| packages: | ||
| - cupy-cuda12x>=14.0.1,!=14.1.0 | ||
| # fallback to CUDA 13 versions if 'cuda' is '13.*' or not provided | ||
| - matrix: | ||
| packages: | ||
| - cupy-cuda13x>=14.0.1,!=14.1.0 | ||
| - output_types: pyproject | ||
| matrices: | ||
| - matrix: | ||
| cuda: "12.*" | ||
| packages: | ||
| - cupy-cuda12x>=13.6.0,!=14.0.0,!=14.1.0 | ||
| - cupy-cuda12x[ctk]>=14.0.1,!=14.1.0 | ||
| # fallback to CUDA 13 versions if 'cuda' is '13.*' or not provided | ||
| - matrix: | ||
| packages: | ||
| - cupy-cuda13x>=13.6.0,!=14.0.0,!=14.1.0 | ||
| - cupy-cuda13x[ctk]>=14.0.1,!=14.1.0 | ||
| depends_on_rapids_logger: | ||
|
Comment on lines
+400
to
405
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The But you can't use extras in the
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm happy with the resolution pushed in recent commits, where the |
||
| common: | ||
| - output_types: [conda, requirements, pyproject] | ||
|
|
@@ -438,7 +448,7 @@ dependencies: | |
| common: | ||
| - output_types: [conda, pyproject, requirements] | ||
| packages: | ||
| - numpy>=1.23,<3.0 | ||
| - numpy>=2.0,<3.0 | ||
| run_raft_dask: | ||
| common: | ||
| - output_types: [conda, pyproject, requirements] | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry to complicate this, but I think this needs the
use_cuda_wheels: truequalifier, like this:https://github.com/rapidsai/raft/blob/c1babf1f58907762d800f2ff6b56a1eda98acc49/dependencies.yaml#L271-L283
Otherwise, this will pull in
cuda-toolkit[...]:https://github.com/cupy/cupy/blob/9d193b65ea0a393b579cb50d5db8dbf23a667ab1/setup.py#L85-L87
And we'll end up having to patch it in builds like DLFW where we prefer a system-installed CTK.
This applies to all of the PRs.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the updates across all the repos to address this, I'm happy with the new state of these PRs: rapidsai/build-planning#279 (comment)