From dfab5f0cb10e5d9f6e55ea2f8bf6cdcf03b467ee Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 8 Nov 2022 13:10:37 -0600 Subject: [PATCH] Fix environment channels (#996) This PR fixes the channel priority in `environment.yaml` files. These were missed in #975 and are needed to fix rapids-compose. I deleted the CUDA 11.0 environment because we have dropped CUDA 11.0 support. Authors: - Bradley Dice (https://github.com/bdice) Approvers: - Ray Douglass (https://github.com/raydouglass) - AJ Schmidt (https://github.com/ajschmidt8) URL: https://github.com/rapidsai/raft/pull/996 --- conda/environments/raft_dev_cuda11.0.yml | 43 ------------------------ conda/environments/raft_dev_cuda11.2.yml | 3 +- conda/environments/raft_dev_cuda11.4.yml | 3 +- conda/environments/raft_dev_cuda11.5.yml | 2 +- docs/source/build.md | 4 +-- 5 files changed, 7 insertions(+), 48 deletions(-) delete mode 100644 conda/environments/raft_dev_cuda11.0.yml diff --git a/conda/environments/raft_dev_cuda11.0.yml b/conda/environments/raft_dev_cuda11.0.yml deleted file mode 100644 index 3e0954f663..0000000000 --- a/conda/environments/raft_dev_cuda11.0.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: raft_dev -channels: -- rapidsai -- nvidia -- rapidsai-nightly -- dask/label/dev -- conda-forge -dependencies: -- c-compiler -- cxx-compiler -- cudatoolkit=11.0 -- ninja -- clang=11.1.0 -- clang-tools=11.1.0 -- cython>=0.29,<0.30 -- cmake>=3.23.1 -- dask>=2022.9.2 -- distributed>=2022.9.2 -- scikit-build>=0.13.1 -- rapids-build-env=22.12.* -- rapids-notebook-env=22.12.* -- rapids-doc-env=22.12.* -- rmm=22.12.* -- dask-cuda=22.12.* -- ucx>=1.13.0 -- ucx-py=0.29.* -- ucx-proc=*=gpu -- doxygen>=1.8.20 -- libfaiss>=1.7.0 -- faiss-proc=*=cuda -- ccache -- pip -- pip: - - sphinx_markdown_tables - - breathe - -# rapids-build-env, notebook-env and doc-env are defined in -# https://docs.rapids.ai/maintainers/depmgmt/ - -# To install different versions of packages contained in those meta packages, -# it is recommended to remove those meta packages (without removing the actual -# packages contained in the environment) first with: -# conda remove --force rapids-build-env rapids-notebook-env rapids-doc-env diff --git a/conda/environments/raft_dev_cuda11.2.yml b/conda/environments/raft_dev_cuda11.2.yml index 33aa343baf..4a6e7e6fc4 100644 --- a/conda/environments/raft_dev_cuda11.2.yml +++ b/conda/environments/raft_dev_cuda11.2.yml @@ -1,14 +1,15 @@ name: raft_dev channels: - rapidsai -- nvidia - rapidsai-nightly - dask/label/dev - conda-forge +- nvidia dependencies: - c-compiler - cxx-compiler - cudatoolkit=11.2 +- cuda-python >=11.7.1,<12.0 - ninja - clang=11.1.0 - clang-tools=11.1.0 diff --git a/conda/environments/raft_dev_cuda11.4.yml b/conda/environments/raft_dev_cuda11.4.yml index 6c8bd3ad50..f2acaed40e 100644 --- a/conda/environments/raft_dev_cuda11.4.yml +++ b/conda/environments/raft_dev_cuda11.4.yml @@ -1,14 +1,15 @@ name: raft_dev channels: - rapidsai -- nvidia - rapidsai-nightly - dask/label/dev - conda-forge +- nvidia dependencies: - c-compiler - cxx-compiler - cudatoolkit=11.4 +- cuda-python >=11.7.1,<12.0 - ninja - clang=11.1.0 - clang-tools=11.1.0 diff --git a/conda/environments/raft_dev_cuda11.5.yml b/conda/environments/raft_dev_cuda11.5.yml index dd54a02d81..f106e12959 100644 --- a/conda/environments/raft_dev_cuda11.5.yml +++ b/conda/environments/raft_dev_cuda11.5.yml @@ -1,10 +1,10 @@ name: raft_dev channels: - rapidsai +- rapidsai-nightly - dask/label/dev - conda-forge - nvidia -- rapidsai-nightly dependencies: - c-compiler - cxx-compiler diff --git a/docs/source/build.md b/docs/source/build.md index 7c22fa35b7..6b28353482 100644 --- a/docs/source/build.md +++ b/docs/source/build.md @@ -4,9 +4,9 @@ ### CUDA/GPU Requirements - GCC 9.0+ (9.5.0+ recommended) -- CUDA Toolkit 11.0+ +- CUDA Toolkit 11.2+ - NVIDIA driver 450.80.02+ -- Pascal architecture of better (compute capability >= 6.0) +- Pascal architecture or better (compute capability >= 6.0) ### Build Dependencies