Refactor dependencies.yaml to use depends-on pattern.

dependencies.yaml

@@ -11,6 +11,8 @@ files:
       - build_py_cuvs
       - cuda
       - cuda_version
+      - depends_on_pylibraft
+      - depends_on_rmm
       - develop
       - checks
       - build_wheels
@@ -31,6 +33,8 @@ files:
       - build_py_cuvs
       - cuda
       - cuda_version
+      - depends_on_pylibraft
+      - depends_on_rmm
       - develop
       - bench
       - bench_python
@@ -85,6 +89,8 @@ files:
     includes:
       - rapids_build
       - build_py_cuvs
+      - depends_on_pylibraft
+      - depends_on_rmm
   py_run_py_cuvs:
     output: pyproject
     pyproject_dir: python/cuvs
@@ -93,6 +99,8 @@ files:
     includes:
       - cuda_wheels
       - run_py_cuvs
+      - depends_on_pylibraft
+      - depends_on_rmm
   py_test_py_cuvs:
     output: pyproject
     pyproject_dir: python/cuvs
@@ -193,15 +201,7 @@ dependencies:
     common:
       - output_types: [conda]
         packages:
-          - &rmm_unsuffixed rmm==24.10.*,>=0.0.0a0
-          - &pylibraft_unsuffixed pylibraft==24.10.*,>=0.0.0a0
           - dlpack>=0.8,<1.0
-      - output_types: requirements
-        packages:
-          # pip recognizes the index as a global option for the requirements.txt file
-          # This index is needed for rmm-cu{11,12}.
-          - --extra-index-url=https://pypi.nvidia.com
-          - --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
     specific:
       - output_types: [conda, requirements, pyproject]
         matrices:
@@ -216,21 +216,6 @@ dependencies:
           - matrix:
             packages:
               - &cuda_python cuda-python
-      - output_types: [requirements, pyproject]
-        matrices:
-          - matrix:
-              cuda: "12.*"
-              cuda_suffixed: "true"
-            packages:
-              - &rmm_cu12 rmm-cu12==24.10.*,>=0.0.0a0
-              - &pylibraft_cu12 pylibraft-cu12==24.10.*,>=0.0.0a0
-          - matrix:
-              cuda: "11.*"
-              cuda_suffixed: "true"
-            packages:
-              - &rmm_cu11 rmm-cu11==24.10.*,>=0.0.0a0
-              - &pylibraft_cu11 pylibraft-cu11==24.10.*,>=0.0.0a0
-          - {matrix: null, packages: [*rmm_unsuffixed, *pylibraft_unsuffixed] }
   checks:
     common:
       - output_types: [conda, requirements]
@@ -448,19 +433,9 @@ dependencies:
               - python>=3.10,<3.13
   run_py_cuvs:
     common:
-      - output_types: [conda, pyproject]
+      - output_types: [conda, requirements, pyproject]
         packages:
           - &numpy numpy>=1.23,<3.0a0
-      - output_types: [conda]
-        packages:
-          - *rmm_unsuffixed
-          - *pylibraft_unsuffixed
-      - output_types: requirements
-        packages:
-          # pip recognizes the index as a global option for the requirements.txt file
-          # This index is needed for cudf and rmm.
-          - --extra-index-url=https://pypi.nvidia.com
-          - --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
     specific:
       - output_types: [conda, requirements, pyproject]
         matrices:
@@ -475,15 +450,6 @@ dependencies:
           - matrix:
             packages:
               - *cuda_python
-      - output_types: [requirements, pyproject]
-        matrices:
-          - matrix: {cuda: "12.*"}
-            packages:
-              - *pylibraft_cu12
-          - matrix: {cuda: "11.*"}
-            packages:
-              - *pylibraft_cu11
-          - {matrix: null, packages: [*pylibraft_unsuffixed]}
   test_python_common:
     common:
       - output_types: [conda, requirements, pyproject]
@@ -505,7 +471,6 @@ dependencies:
           - h5py>=3.8.0
           - benchmark>=1.8.2
           - openblas
-          - *rmm_unsuffixed
   bench_python:
     common:
       - output_types: [conda]
@@ -515,3 +480,51 @@ dependencies:
           - pyyaml
           - pandas
           - click
+  depends_on_rmm:
+    common:
+      - output_types: conda
+        packages:
+          - &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
+          - --extra-index-url=https://pypi.nvidia.com
+          - --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
+    specific:
+      - output_types: [requirements, pyproject]
+        matrices:
+          - matrix:
+              cuda: "12.*"
+              cuda_suffixed: "true"
+            packages:
+              - rmm-cu12==24.10.*,>=0.0.0a0
+          - matrix:
+              cuda: "11.*"
+              cuda_suffixed: "true"
+            packages:
+              - rmm-cu11==24.10.*,>=0.0.0a0
+          - {matrix: null, packages: [*rmm_unsuffixed]}
+  depends_on_pylibraft:
+    common:
+      - output_types: conda
+        packages:
+          - &pylibraft_unsuffixed pylibraft==24.10.*,>=0.0.0a0
+      - output_types: requirements
+        packages:
+          # pip recognizes the index as a global option for the requirements.txt file
+          - --extra-index-url=https://pypi.nvidia.com
+          - --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
+    specific:
+      - output_types: [requirements, pyproject]
+        matrices:
+          - matrix:
+              cuda: "12.*"
+              cuda_suffixed: "true"
+            packages:
+              - pylibraft-cu12==24.10.*,>=0.0.0a0
+          - matrix:
+              cuda: "11.*"
+              cuda_suffixed: "true"
+            packages:
+              - pylibraft-cu11==24.10.*,>=0.0.0a0
+          - {matrix: null, packages: [*pylibraft_unsuffixed]}

python/cuvs/pyproject.toml

@@ -38,6 +38,7 @@ dependencies = [
     "nvidia-cusolver",
     "nvidia-cusparse",
     "pylibraft==24.10.*,>=0.0.0a0",
+    "rmm==24.10.*,>=0.0.0a0",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 classifiers = [
     "Intended Audience :: Developers",