Skip to content

Commit 3ce5b6a

Browse files
authored
Remove upper bounds on cuda-python to allow 12.6.2 and 11.8.5 (#2517)
Now that some upstream bugs have been fixed, we can allow cuda-python 12.6.2 and 11.8.5. See NVIDIA/cuda-python#226 (comment) for more information. Authors: - Bradley Dice (https://github.com/bdice) Approvers: - James Lamb (https://github.com/jameslamb) - Corey J. Nolet (https://github.com/cjnolet) URL: #2517
1 parent fc7818f commit 3ce5b6a

8 files changed

Lines changed: 21 additions & 16 deletions

File tree

‎conda/environments/all_cuda-118_arch-aarch64.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
- cmake>=3.26.4,!=3.30.0
1515
- cuda-nvtx=11.8
1616
- cuda-profiler-api=11.8.86
17-
- cuda-python>=11.7.1,<12.0a0,<=11.8.3
17+
- cuda-python>=11.7.1,<12.0a0
1818
- cuda-version=11.8
1919
- cudatoolkit
2020
- cupy>=12.0.0
@@ -54,6 +54,7 @@ dependencies:
5454
- scikit-build-core>=0.10.0
5555
- scikit-learn
5656
- scipy
57+
- spdlog>=1.14.1,<1.15
5758
- sphinx-copybutton
5859
- sphinx-markdown-tables
5960
- sysroot_linux-aarch64==2.17

‎conda/environments/all_cuda-118_arch-x86_64.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
- cmake>=3.26.4,!=3.30.0
1515
- cuda-nvtx=11.8
1616
- cuda-profiler-api=11.8.86
17-
- cuda-python>=11.7.1,<12.0a0,<=11.8.3
17+
- cuda-python>=11.7.1,<12.0a0
1818
- cuda-version=11.8
1919
- cudatoolkit
2020
- cupy>=12.0.0
@@ -54,6 +54,7 @@ dependencies:
5454
- scikit-build-core>=0.10.0
5555
- scikit-learn
5656
- scipy
57+
- spdlog>=1.14.1,<1.15
5758
- sphinx-copybutton
5859
- sphinx-markdown-tables
5960
- sysroot_linux-64==2.17

‎conda/environments/all_cuda-125_arch-aarch64.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
- cuda-nvcc
1717
- cuda-nvtx-dev
1818
- cuda-profiler-api
19-
- cuda-python>=12.0,<13.0a0,<=12.6.0
19+
- cuda-python>=12.0,<13.0a0
2020
- cuda-version=12.5
2121
- cupy>=12.0.0
2222
- cxx-compiler
@@ -50,6 +50,7 @@ dependencies:
5050
- scikit-build-core>=0.10.0
5151
- scikit-learn
5252
- scipy
53+
- spdlog>=1.14.1,<1.15
5354
- sphinx-copybutton
5455
- sphinx-markdown-tables
5556
- sysroot_linux-aarch64==2.17

‎conda/environments/all_cuda-125_arch-x86_64.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
- cuda-nvcc
1717
- cuda-nvtx-dev
1818
- cuda-profiler-api
19-
- cuda-python>=12.0,<13.0a0,<=12.6.0
19+
- cuda-python>=12.0,<13.0a0
2020
- cuda-version=12.5
2121
- cupy>=12.0.0
2222
- cxx-compiler
@@ -50,6 +50,7 @@ dependencies:
5050
- scikit-build-core>=0.10.0
5151
- scikit-learn
5252
- scipy
53+
- spdlog>=1.14.1,<1.15
5354
- sphinx-copybutton
5455
- sphinx-markdown-tables
5556
- sysroot_linux-64==2.17

‎conda/recipes/pylibraft/meta.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ requirements:
4343
- {{ stdlib("c") }}
4444
host:
4545
{% if cuda_major == "11" %}
46-
- cuda-python >=11.7.1,<12.0a0,<=11.8.3
46+
- cuda-python >=11.7.1,<12.0a0
4747
- cudatoolkit
4848
{% else %}
49-
- cuda-python >=12.0,<13.0a0,<=12.6.0
49+
- cuda-python >=12.0,<13.0a0
5050
- cuda-cudart-dev
5151
{% endif %}
5252
- cuda-version ={{ cuda_version }}
@@ -61,10 +61,10 @@ requirements:
6161
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
6262
{% if cuda_major == "11" %}
6363
- cudatoolkit
64-
- cuda-python >=11.7.1,<12.0a0,<=11.8.3
64+
- cuda-python >=11.7.1,<12.0a0
6565
{% else %}
6666
- cuda-cudart
67-
- cuda-python >=12.0,<13.0a0,<=12.6.0
67+
- cuda-python >=12.0,<13.0a0
6868
{% endif %}
6969
- libraft {{ version }}
7070
- libraft-headers {{ version }}

‎conda/recipes/raft-dask/meta.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ requirements:
4343
- {{ stdlib("c") }}
4444
host:
4545
{% if cuda_major == "11" %}
46-
- cuda-python >=11.7.1,<12.0a0,<=11.8.3
46+
- cuda-python >=11.7.1,<12.0a0
4747
- cudatoolkit
4848
{% else %}
49-
- cuda-python >=12.0,<13.0a0,<=12.6.0
49+
- cuda-python >=12.0,<13.0a0
5050
- cuda-cudart-dev
5151
{% endif %}
5252
- cuda-version ={{ cuda_version }}
@@ -62,10 +62,10 @@ requirements:
6262
run:
6363
{% if cuda_major == "11" %}
6464
- cudatoolkit
65-
- cuda-python >=11.7.1,<12.0a0,<=11.8.3
65+
- cuda-python >=11.7.1,<12.0a0
6666
{% else %}
6767
- cuda-cudart
68-
- cuda-python >=12.0,<13.0a0,<=12.6.0
68+
- cuda-python >=12.0,<13.0a0
6969
{% endif %}
7070
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
7171
- dask-cuda ={{ minor_version }}

‎cpp/cmake/thirdparty/get_rmm.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
function(find_and_configure_rmm)
1818
include(${rapids-cmake-dir}/cpm/rmm.cmake)
1919
rapids_cpm_rmm(BUILD_EXPORT_SET raft-exports
20-
INSTALL_EXPORT_SET raft-exports)
20+
INSTALL_EXPORT_SET raft-exports)
2121
endfunction()
2222

2323
find_and_configure_rmm()

‎dependencies.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,9 @@ dependencies:
143143
packages:
144144
- c-compiler
145145
- cxx-compiler
146-
- nccl>=2.19
147146
- libucxx==0.42.*,>=0.0.0a0
147+
- nccl>=2.19
148+
- spdlog>=1.14.1,<1.15
148149
specific:
149150
- output_types: conda
150151
matrices:
@@ -196,11 +197,11 @@ dependencies:
196197
- matrix:
197198
cuda: "12.*"
198199
packages:
199-
- &cuda_python12 cuda-python>=12.0,<13.0a0,<=12.6.0
200+
- &cuda_python12 cuda-python>=12.0,<13.0a0
200201
- matrix:
201202
cuda: "11.*"
202203
packages:
203-
- &cuda_python11 cuda-python>=11.7.1,<12.0a0,<=11.8.3
204+
- &cuda_python11 cuda-python>=11.7.1,<12.0a0
204205
- matrix:
205206
packages:
206207
- &cuda_python cuda-python

0 commit comments

Comments
 (0)