Merge branch-24.08 into branch-24.10

ci/release/update-version.sh

@@ -37,12 +37,6 @@ function sed_runner() {
 # Centralized version file update
 echo "${NEXT_FULL_TAG}" > VERSION
 
-# pyproject.toml versions
-sed_runner "s/rmm==.*\",/rmm==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0\",/g" python/cuml/pyproject.toml
-sed_runner "s/cudf==.*\",/cudf==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0\",/g" python/cuml/pyproject.toml
-sed_runner "s/pylibraft==.*\",/pylibraft==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0\",/g" python/cuml/pyproject.toml
-sed_runner "s/raft-dask==.*\",/raft-dask==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0\",/g" python/cuml/pyproject.toml
-
 DEPENDENCIES=(
   cudf
   cuml
@@ -59,10 +53,13 @@ DEPENDENCIES=(
   rapids-dask-dependency
   rmm
 )
-for FILE in dependencies.yaml conda/environments/*.yaml; do
-  for DEP in "${DEPENDENCIES[@]}"; do
+for DEP in "${DEPENDENCIES[@]}"; do
+  for FILE in dependencies.yaml conda/environments/*.yaml; do
     sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0/g" "${FILE}"
   done
+  for FILE in python/*/pyproject.toml; do
+    sed_runner "/\"${DEP}==/ s/==.*\"/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0\"/g" ${FILE}
+  done
 done
 
 sed_runner "s|/branch-[^/]*/|/branch-${NEXT_SHORT_TAG}/|g" README.md

cpp/src/pca/pca.cuh

@@ -108,7 +108,7 @@ void pcaFit(const raft::handle_t& handle,
   auto n_components = prms.n_components;
   if (n_components > prms.n_cols) n_components = prms.n_cols;
 
-  raft::stats::mean(mu, input, prms.n_cols, prms.n_rows, true, false, stream);
+  raft::stats::mean(mu, input, prms.n_cols, prms.n_rows, false, false, stream);
 
   auto len = prms.n_cols * prms.n_cols;
   rmm::device_uvector<math_t> cov(len, stream);

cpp/src/tsvd/tsvd.cuh

@@ -271,21 +271,21 @@ void tsvdFitTransform(const raft::handle_t& handle,
 
   rmm::device_uvector<math_t> mu_trans(prms.n_components, stream);
   raft::stats::mean(
-    mu_trans.data(), trans_input, prms.n_components, prms.n_rows, true, false, stream);
+    mu_trans.data(), trans_input, prms.n_components, prms.n_rows, false, false, stream);
   raft::stats::vars(explained_var,
                     trans_input,
                     mu_trans.data(),
                     prms.n_components,
                     prms.n_rows,
-                    true,
+                    false,
                     false,
                     stream);
 
   rmm::device_uvector<math_t> mu(prms.n_cols, stream);
   rmm::device_uvector<math_t> vars(prms.n_cols, stream);
 
-  raft::stats::mean(mu.data(), input, prms.n_cols, prms.n_rows, true, false, stream);
-  raft::stats::vars(vars.data(), input, mu.data(), prms.n_cols, prms.n_rows, true, false, stream);
+  raft::stats::mean(mu.data(), input, prms.n_cols, prms.n_rows, false, false, stream);
+  raft::stats::vars(vars.data(), input, mu.data(), prms.n_cols, prms.n_rows, false, false, stream);
 
   rmm::device_scalar<math_t> total_vars(stream);
   raft::stats::sum(total_vars.data(), vars.data(), std::size_t(1), prms.n_cols, false, stream);

dependencies.yaml

@@ -180,8 +180,8 @@ dependencies:
           - &treelite treelite==4.3.0
       - output_types: conda
         packages:
-          - &pylibraft_conda pylibraft==24.10.*,>=0.0.0a0
-          - &rmm_conda rmm==24.10.*,>=0.0.0a0
+          - &pylibraft_unsuffixed pylibraft==24.10.*,>=0.0.0a0
+          - &rmm_unsuffixed rmm==24.10.*,>=0.0.0a0
       - output_types: requirements
         packages:
           # pip recognizes the index as a global option for the requirements.txt file
@@ -204,18 +204,22 @@ dependencies:
               - cuda-python
       - output_types: [requirements, pyproject]
         matrices:
-          - matrix: {cuda: "12.*"}
+          - matrix:
+              cuda: "12.*"
+              cuda_suffixed: "true"
             packages:
               - pylibraft-cu12==24.10.*,>=0.0.0a0
               - rmm-cu12==24.10.*,>=0.0.0a0
-          - matrix: {cuda: "11.*"}
+          - matrix:
+              cuda: "11.*"
+              cuda_suffixed: "true"
             packages:
-              - &pylibraft_cu11 pylibraft-cu11==24.10.*,>=0.0.0a0
-              - &rmm_cu11 rmm-cu11==24.10.*,>=0.0.0a0
+              - pylibraft-cu11==24.10.*,>=0.0.0a0
+              - rmm-cu11==24.10.*,>=0.0.0a0
           - matrix:
             packages:
-              - pylibraft==24.10.*,>=0.0.0a0
-              - rmm==24.10.*,>=0.0.0a0
+              - *pylibraft_unsuffixed
+              - *rmm_unsuffixed
 
   py_run:
     common:
@@ -233,10 +237,10 @@ dependencies:
           - *treelite
       - output_types: conda
         packages:
-          - &cudf_conda cudf==24.10.*,>=0.0.0a0
-          - &cupy_conda cupy>=12.0.0
-          - &dask_cudf_conda dask-cudf==24.10.*,>=0.0.0a0
-          - &raft_dask_conda raft-dask==24.10.*,>=0.0.0a0
+          - &cudf_unsuffixed cudf==24.10.*,>=0.0.0a0
+          - &cupy_unsuffixed cupy>=12.0.0
+          - &dask_cudf_unsuffixed dask-cudf==24.10.*,>=0.0.0a0
+          - &raft_dask_unsuffixed raft-dask==24.10.*,>=0.0.0a0
       - output_types: requirements
         packages:
           # pip recognizes the index as a global option for the requirements.txt file
@@ -246,30 +250,58 @@ dependencies:
     specific:
       - output_types: [requirements, pyproject]
         matrices:
-          - matrix: {cuda: "12.*"}
+          - matrix:
+              cuda: "12.*"
+              cuda_suffixed: "true"
             packages:
               - cudf-cu12==24.10.*,>=0.0.0a0
-              - cupy-cuda12x>=12.0.0
+              - &cupy_pyproject_cu12 cupy-cuda12x>=12.0.0
               - dask-cudf-cu12==24.10.*,>=0.0.0a0
               - pylibraft-cu12==24.10.*,>=0.0.0a0
               - raft-dask-cu12==24.10.*,>=0.0.0a0
               - rmm-cu12==24.10.*,>=0.0.0a0
-          - matrix: {cuda: "11.*"}
+          - matrix:
+              cuda: "12.*"
+              cuda_suffixed: "false"
+            packages:
+              - *cudf_unsuffixed
+              # NOTE: cupy still has a "-cuda12x" suffix here, because it's suffixed
+              #       in DLFW builds
+              - *cupy_pyproject_cu12
+              - *dask_cudf_unsuffixed
+              - *pylibraft_unsuffixed
+              - *raft_dask_unsuffixed
+              - *rmm_unsuffixed
+          - matrix:
+              cuda: "11.*"
+              cuda_suffixed: "true"
             packages: &py_run_packages_cu11
               - cudf-cu11==24.10.*,>=0.0.0a0
               - &cupy_pyproject_cu11 cupy-cuda11x>=12.0.0
               - dask-cudf-cu11==24.10.*,>=0.0.0a0
-              - *pylibraft_cu11
+              - pylibraft-cu11==24.10.*,>=0.0.0a0
               - raft-dask-cu11==24.10.*,>=0.0.0a0
-              - *rmm_cu11
+              - rmm-cu11==24.10.*,>=0.0.0a0
+          - matrix:
+              cuda: "11.*"
+              cuda_suffixed: "false"
+            packages:
+              - *cudf_unsuffixed
+              # NOTE: cupy still has a "-cuda11x" suffix here, because it's suffixed
+              #       in DLFW builds
+              - *cupy_pyproject_cu11
+              - *dask_cudf_unsuffixed
+              - *pylibraft_unsuffixed
+              - *raft_dask_unsuffixed
+              - *rmm_unsuffixed
           - matrix:
             packages:
-              - *cudf_conda
+              - *cudf_unsuffixed
               - *cupy_pyproject_cu11
-              - *dask_cudf_conda
-              - *pylibraft_conda
-              - *raft_dask_conda
-              - *rmm_conda
+              - *dask_cudf_unsuffixed
+              - *pylibraft_unsuffixed
+              - *raft_dask_unsuffixed
+              - *rmm_unsuffixed
   cuda_version:
     specific:
       - output_types: conda

python/cuml/pyproject.toml

@@ -153,6 +153,7 @@ versioneer\.py |
 [tool.rapids-build-backend]
 build-backend = "scikit_build_core.build"
 dependencies-file = "../../dependencies.yaml"
+matrix-entry = "cuda_suffixed=true"
 requires = [
     "cmake>=3.26.4,!=3.30.0",
     "cuda-python",