From 63cb41e9f18d32c7a81a1e7a62c6b277ed8a4db8 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 6 Nov 2024 06:38:11 -0600 Subject: [PATCH 1/3] Disallow cuda-python 12.6.1 and 11.8.4. --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- conda/recipes/cuml/meta.yaml | 4 ++-- dependencies.yaml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index fb5a8f118b..2d7b566c73 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -9,7 +9,7 @@ channels: dependencies: - c-compiler - 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 - cudf==24.12.*,>=0.0.0a0 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 44a5164ba6..2f95cf21b2 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -12,7 +12,7 @@ dependencies: - cuda-cudart-dev - cuda-nvcc - cuda-profiler-api -- cuda-python>=12.0,<13.0a0 +- cuda-python>=12.0,<13.0a0,!=12.6.1 - cuda-version=12.5 - cudf==24.12.*,>=0.0.0a0 - cupy>=12.0.0 diff --git a/conda/recipes/cuml/meta.yaml b/conda/recipes/cuml/meta.yaml index 94e26003bc..2d7cb645b9 100644 --- a/conda/recipes/cuml/meta.yaml +++ b/conda/recipes/cuml/meta.yaml @@ -57,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 %} - cudf ={{ minor_version }} - cython >=3.0.0 diff --git a/dependencies.yaml b/dependencies.yaml index 4b4a0b06c9..669494afeb 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -198,11 +198,11 @@ dependencies: - matrix: cuda: "12.*" packages: - - cuda-python>=12.0,<13.0a0 + - cuda-python>=12.0,<13.0a0,!=12.6.1 - matrix: cuda: "11.*" packages: - - cuda-python>=11.7.1,<12.0a0 + - cuda-python>=11.7.1,<12.0a0,!=11.8.4 - matrix: packages: - cuda-python From 6eb6c46f04d01bfaced76684323ebbf5236aab9b Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 6 Nov 2024 14:54:35 -0600 Subject: [PATCH 2/3] ignore deprecation warnings from cuda-python, ignore cuda-python run_exports --- conda/recipes/cuml/meta.yaml | 3 +++ python/cuml/pyproject.toml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/conda/recipes/cuml/meta.yaml b/conda/recipes/cuml/meta.yaml index 2d7cb645b9..12ed595516 100644 --- a/conda/recipes/cuml/meta.yaml +++ b/conda/recipes/cuml/meta.yaml @@ -39,6 +39,7 @@ build: - {{ compiler('cuda') }} - cuda-cudart-dev {% endif %} + - cuda-python requirements: build: @@ -76,8 +77,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.4 {% else %} - cuda-cudart + - cuda-python >=12.0,<13.0a0,!=12.6.1 {% endif %} - cudf ={{ minor_version }} - cupy >=12.0.0 diff --git a/python/cuml/pyproject.toml b/python/cuml/pyproject.toml index f31f5c61b1..6c46373414 100644 --- a/python/cuml/pyproject.toml +++ b/python/cuml/pyproject.toml @@ -45,6 +45,8 @@ filterwarnings = [ "error:::cudf", "ignore:[^.]*ABCs[^.]*:DeprecationWarning:patsy[.*]", "ignore:(.*)alias(.*):DeprecationWarning:hdbscan[.*]", + # https://github.com/rapidsai/build-planning/issues/116 + "ignore:.*cuda..* module is deprecated.*:DeprecationWarning", # TODO: https://github.com/rapidsai/cuml/issues/5878 "ignore:.*ndarray.scatter_[(max|add)].* is deprecated:DeprecationWarning:cupyx", # TODO: https://github.com/rapidsai/cuml/issues/5879 From e3ca565a8f14c58963c29818a855a5f3369bb50c Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 6 Nov 2024 20:49:34 -0600 Subject: [PATCH 3/3] ceiling on cuda-python --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- conda/recipes/cuml/meta.yaml | 8 ++++---- dependencies.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 2d7b566c73..48f91abaf7 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -9,7 +9,7 @@ channels: dependencies: - c-compiler - cmake>=3.26.4,!=3.30.0 -- cuda-python>=11.7.1,<12.0a0,!=11.8.4 +- cuda-python>=11.7.1,<12.0a0,<=11.8.3 - cuda-version=11.8 - cudatoolkit - cudf==24.12.*,>=0.0.0a0 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 2f95cf21b2..d401902b41 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -12,7 +12,7 @@ dependencies: - cuda-cudart-dev - cuda-nvcc - cuda-profiler-api -- cuda-python>=12.0,<13.0a0,!=12.6.1 +- cuda-python>=12.0,<13.0a0,<=12.6.0 - cuda-version=12.5 - cudf==24.12.*,>=0.0.0a0 - cupy>=12.0.0 diff --git a/conda/recipes/cuml/meta.yaml b/conda/recipes/cuml/meta.yaml index 12ed595516..a2418dad10 100644 --- a/conda/recipes/cuml/meta.yaml +++ b/conda/recipes/cuml/meta.yaml @@ -58,10 +58,10 @@ requirements: - cuda-version ={{ cuda_version }} {% if cuda_major == "11" %} - cudatoolkit - - cuda-python >=11.7.1,<12.0a0,!=11.8.4 + - cuda-python >=11.7.1,<12.0a0,<=11.8.3 {% else %} - cuda-cudart-dev - - cuda-python >=12.0,<13.0a0,!=12.6.1 + - cuda-python >=12.0,<13.0a0,<=12.6.0 {% endif %} - cudf ={{ minor_version }} - cython >=3.0.0 @@ -77,10 +77,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.4 + - cuda-python >=11.7.1,<12.0a0,<=11.8.3 {% else %} - cuda-cudart - - cuda-python >=12.0,<13.0a0,!=12.6.1 + - cuda-python >=12.0,<13.0a0,<=12.6.0 {% endif %} - cudf ={{ minor_version }} - cupy >=12.0.0 diff --git a/dependencies.yaml b/dependencies.yaml index 669494afeb..21f9361b57 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -198,11 +198,11 @@ dependencies: - 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: - - cuda-python>=11.7.1,<12.0a0,!=11.8.4 + - cuda-python>=11.7.1,<12.0a0,<=11.8.3 - matrix: packages: - cuda-python