From ba3387f69e8e33988db5786d5bc15445cc85f9f1 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Mon, 13 Jan 2025 19:33:17 -0800
Subject: [PATCH] more dependency fixes

---
 conda/environments/all_cuda-118_arch-x86_64.yaml |  1 -
 conda/environments/all_cuda-125_arch-x86_64.yaml |  1 -
 dependencies.yaml                                | 14 +++-----------
 python/cuml/pyproject.toml                       |  1 +
 python/libcuml/pyproject.toml                    |  1 -
 5 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
index 05cfd3d7ae..8eebc69c64 100644
--- a/conda/environments/all_cuda-118_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -42,7 +42,6 @@ dependencies:
 - libcusparse-dev=11.7.5.86
 - libcusparse=11.7.5.86
 - libcuvs==25.2.*,>=0.0.0a0
-- libraft-headers==25.2.*,>=0.0.0a0
 - libraft==25.2.*,>=0.0.0a0
 - librmm==25.2.*,>=0.0.0a0
 - nbsphinx
diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
index a2daa61350..cb0736700d 100644
--- a/conda/environments/all_cuda-125_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -39,7 +39,6 @@ dependencies:
 - libcusolver-dev
 - libcusparse-dev
 - libcuvs==25.2.*,>=0.0.0a0
-- libraft-headers==25.2.*,>=0.0.0a0
 - libraft==25.2.*,>=0.0.0a0
 - librmm==25.2.*,>=0.0.0a0
 - nbsphinx
diff --git a/dependencies.yaml b/dependencies.yaml
index cea56904d4..8f5061dc76 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -17,12 +17,10 @@ files:
       - depends_on_libcumlprims
       - depends_on_libcuvs
       - depends_on_libraft
-      - depends_on_libraft_headers
       - depends_on_librmm
       - depends_on_pylibraft
       - depends_on_raft_dask
       - depends_on_rmm
-      - depends_on_treelite
       - docs
       - py_build_cuml
       - py_run_cuml
@@ -111,13 +109,13 @@ files:
       key: requires
     includes:
       - common_build
+      - depends_on_cuda_python
       - depends_on_libcuml
       - depends_on_libcumlprims
       - depends_on_libraft
       - depends_on_librmm
       - depends_on_pylibraft
       - depends_on_rmm
-      - depends_on_treelite
       - py_build_cuml
   py_run_cuml:
     output: pyproject
@@ -134,7 +132,6 @@ files:
       - depends_on_pylibraft
       - depends_on_raft_dask
       - depends_on_rmm
-      - depends_on_treelite
       - py_run_cuml
   py_test_cuml:
     output: pyproject
@@ -158,11 +155,9 @@ files:
       table: tool.rapids-build-backend
       key: requires
     includes:
-      # TODO(jameslamb): split out cuda-python and cython
       - common_build
       - depends_on_libraft
       - depends_on_librmm
-      - py_build_cuml
   py_run_libcuml:
     output: pyproject
     pyproject_dir: python/libcuml
@@ -250,6 +245,7 @@ dependencies:
       - output_types: [conda, requirements, pyproject]
         packages:
           - &cython cython>=3.0.0
+          - &treelite treelite==4.3.0
 
   py_run_cuml:
     common:
@@ -265,6 +261,7 @@ dependencies:
           - scipy>=1.8.0
           - packaging
           - rapids-dask-dependency==25.2.*,>=0.0.0a0
+          - *treelite
       - output_types: requirements
         packages:
           # pip recognizes the index as a global option for the requirements.txt file
@@ -766,8 +763,3 @@ dependencies:
           - matrix:
             packages:
               - *rmm_unsuffixed
-  depends_on_treelite:
-    common:
-      - output_types: [conda, requirements, pyproject]
-        packages:
-          - treelite==4.3.0
diff --git a/python/cuml/pyproject.toml b/python/cuml/pyproject.toml
index f0e54f6695..cf4bb36461 100644
--- a/python/cuml/pyproject.toml
+++ b/python/cuml/pyproject.toml
@@ -175,6 +175,7 @@ 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
index d8acefce3c..0caace57f4 100644
--- 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",
-    "cython>=3.0.0",
     "libraft==25.2.*,>=0.0.0a0",
     "librmm==25.2.*,>=0.0.0a0",
     "ninja",