Build CUDA 11.8 and Python 3.10 Packages (#5120)

This PR updates `cuml` to build against branch [cuda-118](https://github.com/rapidsai/shared-action-workflows/compare/cuda-118) of the `shared-action-workflow` repository. That branch contains updates for CUDA 11.8 and Python 3.10 packages. It also includes some minor file renames. Depends on rapidsai/raft#1120 Authors: - Bradley Dice (https://github.com/bdice) - Corey J. Nolet (https://github.com/cjnolet) - AJ Schmidt (https://github.com/ajschmidt8) - Micka (https://github.com/lowener) - Dante Gama Dessavre (https://github.com/dantegd) - William Hicks (https://github.com/wphicks) - Victor Lafargue (https://github.com/viclafargue) Approvers: - Dante Gama Dessavre (https://github.com/dantegd) - AJ Schmidt (https://github.com/ajschmidt8) URL: #5120
rapidsai · Jan 30, 2023 · 5dacb91 · 5dacb91
1 parent 79d0b9e
commit 5dacb91
Show file tree

Hide file tree

Showing 125 changed files with 756 additions and 769 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -28,7 +28,7 @@ concurrency:
 jobs:
   cpp-build:
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-matrix-build.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@cuda-118
     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-action-workflows/.github/workflows/conda-python-matrix-build.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-118
     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-action-workflows/.github/workflows/conda-upload-packages.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@cuda-118
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -22,46 +22,46 @@ jobs:
       - wheel-build-cuml
       - wheel-tests-cuml
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@cuda-118
   checks:
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@cuda-118
   conda-cpp-build:
     needs: checks
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-matrix-build.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@cuda-118
     with:
       build_type: pull-request
   conda-cpp-tests:
     needs: conda-cpp-build
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-118
     with:
       build_type: pull-request
   conda-python-build:
     needs: conda-cpp-build
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-matrix-build.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-118
     with:
       build_type: pull-request
   conda-python-tests-singlegpu:
     needs: conda-python-build
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-118
     with:
       build_type: pull-request
       test_script: "ci/test_python_singlegpu.sh"
   conda-python-tests-dask:
     needs: conda-python-build
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-118
     with:
       build_type: pull-request
       test_script: "ci/test_python_dask.sh"
   conda-notebook-tests:
     needs: conda-python-build
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-118
     with:
       build_type: pull-request
       node_type: "gpu-latest-1"

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -16,15 +16,15 @@ on:
 jobs:
   conda-cpp-tests:
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-118
     with:
       build_type: nightly
       branch: ${{ inputs.branch }}
       date: ${{ inputs.date }}
       sha: ${{ inputs.sha }}
   conda-python-tests-singlegpu:
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-118
     with:
       build_type: nightly
       branch: ${{ inputs.branch }}
@@ -33,7 +33,7 @@ jobs:
       test_script: "ci/test_python_singlegpu.sh"
   conda-python-tests-dask:
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-118
     with:
       build_type: nightly
       branch: ${{ inputs.branch }}

diff --git a/...nvironments/all_cuda-115_arch-x86_64.yaml → ...nvironments/all_cuda-118_arch-x86_64.yaml b/...nvironments/all_cuda-115_arch-x86_64.yaml → ...nvironments/all_cuda-118_arch-x86_64.yaml
@@ -10,7 +10,7 @@ dependencies:
 - c-compiler
 - cmake>=3.23.1,!=3.25.0
 - cuda-python>=11.7.1,<12.0
-- cudatoolkit=11.5
+- cudatoolkit=11.8
 - cudf=23.02.*
 - cupy>=7.8.0,<12.0.0a0
 - cxx-compiler
@@ -26,18 +26,18 @@ dependencies:
 - hdbscan
 - hypothesis>=6.0,<7
 - joblib>=0.11
-- libcublas-dev>=11.7.3.1,<=11.7.4.6
-- libcublas>=11.7.3.1,<=11.7.4.6
-- libcufft-dev>=10.6.0.54,<=10.6.0.107
-- libcufft>=10.6.0.54,<=10.6.0.107
+- libcublas-dev=11.11.3.6
+- libcublas=11.11.3.6
+- libcufft-dev=10.9.0.58
+- libcufft=10.9.0.58
 - libcumlprims=23.02.*
-- libcurand-dev>=10.2.6.48,<=10.2.7.107
-- libcurand>=10.2.6.48,<=10.2.7.107
-- libcusolver-dev>=11.2.1.48,<=11.3.2.107
-- libcusolver>=11.2.1.48,<=11.3.2.107
-- libcusparse-dev>=11.7.0.31,<=11.7.0.107
-- libcusparse>=11.7.0.31,<=11.7.0.107
-- libfaiss>=1.7.0
+- libcurand-dev=10.3.0.86
+- libcurand=10.3.0.86
+- libcusolver-dev=11.4.1.48
+- libcusolver=11.4.1.48
+- libcusparse-dev=11.7.5.86
+- libcusparse=11.7.5.86
+- libfaiss>=1.7.1
 - libraft-distance=23.02.*
 - libraft-headers=23.02.*
 - libraft-nn=23.02.*
@@ -50,7 +50,7 @@ dependencies:
 - pytest-cases
 - pytest-cov
 - pytest-xdist
-- python>=3.8,<3.10
+- python>=3.8,<3.11
 - raft-dask=23.02.*
 - rmm=23.02.*
 - scikit-build>=0.13.1
@@ -64,4 +64,4 @@ dependencies:
 - umap-learn
 - pip:
   - git+https://github.com/dask/dask-glm@main
-name: all_cuda-115_arch-x86_64
+name: all_cuda-118_arch-x86_64
diff --git a/...onments/cpp_all_cuda-115_arch-x86_64.yaml → ...onments/cpp_all_cuda-118_arch-x86_64.yaml b/...onments/cpp_all_cuda-115_arch-x86_64.yaml → ...onments/cpp_all_cuda-118_arch-x86_64.yaml
@@ -9,26 +9,26 @@ channels:
 dependencies:
 - c-compiler
 - cmake>=3.23.1,!=3.25.0
-- cudatoolkit=11.5
+- cudatoolkit=11.8
 - cxx-compiler
 - faiss-proc=*=cuda
 - gcc_linux-64=9.*
-- libcublas-dev>=11.7.3.1,<=11.7.4.6
-- libcublas>=11.7.3.1,<=11.7.4.6
-- libcufft-dev>=10.6.0.54,<=10.6.0.107
-- libcufft>=10.6.0.54,<=10.6.0.107
+- libcublas-dev=11.11.3.6
+- libcublas=11.11.3.6
+- libcufft-dev=10.9.0.58
+- libcufft=10.9.0.58
 - libcumlprims=23.02.*
-- libcurand-dev>=10.2.6.48,<=10.2.7.107
-- libcurand>=10.2.6.48,<=10.2.7.107
-- libcusolver-dev>=11.2.1.48,<=11.3.2.107
-- libcusolver>=11.2.1.48,<=11.3.2.107
-- libcusparse-dev>=11.7.0.31,<=11.7.0.107
-- libcusparse>=11.7.0.31,<=11.7.0.107
-- libfaiss>=1.7.0
+- libcurand-dev=10.3.0.86
+- libcurand=10.3.0.86
+- libcusolver-dev=11.4.1.48
+- libcusolver=11.4.1.48
+- libcusparse-dev=11.7.5.86
+- libcusparse=11.7.5.86
+- libfaiss>=1.7.1
 - libraft-distance=23.02.*
 - libraft-headers=23.02.*
 - libraft-nn=23.02.*
 - ninja
 - rmm=23.02.*
 - sysroot_linux-64==2.17
-name: cpp_all_cuda-115_arch-x86_64
+name: cpp_all_cuda-118_arch-x86_64
diff --git a/conda/recipes/cuml/conda_build_config.yaml b/conda/recipes/cuml/conda_build_config.yaml
@@ -14,20 +14,20 @@ sysroot_version:
   - "=2.17"
 
 # The CTK libraries below are missing from the conda-forge::cudatoolkit
-# package. The "*_host_*" version specifiers correspond to `11.5` packages and the
+# package. The "*_host_*" version specifiers correspond to `11.8` packages and the
 # "*_run_*" version specifiers correspond to `11.x` packages.
 
 libcublas_host_version:
-  - ">=11.7.3.1,<=11.7.4.6"
+  - "=11.11.3.6"
 
 libcurand_host_version:
-  - ">=10.2.6.48,<=10.2.7.107"
+  - "=10.3.0.86"
 
 libcusolver_host_version:
-  - ">=11.2.1.48,<=11.3.2.107"
+  - "=11.4.1.48"
 
 libcusparse_host_version:
-  - ">=11.7.0.31,<=11.7.0.107"
+  - "=11.7.5.86"
 
 treelite_version:
   - "=3.1.0"
diff --git a/conda/recipes/libcuml/conda_build_config.yaml b/conda/recipes/libcuml/conda_build_config.yaml
@@ -20,38 +20,38 @@ gtest_version:
   - "=1.10.0"
 
 libfaiss_version:
-  - "=1.7.0"
+  - "=1.7.2 *_cuda"
 
 # The CTK libraries below are missing from the conda-forge::cudatoolkit
-# package. The "*_host_*" version specifiers correspond to `11.5` packages and the
+# package. The "*_host_*" version specifiers correspond to `11.8` packages and the
 # "*_run_*" version specifiers correspond to `11.x` packages.
 
 libcublas_host_version:
-  - ">=11.7.3.1,<=11.7.4.6"
+  - "=11.11.3.6"
 
 libcublas_run_version:
   - ">=11.5.2.43,<=11.11.3.6"
 
 libcusolver_host_version:
-  - ">=11.2.1.48,<=11.3.2.107"
+  - "=11.4.1.48"
 
 libcusolver_run_version:
   - ">=11.2.0.43,<=11.4.1.48"
 
 libcusparse_host_version:
-  - ">=11.7.0.31,<=11.7.0.107"
+  - "=11.7.5.86"
 
 libcusparse_run_version:
   - ">=11.6.0.43,<=11.7.5.86"
 
 libcurand_host_version:
-  - ">=10.2.6.48,<=10.2.7.107"
+  - "=10.3.0.86"
 
 libcurand_run_version:
   - ">=10.2.5.43,<=10.3.0.86"
 
 libcufft_host_version:
-  - ">=10.6.0.54,<=10.6.0.107"
+  - "=10.9.0.58"
 
 libcufft_run_version:
   - ">=10.5.0.43,<=10.9.0.58"
diff --git a/conda/recipes/libcuml/meta.yaml b/conda/recipes/libcuml/meta.yaml
@@ -55,7 +55,7 @@ requirements:
     - libcusolver-dev {{ libcusolver_host_version }}
     - libcusparse {{ libcusparse_host_version }}
     - libcusparse-dev {{ libcusparse_host_version }}
-    - libfaiss {{ libfaiss_version }} *_cuda
+    - libfaiss {{ libfaiss_version }}
     - libraft-distance ={{ minor_version }}
     - libraft-headers ={{ minor_version }}
     - libraft-nn ={{ minor_version }}
@@ -84,7 +84,7 @@ outputs:
         - libcurand {{ libcurand_run_version }}
         - libcusparse {{ libcusparse_run_version }}
         - libcusparse-dev {{ libcusparse_run_version }}
-        - libfaiss {{ libfaiss_version }} *_cuda
+        - libfaiss {{ libfaiss_version }}
         - libraft-distance ={{ minor_version }}
         - libraft-headers ={{ minor_version }}
         - libraft-nn ={{ minor_version }}

diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake
@@ -92,8 +92,8 @@ endfunction()
 # To use a different RAFT locally, set the CMake variable
 # CPM_raft_SOURCE=/path/to/local/raft
 find_and_configure_raft(VERSION          ${CUML_MIN_VERSION_raft}
-                        FORK             rapidsai
-                        PINNED_TAG       branch-${CUML_BRANCH_VERSION_raft}
+                        FORK             cjnolet
+                        PINNED_TAG       imp-2302-raft_device_resources
                         EXCLUDE_FROM_ALL ${CUML_EXCLUDE_RAFT_FROM_ALL}
                         # When PINNED_TAG above doesn't match cuml,
                         # force local raft clone in build directory

diff --git a/cpp/src/datasets/make_arima.cu b/cpp/src/datasets/make_arima.cu
@@ -15,6 +15,7 @@
  */
 
 #include <cuml/datasets/make_arima.hpp>
+#include <raft/core/handle.hpp>
 #include <random/make_arima.cuh>
 
 namespace ML {

diff --git a/cpp/src/datasets/make_blobs.cu b/cpp/src/datasets/make_blobs.cu
@@ -15,6 +15,7 @@
  */
 
 #include <cuml/datasets/make_blobs.hpp>
+#include <raft/core/handle.hpp>
 #include <raft/random/make_blobs.cuh>
 
 namespace ML {

diff --git a/cpp/src/datasets/make_regression.cu b/cpp/src/datasets/make_regression.cu
@@ -15,6 +15,7 @@
  */
 
 #include <cuml/datasets/make_regression.hpp>
+#include <raft/core/handle.hpp>
 #include <raft/random/make_regression.cuh>
 
 namespace ML {

diff --git a/cpp/src/glm/preprocess.cuh b/cpp/src/glm/preprocess.cuh
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <raft/core/handle.hpp>
 #include <raft/linalg/gemm.cuh>
 #include <raft/linalg/norm.cuh>
 #include <raft/matrix/math.cuh>

diff --git a/cpp/src/hierarchy/linkage.cu b/cpp/src/hierarchy/linkage.cu
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-#include "pw_dist_graph.cuh"
 #include <cuml/cluster/linkage.hpp>
-#include <raft/cluster/single_linkage.cuh>
 
-namespace raft {
-class handle_t;
-}
+#include <raft/cluster/single_linkage.cuh>
+#include <raft/core/handle.hpp>
+#include <raft/distance/specializations.cuh>
 
 namespace ML {