Skip to content
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.

Sign up for GitHub

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

Remove upper bounds on cuda-python to allow 12.6.2 and 11.8.5 #2517

Merged
merged 4 commits into from
Dec 5, 2024
Merged

Remove upper bounds on cuda-python to allow 12.6.2 and 11.8.5 #2517

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23d7fde
Relax cuda-python upper bound.
bdice Dec 4, 2024
1ab3847
Add missing spdlog dependency.
bdice Dec 4, 2024
f05fa2a
Update conda environments.
bdice Dec 4, 2024
b92c4c0
Merge branch 'branch-25.02' into relax-cuda-python-upper-bound
bdice Dec 4, 2024
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
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
- cmake>=3.26.4,!=3.30.0
- cuda-nvtx=11.8
- cuda-profiler-api=11.8.86
- cuda-python>=11.7.1,<12.0a0,<=11.8.3
- cuda-python>=11.7.1,<12.0a0
- cuda-version=11.8
- cudatoolkit
- cupy>=12.0.0
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
- cmake>=3.26.4,!=3.30.0
- cuda-nvtx=11.8
- cuda-profiler-api=11.8.86
- cuda-python>=11.7.1,<12.0a0,<=11.8.3
- cuda-python>=11.7.1,<12.0a0
- cuda-version=11.8
- cudatoolkit
- cupy>=12.0.0
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
- cuda-python>=12.0,<13.0a0,<=12.6.0
- cuda-python>=12.0,<13.0a0
- cuda-version=12.5
- cupy>=12.0.0
- cxx-compiler
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
- cuda-python>=12.0,<13.0a0,<=12.6.0
- cuda-python>=12.0,<13.0a0
- cuda-version=12.5
- cupy>=12.0.0
- cxx-compiler
Expand Down
8 changes: 4 additions & 4 deletions conda/recipes/pylibraft/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ requirements:
- {{ stdlib("c") }}
host:
{% if cuda_major == "11" %}
- cuda-python >=11.7.1,<12.0a0,<=11.8.3
- cuda-python >=11.7.1,<12.0a0
- cudatoolkit
{% else %}
- cuda-python >=12.0,<13.0a0,<=12.6.0
- cuda-python >=12.0,<13.0a0
- cuda-cudart-dev
{% endif %}
- cuda-version ={{ cuda_version }}
Expand All @@ -61,10 +61,10 @@ requirements:
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
{% if cuda_major == "11" %}
- cudatoolkit
- cuda-python >=11.7.1,<12.0a0,<=11.8.3
- cuda-python >=11.7.1,<12.0a0
{% else %}
- cuda-cudart
- cuda-python >=12.0,<13.0a0,<=12.6.0
- cuda-python >=12.0,<13.0a0
{% endif %}
- libraft {{ version }}
- libraft-headers {{ version }}
Expand Down
8 changes: 4 additions & 4 deletions conda/recipes/raft-dask/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ requirements:
- {{ stdlib("c") }}
host:
{% if cuda_major == "11" %}
- cuda-python >=11.7.1,<12.0a0,<=11.8.3
- cuda-python >=11.7.1,<12.0a0
- cudatoolkit
{% else %}
- cuda-python >=12.0,<13.0a0,<=12.6.0
- cuda-python >=12.0,<13.0a0
- cuda-cudart-dev
{% endif %}
- cuda-version ={{ cuda_version }}
Expand All @@ -62,10 +62,10 @@ requirements:
run:
{% if cuda_major == "11" %}
- cudatoolkit
- cuda-python >=11.7.1,<12.0a0,<=11.8.3
- cuda-python >=11.7.1,<12.0a0
{% else %}
- cuda-cudart
- cuda-python >=12.0,<13.0a0,<=12.6.0
- cuda-python >=12.0,<13.0a0
{% endif %}
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
- dask-cuda ={{ minor_version }}
Expand Down
2 changes: 1 addition & 1 deletion cpp/cmake/thirdparty/get_rmm.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
function(find_and_configure_rmm)
include(${rapids-cmake-dir}/cpm/rmm.cmake)
rapids_cpm_rmm(BUILD_EXPORT_SET raft-exports
INSTALL_EXPORT_SET raft-exports)
INSTALL_EXPORT_SET raft-exports)
endfunction()

find_and_configure_rmm()
7 changes: 4 additions & 3 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,9 @@ dependencies:
packages:
- c-compiler
- cxx-compiler
- nccl>=2.19
- libucxx==0.42.*,>=0.0.0a0
- nccl>=2.19
- spdlog>=1.14.1,<1.15
Copy link
Contributor Author

Choose a reason for hiding this comment

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

spdlog was missing in RAFT conda devcontainers. Previously it was gotten transitively from RMM but that was removed in rapidsai/rmm#1739, causing a build failure. I discussed with @vyasr and we agreed this fix (adding spdlog) is necessary for the short term. In the medium-to-long term, @vyasr is going to rework the loggers.

Copy link
Member

Choose a reason for hiding this comment

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

Thanks for summarizing that here, works for me.

(and thanks for alphabetizing this list while you're touching it).

specific:
- output_types: conda
matrices:
Expand Down Expand Up @@ -196,11 +197,11 @@ dependencies:
- matrix:
cuda: "12.*"
packages:
- &cuda_python12 cuda-python>=12.0,<13.0a0,<=12.6.0
- &cuda_python12 cuda-python>=12.0,<13.0a0
- matrix:
cuda: "11.*"
packages:
- &cuda_python11 cuda-python>=11.7.1,<12.0a0,<=11.8.3
- &cuda_python11 cuda-python>=11.7.1,<12.0a0
- matrix:
packages:
- &cuda_python cuda-python
Expand Down
Loading