Updates to fix cuml build (rapidsai#4928)

Authors: - Corey J. Nolet (https://github.com/cjnolet) Approvers: - Dante Gama Dessavre (https://github.com/dantegd) - Ray Douglass (https://github.com/raydouglass) URL: rapidsai#4928
jakirkham · Oct 14, 2022 · 9a2e14c · 9a2e14c
1 parent eeb4d7c
commit 9a2e14c
Show file tree

Hide file tree

Showing 21 changed files with 14 additions and 1,002 deletions.
diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh
@@ -67,7 +67,7 @@ gpuci_mamba_retry install -c conda-forge -c rapidsai -c rapidsai-nightly -c nvid
       "dask-cuda=${MINOR_VERSION}" \
       "ucx-py=${UCX_PY_VERSION}" \
       "ucx-proc=*=gpu" \
-      "xgboost=1.6.0dev.rapidsai${MINOR_VERSION}" \
+      "xgboost=1.6.2dev.rapidsai${MINOR_VERSION}" \
       "rapids-build-env=${MINOR_VERSION}.*" \
       "rapids-notebook-env=${MINOR_VERSION}.*" \
       "shap>=0.37,<=0.39"

diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
@@ -50,7 +50,8 @@ for FILE in conda/environments/*.yml; do
    sed_runner "s/libraft-headers=${CURRENT_SHORT_TAG}/libraft-headers=${NEXT_SHORT_TAG}/g" ${FILE};
    sed_runner "s/libraft-distance=${CURRENT_SHORT_TAG}/libraft-distance=${NEXT_SHORT_TAG}/g" ${FILE};
    sed_runner "s/libraft-nn=${CURRENT_SHORT_TAG}/libraft-nn=${NEXT_SHORT_TAG}/g" ${FILE};
-   sed_runner "s/pyraft=${CURRENT_SHORT_TAG}/pyraft=${NEXT_SHORT_TAG}/g" ${FILE};
+   sed_runner "s/raft-dask=${CURRENT_SHORT_TAG}/raft-dask=${NEXT_SHORT_TAG}/g" ${FILE};
+   sed_runner "s/pylibraft=${CURRENT_SHORT_TAG}/pylibraft=${NEXT_SHORT_TAG}/g" ${FILE};
    sed_runner "s/rapids-build-env=${CURRENT_SHORT_TAG}/rapids-build-env=${NEXT_SHORT_TAG}/g" ${FILE};
    sed_runner "s/rapids-notebook-env=${CURRENT_SHORT_TAG}/rapids-notebook-env=${NEXT_SHORT_TAG}/g" ${FILE};
    sed_runner "s/rapids-doc-env=${CURRENT_SHORT_TAG}/rapids-doc-env=${NEXT_SHORT_TAG}/g" ${FILE};

diff --git a/conda/environments/cuml_dev_cuda11.0.yml b/conda/environments/cuml_dev_cuda11.0.yml
@@ -17,8 +17,8 @@ dependencies:
 - libraft-headers=22.12.*
 - libraft-distance=22.12.*
 - libraft-nn=22.12.*
-- raft-dask=22.10.*
-- pylibraft=22.10.*
+- raft-dask=22.12.*
+- pylibraft=22.12.*
 - dask-cudf=22.12.*
 - dask-cuda=22.12.*
 - ucx>=1.13.0

diff --git a/conda/environments/cuml_dev_cuda11.2.yml b/conda/environments/cuml_dev_cuda11.2.yml
@@ -17,8 +17,8 @@ dependencies:
 - libraft-headers=22.12.*
 - libraft-distance=22.12.*
 - libraft-nn=22.12.*
-- raft-dask=22.10.*
-- pylibraft=22.10.*
+- raft-dask=22.12.*
+- pylibraft=22.12.*
 - dask-cudf=22.12.*
 - dask-cuda=22.12.*
 - ucx>=1.13.0

diff --git a/conda/environments/cuml_dev_cuda11.4.yml b/conda/environments/cuml_dev_cuda11.4.yml
@@ -17,8 +17,8 @@ dependencies:
 - libraft-headers=22.12.*
 - libraft-distance=22.12.*
 - libraft-nn=22.12.*
-- raft-dask=22.10.*
-- pylibraft=22.10.*
+- raft-dask=22.12.*
+- pylibraft=22.12.*
 - dask-cudf=22.12.*
 - dask-cuda=22.12.*
 - ucx>=1.13.0

diff --git a/conda/environments/cuml_dev_cuda11.5.yml b/conda/environments/cuml_dev_cuda11.5.yml
@@ -17,8 +17,8 @@ dependencies:
 - libraft-headers=22.12.*
 - libraft-distance=22.12.*
 - libraft-nn=22.12.*
-- raft-dask=22.10.*
-- pylibraft=22.10.*
+- raft-dask=22.12.*
+- pylibraft=22.12.*
 - dask-cudf=22.12.*
 - dask-cuda=22.12.*
 - ucx>=1.13.0

diff --git a/cpp/bench/CMakeLists.txt b/cpp/bench/CMakeLists.txt
@@ -74,20 +74,8 @@ endif()
 if(BUILD_CUML_PRIMS_BENCH)
   # (please keep the filenames in alphabetical order)
   add_executable(${PRIMS_BENCH_TARGET}
-    prims/add.cu
-    prims/distance_cosine.cu
-    prims/distance_exp_l2.cu
-    prims/distance_l1.cu
-    prims/distance_unexp_l2.cu
-    prims/fused_l2_nn.cu
     prims/gram_matrix.cu
-    prims/main.cpp
-    prims/make_blobs.cu
-    prims/map_then_reduce.cu
-    prims/matrix_vector_op.cu
-    prims/permute.cu
-    prims/reduce.cu
-    prims/rng.cu)
+    prims/main.cpp)
 
   target_compile_options(${PRIMS_BENCH_TARGET}
         PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CUML_CXX_FLAGS}>"

diff --git a/cpp/bench/prims/add.cu b/cpp/bench/prims/add.cu
diff --git a/cpp/bench/prims/distance_common.cuh b/cpp/bench/prims/distance_common.cuh
diff --git a/cpp/bench/prims/distance_cosine.cu b/cpp/bench/prims/distance_cosine.cu
diff --git a/cpp/bench/prims/distance_exp_l2.cu b/cpp/bench/prims/distance_exp_l2.cu
diff --git a/cpp/bench/prims/distance_l1.cu b/cpp/bench/prims/distance_l1.cu
diff --git a/cpp/bench/prims/distance_unexp_l2.cu b/cpp/bench/prims/distance_unexp_l2.cu