Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-129_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
- cuda-profiler-api
- cuda-python>=12.9.2,<13.0
- cuda-version=12.9
- cupy>=13.6.0,!=14.0.0,!=14.1.0
- cupy>=14.0.1,!=14.1.0
- cxx-compiler
- cython>=3.2.2
- dask-cuda==26.8.*,>=0.0.0a0
Expand All @@ -31,7 +31,7 @@ dependencies:
- libucxx==0.51.*,>=0.0.0a0
- nccl>=2.19
- ninja
- numpy>=1.23,<3.0
- numpy>=2.0,<3.0
- numpydoc
- pre-commit
- pylibraft==26.8.*,>=0.0.0a0
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-129_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
- cuda-profiler-api
- cuda-python>=12.9.2,<13.0
- cuda-version=12.9
- cupy>=13.6.0,!=14.0.0,!=14.1.0
- cupy>=14.0.1,!=14.1.0
- cxx-compiler
- cython>=3.2.2
- dask-cuda==26.8.*,>=0.0.0a0
Expand All @@ -31,7 +31,7 @@ dependencies:
- libucxx==0.51.*,>=0.0.0a0
- nccl>=2.19
- ninja
- numpy>=1.23,<3.0
- numpy>=2.0,<3.0
- numpydoc
- pre-commit
- pylibraft==26.8.*,>=0.0.0a0
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-133_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
- cuda-profiler-api
- cuda-python>=13.0.1,<14.0
- cuda-version=13.3
- cupy>=13.6.0,!=14.0.0,!=14.1.0
- cupy>=14.0.1,!=14.1.0
- cxx-compiler
- cython>=3.2.2
- dask-cuda==26.8.*,>=0.0.0a0
Expand All @@ -31,7 +31,7 @@ dependencies:
- libucxx==0.51.*,>=0.0.0a0
- nccl>=2.19
- ninja
- numpy>=1.23,<3.0
- numpy>=2.0,<3.0
- numpydoc
- pre-commit
- pylibraft==26.8.*,>=0.0.0a0
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-133_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
- cuda-profiler-api
- cuda-python>=13.0.1,<14.0
- cuda-version=13.3
- cupy>=13.6.0,!=14.0.0,!=14.1.0
- cupy>=14.0.1,!=14.1.0
- cxx-compiler
- cython>=3.2.2
- dask-cuda==26.8.*,>=0.0.0a0
Expand All @@ -31,7 +31,7 @@ dependencies:
- libucxx==0.51.*,>=0.0.0a0
- nccl>=2.19
- ninja
- numpy>=1.23,<3.0
- numpy>=2.0,<3.0
- numpydoc
- pre-commit
- pylibraft==26.8.*,>=0.0.0a0
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/pylibraft/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,13 @@ requirements:
- libraft =${{ version }}
- libraft-headers =${{ version }}
- python
- numpy >=1.23,<3.0
- numpy >=2.0,<3.0
- rmm =${{ minor_version }}
- if: cuda_major == "12"
then: cuda-python >=12.9.2,<13.0
else: cuda-python >=13.0.1,<14.0
run_constraints:
- cupy >=13.6.0,!=14.0.0,!=14.1.0
- cupy >=14.0.1,!=14.1.0
ignore_run_exports:
from_package:
- ${{ compiler("c") }}
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/raft-dask/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ requirements:
then: cuda-python >=12.9.2,<13.0
else: cuda-python >=13.0.1,<14.0
run_constraints:
- cupy >=13.6.0,!=14.0.0,!=14.1.0
- cupy >=14.0.1,!=14.1.0
ignore_run_exports:
from_package:
- ${{ compiler("c") }}
Expand Down
8 changes: 4 additions & 4 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ 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.
Expand All @@ -377,11 +377,11 @@ dependencies:
- matrix:
cuda: "12.*"
packages:
- cupy-cuda12x>=13.6.0,!=14.0.0,!=14.1.0
- cupy-cuda12x[ctk]>=14.0.1,!=14.1.0

Copy link
Copy Markdown
Member

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: true qualifier, 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.

Copy link
Copy Markdown
Member

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)

# 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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The depends_on_cupy block is also used to define test_python -- and the requirements generated by dependency-file-generator get piped into $PIP_CONSTRAINTS in test_wheel_pylibraft.sh (and others).

But you can't use extras in the $PIP_CONSTRAINTS -- maybe we break it out into depends_on_cupy and depends_on_cupy_test and then explicitly list the ctk packages there?

@jameslamb jameslamb Jun 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'm happy with the resolution pushed in recent commits, where the [ctk] extra is only present in output_type: pyproject lists.

common:
- output_types: [conda, requirements, pyproject]
Expand Down Expand Up @@ -438,7 +438,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]
Expand Down
4 changes: 2 additions & 2 deletions python/pylibraft/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ requires-python = ">=3.11"
dependencies = [
"cuda-python>=13.0.1,<14.0",
"libraft==26.8.*,>=0.0.0a0",
"numpy>=1.23,<3.0",
"numpy>=2.0,<3.0",
"rmm==26.8.*,>=0.0.0a0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
classifiers = [
Expand All @@ -36,7 +36,7 @@ classifiers = [

[project.optional-dependencies]
test = [
"cupy-cuda13x>=13.6.0,!=14.0.0,!=14.1.0",
"cupy-cuda13x[ctk]>=14.0.1,!=14.1.0",
"pytest",
"pytest-cov",
"scikit-learn",
Expand Down
Loading