From 08abc7286388fca71cd35aee3e4c470bdd809d6e Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Fri, 4 Nov 2022 10:08:23 -0400 Subject: [PATCH] [HOTFIX] Update cuda-python dependency to 11.7.1 (#963) @shwina I'm going to apologize ahead of time for this, but i was trying to forward merge your branch 22.10 locally to create a new PR from it and I accidentally pushed to your remote branch. I cherry-picked the commits over to a new branch for the hotfix. Authors: - Bradley Dice (https://github.com/bdice) - Ashwin Srinath (https://github.com/shwina) Approvers: - Ray Douglass (https://github.com/raydouglass) --- conda/environments/raft_dev_cuda11.0.yml | 2 +- conda/environments/raft_dev_cuda11.2.yml | 2 +- conda/environments/raft_dev_cuda11.4.yml | 2 +- conda/environments/raft_dev_cuda11.5.yml | 4 ++-- conda/recipes/pylibraft/meta.yaml | 4 ++-- conda/recipes/raft-dask/meta.yaml | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conda/environments/raft_dev_cuda11.0.yml b/conda/environments/raft_dev_cuda11.0.yml index 3c2b30d263..053adf8a7b 100644 --- a/conda/environments/raft_dev_cuda11.0.yml +++ b/conda/environments/raft_dev_cuda11.0.yml @@ -1,9 +1,9 @@ name: raft_dev channels: - rapidsai -- nvidia - rapidsai-nightly - conda-forge +- nvidia dependencies: - c-compiler - cxx-compiler diff --git a/conda/environments/raft_dev_cuda11.2.yml b/conda/environments/raft_dev_cuda11.2.yml index d8cb5759c1..caca5c591e 100644 --- a/conda/environments/raft_dev_cuda11.2.yml +++ b/conda/environments/raft_dev_cuda11.2.yml @@ -1,9 +1,9 @@ name: raft_dev channels: - rapidsai -- nvidia - rapidsai-nightly - conda-forge +- nvidia dependencies: - c-compiler - cxx-compiler diff --git a/conda/environments/raft_dev_cuda11.4.yml b/conda/environments/raft_dev_cuda11.4.yml index 74ee0366ca..07f8918689 100644 --- a/conda/environments/raft_dev_cuda11.4.yml +++ b/conda/environments/raft_dev_cuda11.4.yml @@ -1,9 +1,9 @@ name: raft_dev channels: - rapidsai -- nvidia - rapidsai-nightly - conda-forge +- nvidia dependencies: - c-compiler - cxx-compiler diff --git a/conda/environments/raft_dev_cuda11.5.yml b/conda/environments/raft_dev_cuda11.5.yml index fca6684bc8..0a29a94298 100644 --- a/conda/environments/raft_dev_cuda11.5.yml +++ b/conda/environments/raft_dev_cuda11.5.yml @@ -1,14 +1,14 @@ name: raft_dev channels: - rapidsai -- nvidia - rapidsai-nightly - conda-forge +- nvidia dependencies: - c-compiler - cxx-compiler - cudatoolkit=11.5 -- cuda-python >=11.5,<11.7.1 +- cuda-python >=11.7.1,<12.0 - ninja - clang=11.1.0 - clang-tools=11.1.0 diff --git a/conda/recipes/pylibraft/meta.yaml b/conda/recipes/pylibraft/meta.yaml index 3d19892657..68e2d5952d 100644 --- a/conda/recipes/pylibraft/meta.yaml +++ b/conda/recipes/pylibraft/meta.yaml @@ -37,12 +37,12 @@ requirements: - libraft-headers {{ version }} - libraft-distance {{ version }} - cudatoolkit {{ cuda_version }}.* - - cuda-python >=11.5,<11.7.1 + - cuda-python >=11.7.1,<12.0 run: - python x.x - libraft-headers {{ version }} - libraft-distance {{ version }} - - cuda-python >=11.5,<11.7.1 + - cuda-python >=11.7.1,<12.0 - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} tests: # [linux64] diff --git a/conda/recipes/raft-dask/meta.yaml b/conda/recipes/raft-dask/meta.yaml index 4e10294db7..c0198dd974 100644 --- a/conda/recipes/raft-dask/meta.yaml +++ b/conda/recipes/raft-dask/meta.yaml @@ -37,7 +37,7 @@ requirements: - rmm {{ minor_version }} - pylibraft {{ version }} - cudatoolkit {{ cuda_version }}.* - - cuda-python >=11.5,<11.7.1 + - cuda-python >=11.7.1,<12.0 - nccl>=2.9.9 - ucx {{ ucx_version }} - ucx-py {{ ucx_py_version }} @@ -53,7 +53,7 @@ requirements: - ucx-proc=*=gpu - dask==2022.9.2 - distributed==2022.9.2 - - cuda-python >=11.5,<11.7.1 + - cuda-python >=11.7.1,<12.0 - joblib >=0.11 - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}