Skip to content

Commit

Permalink
Put a ceiling on cuda-python (#17264)
Browse files Browse the repository at this point in the history
Follow-up to #17253

Contributes to rapidsai/build-planning#116

That PR used `!=` requirements to skip a particular version of `cuda-python` that `cudf` and `pylibcudf` were incompatible with. A newer version of `cuda-python` (12.6.2 for CUDA 12, 11.8.5 for CUDA 11) was just released, and it also causes some build issues for RAPIDS libraries: rapidsai/cuvs#445 (comment)

To unblock CI across RAPIDS, this proposes **temporarily** switching to ceilings on the `cuda-python` dependency here.

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Vyas Ramasubramani (https://github.com/vyasr)
  - Bradley Dice (https://github.com/bdice)

URL: #17264
  • Loading branch information
jameslamb authored Nov 7, 2024
1 parent 57900de commit 29484cb
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies:
- cramjam
- cubinlinker
- cuda-nvtx=11.8
- cuda-python>=11.7.1,<12.0a0,!=11.8.4
- cuda-python>=11.7.1,<12.0a0,<=11.8.3
- cuda-sanitizer-api=11.8.86
- cuda-version=11.8
- cudatoolkit
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
- cuda-nvcc
- cuda-nvrtc-dev
- cuda-nvtx-dev
- cuda-python>=12.0,<13.0a0,!=12.6.1
- cuda-python>=12.0,<13.0a0,<=12.6.0
- cuda-sanitizer-api
- cuda-version=12.5
- cupy>=12.0.0
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/cudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ requirements:
- cudatoolkit
- ptxcompiler >=0.7.0
- cubinlinker # CUDA enhanced compatibility.
- cuda-python >=11.7.1,<12.0a0,!=11.8.4
- cuda-python >=11.7.1,<12.0a0,<=11.8.3
{% else %}
- cuda-cudart
- libcufile # [linux64]
Expand All @@ -100,7 +100,7 @@ requirements:
# TODO: Add nvjitlink here
# xref: https://github.com/rapidsai/cudf/issues/12822
- cuda-nvrtc
- cuda-python >=12.0,<13.0a0,!=12.6.1
- cuda-python >=12.0,<13.0a0,<=12.6.0
- pynvjitlink
{% endif %}
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/pylibcudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ requirements:
- {{ pin_compatible('rmm', max_pin='x.x') }}
- fsspec >=0.6.0
{% if cuda_major == "11" %}
- cuda-python >=11.7.1,<12.0a0,!=11.8.4
- cuda-python >=11.7.1,<12.0a0,<=11.8.3
{% else %}
- cuda-python >=12.0,<13.0a0,!=12.6.1
- cuda-python >=12.0,<13.0a0,<=12.6.0
{% endif %}
- nvtx >=0.2.1
- packaging
Expand Down
8 changes: 4 additions & 4 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -659,10 +659,10 @@ dependencies:
matrices:
- matrix: {cuda: "12.*"}
packages:
- cuda-python>=12.0,<13.0a0,!=12.6.1
- cuda-python>=12.0,<13.0a0,<=12.6.0
- matrix: {cuda: "11.*"}
packages: &run_pylibcudf_packages_all_cu11
- cuda-python>=11.7.1,<12.0a0,!=11.8.4
- cuda-python>=11.7.1,<12.0a0,<=11.8.3
- {matrix: null, packages: *run_pylibcudf_packages_all_cu11}
run_cudf:
common:
Expand All @@ -685,10 +685,10 @@ dependencies:
matrices:
- matrix: {cuda: "12.*"}
packages:
- cuda-python>=12.0,<13.0a0,!=12.6.1
- cuda-python>=12.0,<13.0a0,<=12.6.0
- matrix: {cuda: "11.*"}
packages: &run_cudf_packages_all_cu11
- cuda-python>=11.7.1,<12.0a0,!=11.8.4
- cuda-python>=11.7.1,<12.0a0,<=11.8.3
- {matrix: null, packages: *run_cudf_packages_all_cu11}
- output_types: conda
matrices:
Expand Down
2 changes: 1 addition & 1 deletion python/cudf/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ requires-python = ">=3.10"
dependencies = [
"cachetools",
"cubinlinker",
"cuda-python>=11.7.1,<12.0a0,!=11.8.4",
"cuda-python>=11.7.1,<12.0a0,<=11.8.3",
"cupy-cuda11x>=12.0.0",
"fsspec>=0.6.0",
"libcudf==24.12.*,>=0.0.0a0",
Expand Down
2 changes: 1 addition & 1 deletion python/pylibcudf/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ authors = [
license = { text = "Apache 2.0" }
requires-python = ">=3.10"
dependencies = [
"cuda-python>=11.7.1,<12.0a0,!=11.8.4",
"cuda-python>=11.7.1,<12.0a0,<=11.8.3",
"libcudf==24.12.*,>=0.0.0a0",
"nvtx>=0.2.1",
"packaging",
Expand Down

0 comments on commit 29484cb

Please sign in to comment.