merge branch-25.02

rapidsai · Jan 14, 2025 · 7e94d7d · 7e94d7d
2 parents 7853681 + 47bac70
commit 7e94d7d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 24 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -100,6 +100,7 @@ message(VERBOSE "CUML_CPP: Cache build artifacts with ccache: ${USE_CCACHE}")
 message(VERBOSE "CUML_CPP: Statically link the CUDA runtime: ${CUDA_STATIC_RUNTIME}")
 message(VERBOSE "CUML_CPP: Statically link the CUDA math libraries: ${CUDA_STATIC_MATH_LIBRARIES}")
 message(VERBOSE "CUML_CPP: Build and statically link CUVS libraries: ${CUML_USE_CUVS_STATIC}")
+message(VERBOSE "CUML_CPP: Build and statically link RAFT library: ${CUML_USE_RAFT_STATIC}")
 message(VERBOSE "CUML_CPP: Build and statically link Treelite library: ${CUML_USE_TREELITE_STATIC}")
 
 set(CUML_ALGORITHMS "ALL" CACHE STRING "Experimental: Choose which algorithms are built into libcuml++.so. Can specify individual algorithms or groups in a semicolon-separated list.")

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -10,6 +10,7 @@ files:
       - cuda
       - cuda_version
       - depends_on_cudf
+      - depends_on_cuda_python
       - depends_on_cupy
       - depends_on_cuvs
       - depends_on_dask_cudf
@@ -23,8 +24,8 @@ files:
       - depends_on_rmm
       - depends_on_treelite
       - docs
-      - py_build
-      - py_run
+      - py_build_cuml
+      - py_run_cuml
       - py_version
       - rapids_build_backend
       - test_python
@@ -92,7 +93,7 @@ files:
       - depends_on_pylibraft
       - depends_on_raft_dask
       - depends_on_rmm
-      - py_run
+      - py_run_cuml
       - py_version
       - test_notebooks
   py_build_cuml:
@@ -117,13 +118,14 @@ files:
       - depends_on_pylibraft
       - depends_on_rmm
       - depends_on_treelite
-      - py_build
+      - py_build_cuml
   py_run_cuml:
     output: pyproject
     pyproject_dir: python/cuml
     extras:
       table: project
     includes:
+      - depends_on_cuda_python
       - depends_on_cudf
       - depends_on_cupy
       - depends_on_cuvs
@@ -133,7 +135,7 @@ files:
       - depends_on_raft_dask
       - depends_on_rmm
       - depends_on_treelite
-      - py_run
+      - py_run_cuml
   py_test_cuml:
     output: pyproject
     pyproject_dir: python/cuml
@@ -160,7 +162,7 @@ files:
       - common_build
       - depends_on_libraft
       - depends_on_librmm
-      - py_build
+      - py_build_cuml
   py_run_libcuml:
     output: pyproject
     pyproject_dir: python/libcuml
@@ -243,27 +245,13 @@ dependencies:
               cuda: "12.*"
             packages:
               - cuda-nvcc
-  py_build:
+  py_build_cuml:
     common:
       - output_types: [conda, requirements, pyproject]
         packages:
           - &cython cython>=3.0.0
-    specific:
-      - output_types: [conda, requirements, pyproject]
-        matrices:
-          - matrix:
-              cuda: "12.*"
-            packages:
-              - cuda-python>=12.6.2,<13.0a0
-          - matrix:
-              cuda: "11.*"
-            packages:
-              - cuda-python>=11.8.5,<12.0a0
-          - matrix:
-            packages:
-              - cuda-python
 
-  py_run:
+  py_run_cuml:
     common:
       - output_types: [conda, requirements, pyproject]
         packages:
@@ -500,6 +488,21 @@ dependencies:
           - *scikit_learn
           - seaborn
           - *xgboost
+  depends_on_cuda_python:
+    specific:
+      - output_types: [conda, requirements, pyproject]
+        matrices:
+          - matrix:
+              cuda: "12.*"
+            packages:
+              - cuda-python>=12.6.2,<13.0a0
+          - matrix:
+              cuda: "11.*"
+            packages:
+              - cuda-python>=11.8.5,<12.0a0
+          - matrix:
+            packages:
+              - cuda-python
   depends_on_cudf:
     common:
       - output_types: conda

diff --git a/python/cuml/pyproject.toml b/python/cuml/pyproject.toml
@@ -92,6 +92,7 @@ authors = [
 license = { text = "Apache 2.0" }
 requires-python = ">=3.10"
 dependencies = [
+    "cuda-python",
     "cudf==25.2.*,>=0.0.0a0",
     "cupy-cuda11x>=12.0.0",
     "cuvs==25.2.*,>=0.0.0a0",
@@ -174,7 +175,6 @@ matrix-entry = "cuda_suffixed=true"
 
 requires = [
     "cmake>=3.26.4,!=3.30.0",
-    "cuda-python",
     "cython>=3.0.0",
     "libcuml==25.2.*,>=0.0.0a0",
     "libraft==25.2.*,>=0.0.0a0",

diff --git a/python/libcuml/pyproject.toml b/python/libcuml/pyproject.toml
@@ -80,7 +80,6 @@ dependencies-file = "../../dependencies.yaml"
 matrix-entry = "cuda_suffixed=true;use_cuda_wheels=true"
 requires = [
     "cmake>=3.26.4,!=3.30.0",
-    "cuda-python",
     "cython>=3.0.0",
     "libraft==25.2.*,>=0.0.0a0",
     "librmm==25.2.*,>=0.0.0a0",