Merge branch 'branch-25.02' into libcugraph-wheel

rapidsai · Dec 18, 2024 · e72f55c · e72f55c
2 parents 8e9fc0e + 6783aec
commit e72f55c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -193,7 +193,7 @@ jobs:
   # telemetry-summarize:
   #   runs-on: ubuntu-latest
   #   needs: pr-builder
-  #   if: always()
+  #   if: ${{ vars.TELEMETRY_ENABLED == 'true' && !cancelled() }}
   #   continue-on-error: true
   #   steps:
   #     - name: Load stashed telemetry env vars

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -13,6 +13,7 @@ dependencies:
 - certifi
 - cmake>=3.26.4,!=3.30.0
 - cuda-nvtx
+- cuda-python>=11.8.5,<12.0a0
 - cuda-version=11.8
 - cudatoolkit
 - cudf==25.2.*,>=0.0.0a0

diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -16,6 +16,7 @@ dependencies:
 - cuda-nvcc
 - cuda-nvtx-dev
 - cuda-profiler-api
+- cuda-python>=12.6.2,<13.0a0
 - cuda-version=12.5
 - cudf==25.2.*,>=0.0.0a0
 - cupy>=12.0.0

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -435,6 +435,15 @@ dependencies:
             # dataset APIs require [http] extras for use with cudf.
           - fsspec[http]>=0.6.0
     specific:
+      - output_types: [conda, requirements, pyproject]
+        matrices:
+          - matrix:
+              cuda: "12.*"
+            packages:
+              - cuda-python>=12.6.2,<13.0a0
+          - matrix: # All CUDA 11 versions
+            packages:
+              - cuda-python>=11.8.5,<12.0a0
       - output_types: pyproject
         matrices:
           - matrix:

diff --git a/python/cugraph/pyproject.toml b/python/cugraph/pyproject.toml
@@ -23,6 +23,7 @@ authors = [
 license = { text = "Apache 2.0" }
 requires-python = ">=3.10"
 dependencies = [
+    "cuda-python>=11.8.5,<12.0a0",
     "cudf==25.2.*,>=0.0.0a0",
     "cupy-cuda11x>=12.0.0",
     "dask-cuda==25.2.*,>=0.0.0a0",