Merge branch 'main' into fix/align-up-invariants

Author: PointKernel

conda/environments/all_cuda-129_arch-aarch64.yaml

@@ -10,8 +10,9 @@ dependencies:
 - clang-tools==20.1.8
 - clang==20.1.8
 - cmake>=4.0
+- cuda-bindings>=12.9.2,<13.0
+- cuda-core>=0.5.1
 - cuda-nvcc
-- cuda-python>=12.9.2,<13.0
 - cuda-version=12.9
 - cxx-compiler
 - cython>=3.2.2

conda/environments/all_cuda-129_arch-x86_64.yaml

@@ -10,8 +10,9 @@ dependencies:
 - clang-tools==20.1.8
 - clang==20.1.8
 - cmake>=4.0
+- cuda-bindings>=12.9.2,<13.0
+- cuda-core>=0.5.1
 - cuda-nvcc
-- cuda-python>=12.9.2,<13.0
 - cuda-version=12.9
 - cxx-compiler
 - cython>=3.2.2

conda/environments/all_cuda-133_arch-aarch64.yaml

@@ -10,8 +10,9 @@ dependencies:
 - clang-tools==20.1.8
 - clang==20.1.8
 - cmake>=4.0
+- cuda-bindings>=13.0.1,<14.0
+- cuda-core>=0.5.1
 - cuda-nvcc
-- cuda-python>=13.0.1,<14.0
 - cuda-version=13.3
 - cxx-compiler
 - cython>=3.2.2

conda/environments/all_cuda-133_arch-x86_64.yaml

@@ -10,8 +10,9 @@ dependencies:
 - clang-tools==20.1.8
 - clang==20.1.8
 - cmake>=4.0
+- cuda-bindings>=13.0.1,<14.0
+- cuda-core>=0.5.1
 - cuda-nvcc
-- cuda-python>=13.0.1,<14.0
 - cuda-version=13.3
 - cxx-compiler
 - cython>=3.2.2

conda/recipes/rmm/recipe.yaml

@@ -70,8 +70,8 @@ requirements:
     - cuda-version =${{ cuda_version }}
     - cuda-cudart-dev
     - if: cuda_major == "12"
-      then: cuda-python >=12.9.2,<13.0
-      else: cuda-python >=13.0.1,<14.0
+      then: cuda-bindings >=12.9.2,<13.0
+      else: cuda-bindings >=13.0.1,<14.0
     - cython >=3.2.2
     - rapids-build-backend >=0.4.0,<0.5.0
     - librmm =${{ version }}
@@ -81,17 +81,18 @@ requirements:
     - scikit-build-core>=0.11.0
   run:
     - if: cuda_major == "12"
-      then: cuda-python >=12.9.2,<13.0
-      else: cuda-python >=13.0.1,<14.0
+      then: cuda-bindings >=12.9.2,<13.0
+      else: cuda-bindings >=13.0.1,<14.0
     - ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }}
     - numpy >=2.0,<3.0
     - python
   run_constraints:
     - cupy >=14.0.1,!=14.1.0
   ignore_run_exports:
     from_package:
-      - cuda-python
+      - cuda-bindings
       - cuda-cudart-dev
+      - cuda-python
     by_name:
       - cuda-version
 

dependencies.yaml

@@ -182,10 +182,10 @@ dependencies:
           - matrix:
               cuda: "12.*"
             packages:
-              - &cuda_python12 cuda-python>=12.9.2,<13.0
+              - &cuda_bindings12 cuda-bindings>=12.9.2,<13.0
           - matrix: # All CUDA 13 versions
             packages:
-              - &cuda_python13 cuda-python>=13.0.1,<14.0
+              - &cuda_bindings13 cuda-bindings>=13.0.1,<14.0
   depends_on_librmm:
     common:
       - output_types: conda
@@ -391,10 +391,10 @@ dependencies:
           - matrix:
               cuda: "12.*"
             packages:
-              - *cuda_python12
+              - *cuda_bindings12
           - matrix: # All CUDA 13 versions
             packages:
-              - *cuda_python13
+              - *cuda_bindings13
   test_cpp:
     common:
       - output_types: conda
@@ -404,15 +404,31 @@ dependencies:
     common:
       - output_types: [conda, requirements, pyproject]
         packages:
+          - cuda-core>=0.5.1
           - packaging
           - pytest
           - pytest-cov
     specific:
+      - output_types: [conda, requirements, pyproject]
+        matrices:
+          - matrix:
+              dependencies: "oldest"
+              cuda: "12.*"
+            packages:
+              - cuda-bindings==12.9.2
+          - matrix:
+              dependencies: "oldest"
+              cuda: "13.*"
+            packages:
+              - cuda-bindings==13.0.1
+          - matrix:
+            packages:
       - output_types: [conda, requirements, pyproject]
         matrices:
           - matrix:
               dependencies: "oldest"
             packages:
+              - cuda-core==0.5.1
               - numba==0.60.0
               - numpy==2.0.*
           - matrix:

python/rmm/pyproject.toml

@@ -19,7 +19,7 @@ authors = [
 license = "Apache-2.0"
 requires-python = ">=3.11"
 dependencies = [
-    "cuda-python>=13.0.1,<14.0",
+    "cuda-bindings>=13.0.1,<14.0",
     "librmm==26.8.*,>=0.0.0a0",
     "numpy>=2.0,<3.0",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
@@ -36,6 +36,7 @@ classifiers = [
 
 [project.optional-dependencies]
 test = [
+    "cuda-core>=0.5.1",
     "numba-cuda>=0.22.1",
     "numba>=0.60.0,<0.65.0",
     "packaging",
@@ -101,7 +102,7 @@ dependencies-file = "../../dependencies.yaml"
 matrix-entry = "cuda_suffixed=true"
 requires = [
     "cmake>=4.0",
-    "cuda-python>=13.0.1,<14.0",
+    "cuda-bindings>=13.0.1,<14.0",
     "cython>=3.2.2",
     "librmm==26.8.*,>=0.0.0a0",
     "ninja",