librmm is now a runtime requirement of rmm

rapidsai · Feb 2, 2025 · 30c547e · 30c547e
1 parent 44306de
commit 30c547e
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 18 deletions.
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -11,7 +11,7 @@ files:
       - checks
       - cuda
       - cuda_version
-      - depends_on_rapids-logger
+      - depends_on_rapids_logger
       - develop
       - docs
       - py_version
@@ -55,14 +55,14 @@ files:
       key: requires
     includes:
       - build
-      - depends_on_rapids-logger
+      - depends_on_rapids_logger
   py_cpp_run:
     output: pyproject
     pyproject_dir: python/librmm
     extras:
       table: project
     includes:
-      - depends_on_rapids-logger
+      - depends_on_rapids_logger
   py_build:
     output: pyproject
     pyproject_dir: python/rmm
@@ -79,13 +79,15 @@ files:
     includes:
       - build
       - cython_build
+      - depends_on_librmm
   py_run:
     output: pyproject
     pyproject_dir: python/rmm
     extras:
       table: project
     includes:
       - run
+      - depends_on_librmm
   py_optional_test:
     output: pyproject
     pyproject_dir: python/rmm
@@ -178,21 +180,33 @@ dependencies:
           - matrix: # All CUDA 11 versions
             packages:
               - &cuda_python11 cuda-python>=11.8.5,<12.0a0
+  depends_on_librmm:
+    common:
+      - output_types: conda
+        packages:
+          - &librmm_unsuffixed librmm==25.4.*,>=0.0.0a0
+      - output_types: requirements
+        packages:
+          # pip recognizes the index as a global option for the requirements.txt file
+          # This index is needed for librmm-cu{11,12}.
+          - --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:
-                - librmm-cu12==25.4.*,>=0.0.0a0
-            - matrix:
-                cuda: "11.*"
-                cuda_suffixed: "true"
-              packages:
-                - librmm-cu11==25.4.*,>=0.0.0a0
-            - matrix: null
-              packages:
-                - librmm==25.4.*,>=0.0.0a0
+          - matrix:
+              cuda: "12.*"
+              cuda_suffixed: "true"
+            packages:
+              - librmm-cu12==25.4.*,>=0.0.0a0
+          - matrix:
+              cuda: "11.*"
+              cuda_suffixed: "true"
+            packages:
+              - librmm-cu11==25.4.*,>=0.0.0a0
+          - matrix:
+            packages:
+              - *librmm_unsuffixed
   checks:
     common:
       - output_types: [conda, requirements]
@@ -345,14 +359,14 @@ dependencies:
               - numpy==1.23.*
           - matrix:
             packages:
-  depends_on_rapids-logger:
+  depends_on_rapids_logger:
     common:
       - output_types: [conda, requirements, pyproject]
         packages:
           - rapids-logger==0.1.*,>=0.0.0a0
       - output_types: requirements
         packages:
           # pip recognizes the index as a global option for the requirements.txt file
-          # This index is needed for rapids-logger
+          # This index is needed for rapids_logger
           - --extra-index-url=https://pypi.nvidia.com
           - --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
diff --git a/python/rmm/pyproject.toml b/python/rmm/pyproject.toml
@@ -31,6 +31,7 @@ license = { text = "Apache 2.0" }
 requires-python = ">=3.10"
 dependencies = [
     "cuda-python>=11.8.5,<12.0a0",
+    "librmm==25.4.*,>=0.0.0a0",
     "numpy>=1.23,<3.0a0",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 classifiers = [