From 9f386fbee29012adae84227e7ddb1251a33d0ea8 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 11 Jan 2024 11:41:48 -0600 Subject: [PATCH 01/19] use CUDA 12.2 for building and testing wheels and conda packages --- .github/workflows/build.yaml | 16 ++++++++-------- .github/workflows/pr.yaml | 26 +++++++++++++------------- .github/workflows/test.yaml | 10 +++++----- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4c6e3d0ed4..2294b4193f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -28,7 +28,7 @@ concurrency: jobs: cpp-build: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@test-cuda-12.2 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -37,7 +37,7 @@ jobs: python-build: needs: [cpp-build] secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@test-cuda-12.2 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -46,7 +46,7 @@ jobs: upload-conda: needs: [cpp-build, python-build] secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@test-cuda-12.2 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -57,7 +57,7 @@ jobs: if: github.ref_type == 'branch' needs: python-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@test-cuda-12.2 with: arch: "amd64" branch: ${{ inputs.branch }} @@ -69,7 +69,7 @@ jobs: sha: ${{ inputs.sha }} wheel-build-pylibraft: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@test-cuda-12.2 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -79,7 +79,7 @@ jobs: wheel-publish-pylibraft: needs: wheel-build-pylibraft secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@test-cuda-12.2 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -89,7 +89,7 @@ jobs: wheel-build-raft-dask: needs: wheel-publish-pylibraft secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@test-cuda-12.2 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -99,7 +99,7 @@ jobs: wheel-publish-raft-dask: needs: wheel-build-raft-dask secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@test-cuda-12.2 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 19b990c8e9..8a25065be2 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -25,29 +25,29 @@ jobs: - wheel-tests-raft-dask - devcontainer secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@test-cuda-12.2 checks: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@test-cuda-12.2 with: enable_check_generated_files: false conda-cpp-build: needs: checks secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@test-cuda-12.2 with: build_type: pull-request node_type: cpu16 conda-cpp-tests: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@test-cuda-12.2 with: build_type: pull-request conda-cpp-checks: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@test-cuda-12.2 with: build_type: pull-request enable_check_symbols: true @@ -55,19 +55,19 @@ jobs: conda-python-build: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@test-cuda-12.2 with: build_type: pull-request conda-python-tests: needs: conda-python-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@test-cuda-12.2 with: build_type: pull-request docs-build: needs: conda-python-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@test-cuda-12.2 with: build_type: pull-request node_type: "gpu-v100-latest-1" @@ -77,34 +77,34 @@ jobs: wheel-build-pylibraft: needs: checks secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@test-cuda-12.2 with: build_type: pull-request script: ci/build_wheel_pylibraft.sh wheel-tests-pylibraft: needs: wheel-build-pylibraft secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@test-cuda-12.2 with: build_type: pull-request script: ci/test_wheel_pylibraft.sh wheel-build-raft-dask: needs: wheel-tests-pylibraft secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@test-cuda-12.2 with: build_type: pull-request script: "ci/build_wheel_raft_dask.sh" wheel-tests-raft-dask: needs: wheel-build-raft-dask secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@test-cuda-12.2 with: build_type: pull-request script: ci/test_wheel_raft_dask.sh devcontainer: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@test-cuda-12.2 with: build_command: | sccache -z; diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 138fd0e300..d876d6c8b6 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,7 +16,7 @@ on: jobs: conda-cpp-checks: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@test-cuda-12.2 with: build_type: nightly branch: ${{ inputs.branch }} @@ -26,7 +26,7 @@ jobs: symbol_exclusions: (void (thrust::|cub::)|_ZN\d+raft_cutlass) conda-cpp-tests: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@test-cuda-12.2 with: build_type: nightly branch: ${{ inputs.branch }} @@ -34,7 +34,7 @@ jobs: sha: ${{ inputs.sha }} conda-python-tests: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@test-cuda-12.2 with: build_type: nightly branch: ${{ inputs.branch }} @@ -42,7 +42,7 @@ jobs: sha: ${{ inputs.sha }} wheel-tests-pylibraft: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@test-cuda-12.2 with: build_type: nightly branch: ${{ inputs.branch }} @@ -51,7 +51,7 @@ jobs: script: ci/test_wheel_pylibraft.sh wheel-tests-raft-dask: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@test-cuda-12.2 with: build_type: nightly branch: ${{ inputs.branch }} From 8feb400a463e7a7149db424e79ee34d93f0298b1 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 11 Jan 2024 11:53:05 -0600 Subject: [PATCH 02/19] update dependencies.yaml --- .../all_cuda-122_arch-aarch64.yaml | 57 +++++++++++++++++++ .../all_cuda-122_arch-x86_64.yaml | 57 +++++++++++++++++++ dependencies.yaml | 6 +- 3 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 conda/environments/all_cuda-122_arch-aarch64.yaml create mode 100644 conda/environments/all_cuda-122_arch-x86_64.yaml diff --git a/conda/environments/all_cuda-122_arch-aarch64.yaml b/conda/environments/all_cuda-122_arch-aarch64.yaml new file mode 100644 index 0000000000..63e99233fa --- /dev/null +++ b/conda/environments/all_cuda-122_arch-aarch64.yaml @@ -0,0 +1,57 @@ +# This file is generated by `rapids-dependency-file-generator`. +# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. +channels: +- rapidsai +- rapidsai-nightly +- dask/label/dev +- conda-forge +- nvidia +dependencies: +- breathe +- c-compiler +- clang-tools=16.0.6 +- clang==16.0.6 +- cmake>=3.26.4 +- cuda-cudart-dev +- cuda-nvcc +- cuda-nvtx-dev +- cuda-profiler-api +- cuda-python>=11.7.1,<12.0a0 +- cuda-version=12.2 +- cupy>=12.0.0 +- cxx-compiler +- cython>=3.0.0 +- dask-cuda==24.2.* +- doxygen>=1.8.20 +- gcc_linux-aarch64=11.* +- gmock>=1.13.0 +- graphviz +- gtest>=1.13.0 +- ipython +- joblib>=0.11 +- libcublas-dev +- libcurand-dev +- libcusolver-dev +- libcusparse-dev +- nccl>=2.9.9 +- ninja +- numba>=0.57 +- numpy>=1.21 +- numpydoc +- pre-commit +- pydata-sphinx-theme +- pytest +- pytest-cov +- rapids-dask-dependency==24.2.* +- recommonmark +- rmm==24.2.* +- scikit-build-core>=0.7.0 +- scikit-learn +- scipy +- sphinx-copybutton +- sphinx-markdown-tables +- sysroot_linux-aarch64==2.17 +- ucx-proc=*=gpu +- ucx-py==0.36.* +- ucx>=1.13.0 +name: all_cuda-122_arch-aarch64 diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml new file mode 100644 index 0000000000..b4f7dbf6c6 --- /dev/null +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -0,0 +1,57 @@ +# This file is generated by `rapids-dependency-file-generator`. +# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. +channels: +- rapidsai +- rapidsai-nightly +- dask/label/dev +- conda-forge +- nvidia +dependencies: +- breathe +- c-compiler +- clang-tools=16.0.6 +- clang==16.0.6 +- cmake>=3.26.4 +- cuda-cudart-dev +- cuda-nvcc +- cuda-nvtx-dev +- cuda-profiler-api +- cuda-python>=11.7.1,<12.0a0 +- cuda-version=12.2 +- cupy>=12.0.0 +- cxx-compiler +- cython>=3.0.0 +- dask-cuda==24.2.* +- doxygen>=1.8.20 +- gcc_linux-64=11.* +- gmock>=1.13.0 +- graphviz +- gtest>=1.13.0 +- ipython +- joblib>=0.11 +- libcublas-dev +- libcurand-dev +- libcusolver-dev +- libcusparse-dev +- nccl>=2.9.9 +- ninja +- numba>=0.57 +- numpy>=1.21 +- numpydoc +- pre-commit +- pydata-sphinx-theme +- pytest +- pytest-cov +- rapids-dask-dependency==24.2.* +- recommonmark +- rmm==24.2.* +- scikit-build-core>=0.7.0 +- scikit-learn +- scipy +- sphinx-copybutton +- sphinx-markdown-tables +- sysroot_linux-64==2.17 +- ucx-proc=*=gpu +- ucx-py==0.36.* +- ucx>=1.13.0 +name: all_cuda-122_arch-x86_64 diff --git a/dependencies.yaml b/dependencies.yaml index 0e4d6d4693..73ea4bee81 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -3,7 +3,7 @@ files: all: output: conda matrix: - cuda: ["11.8", "12.0"] + cuda: ["11.8", "12.0", "12.2"] arch: [x86_64, aarch64] includes: - build @@ -265,6 +265,10 @@ dependencies: cuda: "12.0" packages: - cuda-version=12.0 + - matrix: + cuda: "12.2" + packages: + - cuda-version=12.2 cuda: specific: - output_types: conda From 4a53184e44758959c15afc942d9a0479449ff193 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 11 Jan 2024 12:00:50 -0600 Subject: [PATCH 03/19] update cuda_python12 reference to cover all 12.x versions --- conda/environments/all_cuda-122_arch-aarch64.yaml | 1 + conda/environments/all_cuda-122_arch-x86_64.yaml | 1 + dependencies.yaml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conda/environments/all_cuda-122_arch-aarch64.yaml b/conda/environments/all_cuda-122_arch-aarch64.yaml index 63e99233fa..4a1e596433 100644 --- a/conda/environments/all_cuda-122_arch-aarch64.yaml +++ b/conda/environments/all_cuda-122_arch-aarch64.yaml @@ -17,6 +17,7 @@ dependencies: - cuda-nvtx-dev - cuda-profiler-api - cuda-python>=11.7.1,<12.0a0 +- cuda-python>=12.0,<13.0a0 - cuda-version=12.2 - cupy>=12.0.0 - cxx-compiler diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index b4f7dbf6c6..3b04c3bd42 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -17,6 +17,7 @@ dependencies: - cuda-nvtx-dev - cuda-profiler-api - cuda-python>=11.7.1,<12.0a0 +- cuda-python>=12.0,<13.0a0 - cuda-version=12.2 - cupy>=12.0.0 - cxx-compiler diff --git a/dependencies.yaml b/dependencies.yaml index 73ea4bee81..b76c05c5c5 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -439,7 +439,7 @@ dependencies: - output_types: [conda, requirements, pyproject] matrices: - matrix: - cuda: "12.0" + cuda: "12.*" packages: - *cuda_python12 - matrix: # All CUDA 11 versions From 102fea0057f3ae1f366dd5415335914cfbbfbf26 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 11 Jan 2024 12:20:39 -0600 Subject: [PATCH 04/19] one more missing 12.0-specific thing --- dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index b76c05c5c5..a7e79e3816 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -191,7 +191,7 @@ dependencies: - output_types: [conda, requirements, pyproject] matrices: - matrix: - cuda: "12.0" + cuda: "12.*" packages: - &cuda_python12 cuda-python>=12.0,<13.0a0 - matrix: # All CUDA 11 versions From 150ea1f7d32fc5313dc578c88f3c65ffbc2a362e Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 11 Jan 2024 14:55:35 -0600 Subject: [PATCH 05/19] remove 1.20 env file, update docs --- .../all_cuda-120_arch-aarch64.yaml | 57 ------------------- .../all_cuda-120_arch-x86_64.yaml | 57 ------------------- .../all_cuda-122_arch-aarch64.yaml | 1 - .../all_cuda-122_arch-x86_64.yaml | 1 - dependencies.yaml | 2 +- docs/source/build.md | 2 +- 6 files changed, 2 insertions(+), 118 deletions(-) delete mode 100644 conda/environments/all_cuda-120_arch-aarch64.yaml delete mode 100644 conda/environments/all_cuda-120_arch-x86_64.yaml diff --git a/conda/environments/all_cuda-120_arch-aarch64.yaml b/conda/environments/all_cuda-120_arch-aarch64.yaml deleted file mode 100644 index c0eede1389..0000000000 --- a/conda/environments/all_cuda-120_arch-aarch64.yaml +++ /dev/null @@ -1,57 +0,0 @@ -# This file is generated by `rapids-dependency-file-generator`. -# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. -channels: -- rapidsai -- rapidsai-nightly -- dask/label/dev -- conda-forge -- nvidia -dependencies: -- breathe -- c-compiler -- clang-tools=16.0.6 -- clang==16.0.6 -- cmake>=3.26.4 -- cuda-cudart-dev -- cuda-nvcc -- cuda-nvtx-dev -- cuda-profiler-api -- cuda-python>=12.0,<13.0a0 -- cuda-version=12.0 -- cupy>=12.0.0 -- cxx-compiler -- cython>=3.0.0 -- dask-cuda==24.2.* -- doxygen>=1.8.20 -- gcc_linux-aarch64=11.* -- gmock>=1.13.0 -- graphviz -- gtest>=1.13.0 -- ipython -- joblib>=0.11 -- libcublas-dev -- libcurand-dev -- libcusolver-dev -- libcusparse-dev -- nccl>=2.9.9 -- ninja -- numba>=0.57 -- numpy>=1.21 -- numpydoc -- pre-commit -- pydata-sphinx-theme -- pytest -- pytest-cov -- rapids-dask-dependency==24.2.* -- recommonmark -- rmm==24.2.* -- scikit-build-core>=0.7.0 -- scikit-learn -- scipy -- sphinx-copybutton -- sphinx-markdown-tables -- sysroot_linux-aarch64==2.17 -- ucx-proc=*=gpu -- ucx-py==0.36.* -- ucx>=1.13.0 -name: all_cuda-120_arch-aarch64 diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml deleted file mode 100644 index cebaf96493..0000000000 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ /dev/null @@ -1,57 +0,0 @@ -# This file is generated by `rapids-dependency-file-generator`. -# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. -channels: -- rapidsai -- rapidsai-nightly -- dask/label/dev -- conda-forge -- nvidia -dependencies: -- breathe -- c-compiler -- clang-tools=16.0.6 -- clang==16.0.6 -- cmake>=3.26.4 -- cuda-cudart-dev -- cuda-nvcc -- cuda-nvtx-dev -- cuda-profiler-api -- cuda-python>=12.0,<13.0a0 -- cuda-version=12.0 -- cupy>=12.0.0 -- cxx-compiler -- cython>=3.0.0 -- dask-cuda==24.2.* -- doxygen>=1.8.20 -- gcc_linux-64=11.* -- gmock>=1.13.0 -- graphviz -- gtest>=1.13.0 -- ipython -- joblib>=0.11 -- libcublas-dev -- libcurand-dev -- libcusolver-dev -- libcusparse-dev -- nccl>=2.9.9 -- ninja -- numba>=0.57 -- numpy>=1.21 -- numpydoc -- pre-commit -- pydata-sphinx-theme -- pytest -- pytest-cov -- rapids-dask-dependency==24.2.* -- recommonmark -- rmm==24.2.* -- scikit-build-core>=0.7.0 -- scikit-learn -- scipy -- sphinx-copybutton -- sphinx-markdown-tables -- sysroot_linux-64==2.17 -- ucx-proc=*=gpu -- ucx-py==0.36.* -- ucx>=1.13.0 -name: all_cuda-120_arch-x86_64 diff --git a/conda/environments/all_cuda-122_arch-aarch64.yaml b/conda/environments/all_cuda-122_arch-aarch64.yaml index 4a1e596433..a40c243d42 100644 --- a/conda/environments/all_cuda-122_arch-aarch64.yaml +++ b/conda/environments/all_cuda-122_arch-aarch64.yaml @@ -16,7 +16,6 @@ dependencies: - cuda-nvcc - cuda-nvtx-dev - cuda-profiler-api -- cuda-python>=11.7.1,<12.0a0 - cuda-python>=12.0,<13.0a0 - cuda-version=12.2 - cupy>=12.0.0 diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index 3b04c3bd42..1decd63be5 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -16,7 +16,6 @@ dependencies: - cuda-nvcc - cuda-nvtx-dev - cuda-profiler-api -- cuda-python>=11.7.1,<12.0a0 - cuda-python>=12.0,<13.0a0 - cuda-version=12.2 - cupy>=12.0.0 diff --git a/dependencies.yaml b/dependencies.yaml index a7e79e3816..40d0f7d1a0 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -3,7 +3,7 @@ files: all: output: conda matrix: - cuda: ["11.8", "12.0", "12.2"] + cuda: ["11.8", "12.2"] arch: [x86_64, aarch64] includes: - build diff --git a/docs/source/build.md b/docs/source/build.md index ae7734d0ed..2540f79724 100644 --- a/docs/source/build.md +++ b/docs/source/build.md @@ -106,7 +106,7 @@ In addition to the libraries included with cudatoolkit 11.0+, there are some oth Conda environment scripts are provided for installing the necessary dependencies to build both the C++ and Python libraries from source. It is preferred to use `mamba`, as it provides significant speedup over `conda`: ```bash -mamba env create --name rapids_raft -f conda/environments/all_cuda-120_arch-x86_64.yaml +mamba env create --name rapids_raft -f conda/environments/all_cuda-122_arch-x86_64.yaml mamba activate rapids_raft ``` From 2dc69dbb459e69229fba48551358a48fc5b8161b Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 11 Jan 2024 17:21:53 -0600 Subject: [PATCH 06/19] Try forcing CCCL to be downloaded. --- fetch_rapids.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fetch_rapids.cmake b/fetch_rapids.cmake index ca871c5759..2d09bf560b 100644 --- a/fetch_rapids.cmake +++ b/fetch_rapids.cmake @@ -1,5 +1,5 @@ # ============================================================================= -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at @@ -11,6 +11,8 @@ # or implied. See the License for the specific language governing permissions and limitations under # the License. # ============================================================================= +set(rapids-cmake-repo bdice/rapids-cmake) +set(rapids-cmake-branch cccl-download) if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/RAFT_RAPIDS.cmake) file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.02/RAPIDS.cmake ${CMAKE_CURRENT_BINARY_DIR}/RAFT_RAPIDS.cmake From 323decc052d4f51bae0da4e494bdd23edbdb6495 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 16 Jan 2024 14:47:52 -0800 Subject: [PATCH 07/19] Refactor dependencies for CUDA 12.*, 11.*. --- dependencies.yaml | 71 ++++++++++++----------------------------------- 1 file changed, 17 insertions(+), 54 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 40d0f7d1a0..9f24a86887 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -199,17 +199,12 @@ dependencies: - &cuda_python11 cuda-python>=11.7.1,<12.0a0 - output_types: [requirements, pyproject] matrices: - - matrix: {cuda: "12.2"} - packages: &build_pylibraft_packages_cu12 + - matrix: {cuda: "12.*"} + packages: - &rmm_cu12 rmm-cu12==24.2.* - - {matrix: {cuda: "12.1"}, packages: *build_pylibraft_packages_cu12} - - {matrix: {cuda: "12.0"}, packages: *build_pylibraft_packages_cu12} - - matrix: {cuda: "11.8"} - packages: &build_pylibraft_packages_cu11 + - matrix: {cuda: "11.*"} + packages: - &rmm_cu11 rmm-cu11==24.2.* - - {matrix: {cuda: "11.5"}, packages: *build_pylibraft_packages_cu11} - - {matrix: {cuda: "11.4"}, packages: *build_pylibraft_packages_cu11} - - {matrix: {cuda: "11.2"}, packages: *build_pylibraft_packages_cu11} - {matrix: null, packages: [*rmm_conda] } checks: common: @@ -350,34 +345,12 @@ dependencies: specific: - output_types: [requirements, pyproject] matrices: - # All CUDA 12 + x86_64 versions - - matrix: {cuda: "12.2", arch: x86_64} - packages: &cupy_packages_cu12_x86_64 - - &cupy_cu12_x86_64 cupy-cuda12x>=12.0.0 - - {matrix: {cuda: "12.1", arch: x86_64}, packages: *cupy_packages_cu12_x86_64} - - {matrix: {cuda: "12.0", arch: x86_64}, packages: *cupy_packages_cu12_x86_64} - # All CUDA 12 + aarch64 versions - - matrix: {cuda: "12.2", arch: aarch64} - packages: &cupy_packages_cu12_aarch64 - - &cupy_cu12_aarch64 cupy-cuda12x -f https://pip.cupy.dev/aarch64 # TODO: Verify that this works. - - {matrix: {cuda: "12.1", arch: aarch64}, packages: *cupy_packages_cu12_aarch64} - - {matrix: {cuda: "12.0", arch: aarch64}, packages: *cupy_packages_cu12_aarch64} - - # All CUDA 11 + x86_64 versions - - matrix: {cuda: "11.8", arch: x86_64} - packages: &cupy_packages_cu11_x86_64 + - matrix: {cuda: "12.*"} + packages: + - cupy-cuda12x>=12.0.0 + - matrix: {cuda: "11.*"} + packages: - cupy-cuda11x>=12.0.0 - - {matrix: {cuda: "11.5", arch: x86_64}, packages: *cupy_packages_cu11_x86_64} - - {matrix: {cuda: "11.4", arch: x86_64}, packages: *cupy_packages_cu11_x86_64} - - {matrix: {cuda: "11.2", arch: x86_64}, packages: *cupy_packages_cu11_x86_64} - - # All CUDA 11 + aarch64 versions - - matrix: {cuda: "11.8", arch: aarch64} - packages: &cupy_packages_cu11_aarch64 - - cupy-cuda11x -f https://pip.cupy.dev/aarch64 # TODO: Verify that this works. - - {matrix: {cuda: "11.5", arch: aarch64}, packages: *cupy_packages_cu11_aarch64} - - {matrix: {cuda: "11.4", arch: aarch64}, packages: *cupy_packages_cu11_aarch64} - - {matrix: {cuda: "11.2", arch: aarch64}, packages: *cupy_packages_cu11_aarch64} - {matrix: null, packages: [cupy-cuda11x>=12.0.0]} test_libraft: @@ -447,17 +420,12 @@ dependencies: - *cuda_python11 - output_types: [requirements, pyproject] matrices: - - matrix: {cuda: "12.2"} - packages: &run_pylibraft_packages_cu12 + - matrix: {cuda: "12.*"} + packages: - *rmm_cu12 - - {matrix: {cuda: "12.1"}, packages: *run_pylibraft_packages_cu12} - - {matrix: {cuda: "12.0"}, packages: *run_pylibraft_packages_cu12} - - matrix: {cuda: "11.8"} - packages: &run_pylibraft_packages_cu11 + - matrix: {cuda: "11.*"} + packages: - *rmm_cu11 - - {matrix: {cuda: "11.5"}, packages: *run_pylibraft_packages_cu11} - - {matrix: {cuda: "11.4"}, packages: *run_pylibraft_packages_cu11} - - {matrix: {cuda: "11.2"}, packages: *run_pylibraft_packages_cu11} - {matrix: null, packages: [*rmm_conda]} run_raft_dask: common: @@ -486,19 +454,14 @@ dependencies: specific: - output_types: [requirements, pyproject] matrices: - - matrix: {cuda: "12.2"} - packages: &run_raft_dask_packages_cu12 + - matrix: {cuda: "12.*"} + packages: - &pylibraft_cu12 pylibraft-cu12==24.2.* - &ucx_py_cu12 ucx-py-cu12==0.36.* - - {matrix: {cuda: "12.1"}, packages: *run_raft_dask_packages_cu12} - - {matrix: {cuda: "12.0"}, packages: *run_raft_dask_packages_cu12} - - matrix: {cuda: "11.8"} - packages: &run_raft_dask_packages_cu11 + - matrix: {cuda: "11.*"} + packages: - &pylibraft_cu11 pylibraft-cu11==24.2.* - &ucx_py_cu11 ucx-py-cu11==0.36.* - - {matrix: {cuda: "11.5"}, packages: *run_raft_dask_packages_cu11} - - {matrix: {cuda: "11.4"}, packages: *run_raft_dask_packages_cu11} - - {matrix: {cuda: "11.2"}, packages: *run_raft_dask_packages_cu11} - {matrix: null, packages: [*pylibraft_conda, *ucx_py_conda]} test_python_common: common: From dc463e9049680061871d248c66cb8f1905379d20 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 17 Jan 2024 14:51:25 -0800 Subject: [PATCH 08/19] revert fetch_rapids.cmake changes --- fetch_rapids.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fetch_rapids.cmake b/fetch_rapids.cmake index 2d09bf560b..ca871c5759 100644 --- a/fetch_rapids.cmake +++ b/fetch_rapids.cmake @@ -1,5 +1,5 @@ # ============================================================================= -# Copyright (c) 2022-2024, NVIDIA CORPORATION. +# Copyright (c) 2022-2023, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at @@ -11,8 +11,6 @@ # or implied. See the License for the specific language governing permissions and limitations under # the License. # ============================================================================= -set(rapids-cmake-repo bdice/rapids-cmake) -set(rapids-cmake-branch cccl-download) if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/RAFT_RAPIDS.cmake) file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.02/RAPIDS.cmake ${CMAKE_CURRENT_BINARY_DIR}/RAFT_RAPIDS.cmake From 6135a482ba4f6369bfb1844b542afd73c57b943f Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 22 Jan 2024 09:44:22 -0600 Subject: [PATCH 09/19] one more merge conflict --- .github/workflows/build.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 524ff3bbdd..2294b4193f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -46,11 +46,7 @@ jobs: upload-conda: needs: [cpp-build, python-build] secrets: inherit -<<<<<<< HEAD uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@test-cuda-12.2 -======= - uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.04 ->>>>>>> branch-24.04 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} From 3f28e0ec63c37f4bc2a951be7c384b8568018e02 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 22 Jan 2024 09:49:32 -0600 Subject: [PATCH 10/19] apply patch --- cpp/include/raft/sparse/linalg/spmm.hpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cpp/include/raft/sparse/linalg/spmm.hpp b/cpp/include/raft/sparse/linalg/spmm.hpp index c2fdd64574..44d890c35d 100644 --- a/cpp/include/raft/sparse/linalg/spmm.hpp +++ b/cpp/include/raft/sparse/linalg/spmm.hpp @@ -60,12 +60,19 @@ void spmm(raft::resources const& handle, { bool is_row_major = detail::is_row_major(y, z); + auto z_tmp = raft::make_device_matrix(handle, z.extent(0), z.extent(1)); + auto z_tmp_view = raft::make_device_strided_matrix_view( + z_tmp.data_handle(), z.extent(0), z.extent(1), is_row_major ? z.stride(0) : z.stride(1) + ); + auto descr_x = detail::create_descriptor(x); auto descr_y = detail::create_descriptor(y); - auto descr_z = detail::create_descriptor(z); + auto descr_z = detail::create_descriptor(z_tmp_view); detail::spmm(handle, trans_x, trans_y, is_row_major, alpha, descr_x, descr_y, beta, descr_z); + raft::copy(z.data_handle(), z_tmp.data_handle(), z_tmp.size(), raft::resource::get_cuda_stream(handle)); + RAFT_CUSPARSE_TRY_NO_THROW(cusparseDestroySpMat(descr_x)); RAFT_CUSPARSE_TRY_NO_THROW(cusparseDestroyDnMat(descr_y)); RAFT_CUSPARSE_TRY_NO_THROW(cusparseDestroyDnMat(descr_z)); From fc0210f737aa58704afb88e265cd8e580e3dd406 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 22 Jan 2024 10:08:58 -0600 Subject: [PATCH 11/19] formatting --- cpp/include/raft/sparse/linalg/spmm.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp/include/raft/sparse/linalg/spmm.hpp b/cpp/include/raft/sparse/linalg/spmm.hpp index 44d890c35d..7d6f588427 100644 --- a/cpp/include/raft/sparse/linalg/spmm.hpp +++ b/cpp/include/raft/sparse/linalg/spmm.hpp @@ -62,8 +62,7 @@ void spmm(raft::resources const& handle, auto z_tmp = raft::make_device_matrix(handle, z.extent(0), z.extent(1)); auto z_tmp_view = raft::make_device_strided_matrix_view( - z_tmp.data_handle(), z.extent(0), z.extent(1), is_row_major ? z.stride(0) : z.stride(1) - ); + z_tmp.data_handle(), z.extent(0), z.extent(1), is_row_major ? z.stride(0) : z.stride(1)); auto descr_x = detail::create_descriptor(x); auto descr_y = detail::create_descriptor(y); @@ -71,7 +70,8 @@ void spmm(raft::resources const& handle, detail::spmm(handle, trans_x, trans_y, is_row_major, alpha, descr_x, descr_y, beta, descr_z); - raft::copy(z.data_handle(), z_tmp.data_handle(), z_tmp.size(), raft::resource::get_cuda_stream(handle)); + raft::copy( + z.data_handle(), z_tmp.data_handle(), z_tmp.size(), raft::resource::get_cuda_stream(handle)); RAFT_CUSPARSE_TRY_NO_THROW(cusparseDestroySpMat(descr_x)); RAFT_CUSPARSE_TRY_NO_THROW(cusparseDestroyDnMat(descr_y)); From 8ea385814828c43f8c9fb129c1e642476d8dd1b2 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 22 Jan 2024 12:23:34 -0600 Subject: [PATCH 12/19] update to branch-24.04 dependencies --- dependencies.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 8922ea1847..cc6e0e126b 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -201,10 +201,10 @@ dependencies: matrices: - matrix: {cuda: "12.*"} packages: - - &rmm_cu12 rmm-cu12==24.2.* + - &rmm_cu12 rmm-cu12==24.4.* - matrix: {cuda: "11.*"} packages: - - &rmm_cu11 rmm-cu11==24.2.* + - &rmm_cu11 rmm-cu11==24.4.* - {matrix: null, packages: [*rmm_conda] } checks: common: @@ -456,12 +456,12 @@ dependencies: matrices: - matrix: {cuda: "12.*"} packages: - - &pylibraft_cu12 pylibraft-cu12==24.2.* - - &ucx_py_cu12 ucx-py-cu12==0.36.* + - &pylibraft_cu12 pylibraft-cu12==24.4.* + - &ucx_py_cu12 ucx-py-cu12==0.37.* - matrix: {cuda: "11.*"} packages: - - &pylibraft_cu11 pylibraft-cu11==24.2.* - - &ucx_py_cu11 ucx-py-cu11==0.36.* + - &pylibraft_cu11 pylibraft-cu11==24.4.* + - &ucx_py_cu11 ucx-py-cu11==0.37.* - {matrix: null, packages: [*pylibraft_conda, *ucx_py_conda]} test_python_common: common: From c28e84752d934da772c9a40e2017be752cdfb348 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 24 Jan 2024 16:16:47 -0600 Subject: [PATCH 13/19] remove copy --- cpp/include/raft/sparse/linalg/spmm.hpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/cpp/include/raft/sparse/linalg/spmm.hpp b/cpp/include/raft/sparse/linalg/spmm.hpp index 8df963828a..03c97fdb9d 100644 --- a/cpp/include/raft/sparse/linalg/spmm.hpp +++ b/cpp/include/raft/sparse/linalg/spmm.hpp @@ -69,9 +69,6 @@ void spmm(raft::resources const& handle, detail::spmm(handle, trans_x, trans_y, is_row_major, alpha, descr_x, descr_y, beta, descr_z); - raft::copy( - z.data_handle(), z_tmp.data_handle(), z_tmp.size(), raft::resource::get_cuda_stream(handle)); - RAFT_CUSPARSE_TRY_NO_THROW(cusparseDestroySpMat(descr_x)); RAFT_CUSPARSE_TRY_NO_THROW(cusparseDestroyDnMat(descr_y)); RAFT_CUSPARSE_TRY_NO_THROW(cusparseDestroyDnMat(descr_z)); From b996aec1585b3211647a443b12db5f23426b20fd Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 24 Jan 2024 16:29:20 -0600 Subject: [PATCH 14/19] constrain build dependencies by cuda_version --- dependencies.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dependencies.yaml b/dependencies.yaml index cc6e0e126b..1e0a6e5b75 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -66,6 +66,7 @@ files: includes: - build - build_pylibraft + - cuda_version py_run_pylibraft: output: pyproject pyproject_dir: python/pylibraft @@ -90,6 +91,7 @@ files: table: build-system includes: - build + - cuda_version py_run_raft_dask: output: pyproject pyproject_dir: python/raft-dask From 08c0e8df33e4c596430c4b1230c568db18566d5c Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 24 Jan 2024 16:29:57 -0600 Subject: [PATCH 15/19] Revert "constrain build dependencies by cuda_version" This reverts commit b996aec1585b3211647a443b12db5f23426b20fd. --- dependencies.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 1e0a6e5b75..cc6e0e126b 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -66,7 +66,6 @@ files: includes: - build - build_pylibraft - - cuda_version py_run_pylibraft: output: pyproject pyproject_dir: python/pylibraft @@ -91,7 +90,6 @@ files: table: build-system includes: - build - - cuda_version py_run_raft_dask: output: pyproject pyproject_dir: python/raft-dask From 575052cd8a3433c73d340ed5b2d9357bd5f6333c Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 6 Feb 2024 08:16:44 -0600 Subject: [PATCH 16/19] Ignore run-exports from CUDA 12 compiler. --- conda/recipes/libraft/meta.yaml | 12 ++++++++++++ conda/recipes/pylibraft/meta.yaml | 4 +++- conda/recipes/raft-ann-bench/meta.yaml | 4 +++- conda/recipes/raft-dask/meta.yaml | 4 +++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/conda/recipes/libraft/meta.yaml b/conda/recipes/libraft/meta.yaml index 1f2108c397..735f0cdcb2 100644 --- a/conda/recipes/libraft/meta.yaml +++ b/conda/recipes/libraft/meta.yaml @@ -42,6 +42,8 @@ outputs: ignore_run_exports_from: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} + {% else %} + - {{ compiler('cuda') }} {% endif %} - librmm requirements: @@ -82,6 +84,8 @@ outputs: ignore_run_exports_from: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} + {% else %} + - {{ compiler('cuda') }} {% endif %} - librmm requirements: @@ -124,6 +128,8 @@ outputs: ignore_run_exports_from: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} + {% else %} + - {{ compiler('cuda') }} {% endif %} requirements: build: @@ -175,6 +181,8 @@ outputs: ignore_run_exports_from: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} + {% else %} + - {{ compiler('cuda') }} {% endif %} requirements: build: @@ -226,6 +234,8 @@ outputs: ignore_run_exports_from: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} + {% else %} + - {{ compiler('cuda') }} {% endif %} requirements: build: @@ -285,6 +295,8 @@ outputs: ignore_run_exports_from: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} + {% else %} + - {{ compiler('cuda') }} {% endif %} requirements: build: diff --git a/conda/recipes/pylibraft/meta.yaml b/conda/recipes/pylibraft/meta.yaml index c736ffb877..d480ad422c 100644 --- a/conda/recipes/pylibraft/meta.yaml +++ b/conda/recipes/pylibraft/meta.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # Usage: # conda build . -c conda-forge -c numba -c rapidsai -c pytorch @@ -22,6 +22,8 @@ build: ignore_run_exports_from: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} + {% else %} + - {{ compiler('cuda') }} {% endif %} requirements: diff --git a/conda/recipes/raft-ann-bench/meta.yaml b/conda/recipes/raft-ann-bench/meta.yaml index bf89afbcc1..4725e9925a 100644 --- a/conda/recipes/raft-ann-bench/meta.yaml +++ b/conda/recipes/raft-ann-bench/meta.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # Usage: # conda build . -c conda-forge -c nvidia -c rapidsai @@ -40,6 +40,8 @@ build: ignore_run_exports_from: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} + {% else %} + - {{ compiler('cuda') }} {% endif %} requirements: diff --git a/conda/recipes/raft-dask/meta.yaml b/conda/recipes/raft-dask/meta.yaml index 944b500428..4bb1bba0de 100644 --- a/conda/recipes/raft-dask/meta.yaml +++ b/conda/recipes/raft-dask/meta.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # Usage: # conda build . -c conda-forge -c numba -c rapidsai -c pytorch @@ -22,6 +22,8 @@ build: ignore_run_exports_from: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} + {% else %} + - {{ compiler('cuda') }} {% endif %} requirements: From dfd9d2ccd33b16b154e97537bd3b547afcb1eab5 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 6 Feb 2024 09:15:24 -0600 Subject: [PATCH 17/19] Refactor cuda_spec. --- conda/recipes/libraft/meta.yaml | 1 - conda/recipes/raft-ann-bench/meta.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/conda/recipes/libraft/meta.yaml b/conda/recipes/libraft/meta.yaml index 735f0cdcb2..dba91536d7 100644 --- a/conda/recipes/libraft/meta.yaml +++ b/conda/recipes/libraft/meta.yaml @@ -6,7 +6,6 @@ {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %} {% set cuda_major = cuda_version.split('.')[0] %} -{% set cuda_spec = ">=" + cuda_major ~ ",<" + (cuda_major | int + 1) ~ ".0a0" %} # i.e. >=11,<12.0a0 {% set date_string = environ['RAPIDS_DATE_STRING'] %} package: diff --git a/conda/recipes/raft-ann-bench/meta.yaml b/conda/recipes/raft-ann-bench/meta.yaml index 4725e9925a..dcc658dead 100644 --- a/conda/recipes/raft-ann-bench/meta.yaml +++ b/conda/recipes/raft-ann-bench/meta.yaml @@ -7,7 +7,6 @@ {% set py_version = environ['CONDA_PY'] %} {% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %} {% set cuda_major = cuda_version.split('.')[0] %} -{% set cuda_spec = ">=" + cuda_major ~ ",<" + (cuda_major | int + 1) ~ ".0a0" %} # i.e. >=11,<12.0a0 {% set date_string = environ['RAPIDS_DATE_STRING'] %} package: From fc109695bd4fc7ea360b79ab84e3bdb2a862b4ac Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 6 Feb 2024 09:15:39 -0600 Subject: [PATCH 18/19] Loosen run-exports from -dev libraries. --- conda/recipes/libraft/meta.yaml | 35 +++++++++++++++++++++++--- conda/recipes/raft-ann-bench/meta.yaml | 3 +++ 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/conda/recipes/libraft/meta.yaml b/conda/recipes/libraft/meta.yaml index dba91536d7..a0a576a0a6 100644 --- a/conda/recipes/libraft/meta.yaml +++ b/conda/recipes/libraft/meta.yaml @@ -59,14 +59,13 @@ outputs: - ninja - sysroot_{{ target_platform }} {{ sysroot_version }} host: - {% if cuda_major != "11" %} - - cuda-cudart-dev - {% endif %} - cuda-version ={{ cuda_version }} run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} - cudatoolkit + {% else %} + - cuda-cudart {% endif %} - librmm ={{ minor_version }} - spdlog {{ spdlog_version }} @@ -129,6 +128,10 @@ outputs: - {{ compiler('cuda11') }} {% else %} - {{ compiler('cuda') }} + - libcublas-dev + - libcurand-dev + - libcusolver-dev + - libcusparse-dev {% endif %} requirements: build: @@ -166,6 +169,12 @@ outputs: run: - {{ pin_subpackage('libraft-headers', exact=True) }} - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} + {% if cuda_major != "11" %} + - libcublas + - libcurand + - libcusolver + - libcusparse + {% endif %} about: home: https://rapids.ai/ license: Apache-2.0 @@ -219,6 +228,12 @@ outputs: run: - {{ pin_subpackage('libraft-headers', exact=True) }} - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} + {% if cuda_major != "11" %} + - libcublas + - libcurand + - libcusolver + - libcusparse + {% endif %} about: home: https://rapids.ai/ license: Apache-2.0 @@ -235,6 +250,10 @@ outputs: - {{ compiler('cuda11') }} {% else %} - {{ compiler('cuda') }} + - libcublas-dev + - libcurand-dev + - libcusolver-dev + - libcusparse-dev {% endif %} requirements: build: @@ -263,7 +282,6 @@ outputs: - libcusparse {{ cuda11_libcusparse_host_version }} - libcusparse-dev {{ cuda11_libcusparse_host_version }} {% else %} - - cuda-cudart-dev - cuda-profiler-api - libcublas-dev - libcurand-dev @@ -276,6 +294,12 @@ outputs: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} - cudatoolkit + {% else %} + - cuda-cudart + - libcublas + - libcurand + - libcusolver + - libcusparse {% endif %} - {{ pin_subpackage('libraft', exact=True) }} - gmock {{ gtest_version }} @@ -296,6 +320,7 @@ outputs: - {{ compiler('cuda11') }} {% else %} - {{ compiler('cuda') }} + - libcublas-dev {% endif %} requirements: build: @@ -326,6 +351,8 @@ outputs: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} - cudatoolkit + {% else %} + - libcublas {% endif %} - {{ pin_subpackage('libraft', exact=True) }} about: diff --git a/conda/recipes/raft-ann-bench/meta.yaml b/conda/recipes/raft-ann-bench/meta.yaml index dcc658dead..781aed0b1e 100644 --- a/conda/recipes/raft-ann-bench/meta.yaml +++ b/conda/recipes/raft-ann-bench/meta.yaml @@ -41,6 +41,7 @@ build: - {{ compiler('cuda11') }} {% else %} - {{ compiler('cuda') }} + - libcublas-dev {% endif %} requirements: @@ -86,6 +87,8 @@ requirements: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} - cudatoolkit + {% else %} + - libcublas {% endif %} - glog {{ glog_version }} - h5py {{ h5py_version }} From 0c6b01378dbcb062364344a78c1cea1bd3e14ad7 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 8 Feb 2024 00:12:20 -0600 Subject: [PATCH 19/19] Add cuda-cudart-dev with run-exports ignored. --- conda/recipes/libraft/meta.yaml | 15 +++++++++++++++ conda/recipes/pylibraft/meta.yaml | 4 ++++ conda/recipes/raft-ann-bench/meta.yaml | 3 +++ conda/recipes/raft-dask/meta.yaml | 4 ++++ 4 files changed, 26 insertions(+) diff --git a/conda/recipes/libraft/meta.yaml b/conda/recipes/libraft/meta.yaml index a0a576a0a6..7fd1705b7b 100644 --- a/conda/recipes/libraft/meta.yaml +++ b/conda/recipes/libraft/meta.yaml @@ -43,6 +43,7 @@ outputs: - {{ compiler('cuda11') }} {% else %} - {{ compiler('cuda') }} + - cuda-cudart-dev {% endif %} - librmm requirements: @@ -60,6 +61,9 @@ outputs: - sysroot_{{ target_platform }} {{ sysroot_version }} host: - cuda-version ={{ cuda_version }} + {% if cuda_major != "11" %} + - cuda-cudart-dev + {% endif %} run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} @@ -128,6 +132,7 @@ outputs: - {{ compiler('cuda11') }} {% else %} - {{ compiler('cuda') }} + - cuda-cudart-dev - libcublas-dev - libcurand-dev - libcusolver-dev @@ -160,6 +165,7 @@ outputs: - libcusparse {{ cuda11_libcusparse_host_version }} - libcusparse-dev {{ cuda11_libcusparse_host_version }} {% else %} + - cuda-cudart-dev - cuda-profiler-api - libcublas-dev - libcurand-dev @@ -170,6 +176,7 @@ outputs: - {{ pin_subpackage('libraft-headers', exact=True) }} - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major != "11" %} + - cuda-cudart - libcublas - libcurand - libcusolver @@ -191,6 +198,7 @@ outputs: - {{ compiler('cuda11') }} {% else %} - {{ compiler('cuda') }} + - cuda-cudart-dev {% endif %} requirements: build: @@ -219,6 +227,7 @@ outputs: - libcusparse {{ cuda11_libcusparse_host_version }} - libcusparse-dev {{ cuda11_libcusparse_host_version }} {% else %} + - cuda-cudart-dev - cuda-profiler-api - libcublas-dev - libcurand-dev @@ -229,6 +238,7 @@ outputs: - {{ pin_subpackage('libraft-headers', exact=True) }} - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major != "11" %} + - cuda-cudart - libcublas - libcurand - libcusolver @@ -250,6 +260,7 @@ outputs: - {{ compiler('cuda11') }} {% else %} - {{ compiler('cuda') }} + - cuda-cudart-dev - libcublas-dev - libcurand-dev - libcusolver-dev @@ -282,6 +293,7 @@ outputs: - libcusparse {{ cuda11_libcusparse_host_version }} - libcusparse-dev {{ cuda11_libcusparse_host_version }} {% else %} + - cuda-cudart-dev - cuda-profiler-api - libcublas-dev - libcurand-dev @@ -320,6 +332,7 @@ outputs: - {{ compiler('cuda11') }} {% else %} - {{ compiler('cuda') }} + - cuda-cudart-dev - libcublas-dev {% endif %} requirements: @@ -344,6 +357,7 @@ outputs: - libcublas {{ cuda11_libcublas_host_version }} - libcublas-dev {{ cuda11_libcublas_host_version }} {% else %} + - cuda-cudart-dev - cuda-profiler-api - libcublas-dev {% endif %} @@ -352,6 +366,7 @@ outputs: {% if cuda_major == "11" %} - cudatoolkit {% else %} + - cuda-cudart - libcublas {% endif %} - {{ pin_subpackage('libraft', exact=True) }} diff --git a/conda/recipes/pylibraft/meta.yaml b/conda/recipes/pylibraft/meta.yaml index d480ad422c..d2b709172e 100644 --- a/conda/recipes/pylibraft/meta.yaml +++ b/conda/recipes/pylibraft/meta.yaml @@ -24,6 +24,7 @@ build: - {{ compiler('cuda11') }} {% else %} - {{ compiler('cuda') }} + - cuda-cudart-dev {% endif %} requirements: @@ -45,6 +46,7 @@ requirements: - cudatoolkit {% else %} - cuda-python >=12.0,<13.0a0 + - cuda-cudart-dev {% endif %} - cuda-version ={{ cuda_version }} - cython >=3.0.0 @@ -58,6 +60,8 @@ requirements: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} - cudatoolkit + {% else %} + - cuda-cudart {% endif %} - libraft {{ version }} - libraft-headers {{ version }} diff --git a/conda/recipes/raft-ann-bench/meta.yaml b/conda/recipes/raft-ann-bench/meta.yaml index 781aed0b1e..ec24501475 100644 --- a/conda/recipes/raft-ann-bench/meta.yaml +++ b/conda/recipes/raft-ann-bench/meta.yaml @@ -41,6 +41,7 @@ build: - {{ compiler('cuda11') }} {% else %} - {{ compiler('cuda') }} + - cuda-cudart-dev - libcublas-dev {% endif %} @@ -67,6 +68,7 @@ requirements: - libcublas {{ cuda11_libcublas_host_version }} - libcublas-dev {{ cuda11_libcublas_host_version }} {% else %} + - cuda-cudart-dev - cuda-profiler-api - libcublas-dev {% endif %} @@ -88,6 +90,7 @@ requirements: {% if cuda_major == "11" %} - cudatoolkit {% else %} + - cuda-cudart - libcublas {% endif %} - glog {{ glog_version }} diff --git a/conda/recipes/raft-dask/meta.yaml b/conda/recipes/raft-dask/meta.yaml index 4bb1bba0de..6910905d07 100644 --- a/conda/recipes/raft-dask/meta.yaml +++ b/conda/recipes/raft-dask/meta.yaml @@ -24,6 +24,7 @@ build: - {{ compiler('cuda11') }} {% else %} - {{ compiler('cuda') }} + - cuda-cudart-dev {% endif %} requirements: @@ -45,6 +46,7 @@ requirements: - cudatoolkit {% else %} - cuda-python >=12.0,<13.0a0 + - cuda-cudart-dev {% endif %} - cuda-version ={{ cuda_version }} - cython >=3.0.0 @@ -60,6 +62,8 @@ requirements: run: {% if cuda_major == "11" %} - cudatoolkit + {% else %} + - cuda-cudart {% endif %} - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} - dask-cuda ={{ minor_version }}