Skip to content

Commit

Permalink
Disallow cuda-python 12.6.1 and 11.8.4 (#1720)
Browse files Browse the repository at this point in the history
Due to a bug in cuda-python we must disallow cuda-python 12.6.1 and 11.8.4. See rapidsai/build-planning#116 for more information.

This PR disallows those versions, and other changes following from that:

* specifying `python` in both `host:` and `run:` dependencies for the `rmm` conda package
* ignoring deprecation warnings raised by newer versions of `cuda-python`

Authors:
  - Bradley Dice (https://github.com/bdice)
  - James Lamb (https://github.com/jameslamb)
  - https://github.com/jakirkham

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

URL: #1720
  • Loading branch information
bdice authored Nov 6, 2024
1 parent dbae8c0 commit d4c0635
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8 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 @@ -10,7 +10,7 @@ dependencies:
- clang-tools==16.0.6
- clang==16.0.6
- cmake>=3.26.4,!=3.30.0
- cuda-python>=11.7.1,<12.0a0
- cuda-python>=11.7.1,<12.0a0,!=11.8.4
- cuda-version=11.8
- cudatoolkit
- cxx-compiler
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 @@ -11,7 +11,7 @@ dependencies:
- clang==16.0.6
- cmake>=3.26.4,!=3.30.0
- cuda-nvcc
- cuda-python>=12.0,<13.0a0
- cuda-python>=12.0,<13.0a0,!=12.6.1
- cuda-version=12.5
- cxx-compiler
- cython>=3.0.0
Expand Down
8 changes: 6 additions & 2 deletions conda/recipes/rmm/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ build:
- {{ compiler('cuda') }}
- cuda-cudart-dev
{% endif %}
- cuda-python

requirements:
build:
Expand All @@ -56,10 +57,10 @@ requirements:
- cuda-version ={{ cuda_version }}
{% if cuda_major == "11" %}
- cudatoolkit
- cuda-python >=11.7.1,<12.0a0
- cuda-python >=11.7.1,<12.0a0,!=11.8.4
{% else %}
- cuda-cudart-dev
- cuda-python >=12.0,<13.0a0
- cuda-python >=12.0,<13.0a0,!=12.6.1
{% endif %}
- cython >=3.0.0
- rapids-build-backend >=0.3.0,<0.4.0.dev0
Expand All @@ -69,12 +70,15 @@ requirements:
run:
{% if cuda_major == "11" %}
- cudatoolkit
- cuda-python >=11.7.1,<12.0a0,!=11.8.4
{% else %}
- cuda-cudart
- cuda-python >=12.0,<13.0a0,!=12.6.1
{% endif %}
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
- numba >=0.57
- numpy >=1.23,<3.0a0
- python

test:
imports:
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,10 @@ dependencies:
- matrix:
cuda: "12.*"
packages:
- &cuda_python12 cuda-python>=12.0,<13.0a0
- &cuda_python12 cuda-python>=12.0,<13.0a0,!=12.6.1
- matrix: # All CUDA 11 versions
packages:
- &cuda_python11 cuda-python>=11.7.1,<12.0a0
- &cuda_python11 cuda-python>=11.7.1,<12.0a0,!=11.8.4
- output_types: [requirements, pyproject]
matrices:
- matrix:
Expand Down
5 changes: 3 additions & 2 deletions python/rmm/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ authors = [
license = { text = "Apache 2.0" }
requires-python = ">=3.10"
dependencies = [
"cuda-python>=11.7.1,<12.0a0",
"cuda-python>=11.7.1,<12.0a0,!=11.8.4",
"numba>=0.57",
"numpy>=1.23,<3.0a0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
Expand Down Expand Up @@ -128,7 +128,7 @@ dependencies-file = "../../dependencies.yaml"
matrix-entry = "cuda_suffixed=true"
requires = [
"cmake>=3.26.4,!=3.30.0",
"cuda-python>=11.7.1,<12.0a0",
"cuda-python>=11.7.1,<12.0a0,!=11.8.4",
"cython>=3.0.0",
"librmm==24.12.*,>=0.0.0a0",
"ninja",
Expand All @@ -138,4 +138,5 @@ requires = [
# treat warnings as errors
filterwarnings = [
"error",
"ignore:.*cuda..* module is deprecated.*:DeprecationWarning"
]

0 comments on commit d4c0635

Please sign in to comment.