From 57ba25dca8450a2c3e51217d28e1e4fcbe51a6cd Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Thu, 20 Feb 2025 15:00:12 -0600
Subject: [PATCH] update handling of GNN dependencies

---
 ci/release/update-version.sh                 |  1 -
 dependencies.yaml                            | 54 +++++++++++++++-----
 python/cugraph-service/client/pyproject.toml | 14 +++++
 3 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
index 8790bcaff87..edc03b85830 100755
--- a/ci/release/update-version.sh
+++ b/ci/release/update-version.sh
@@ -51,7 +51,6 @@ NEXT_UCXX_SHORT_TAG_PEP440=$(python -c "from packaging.version import Version; p
 DEPENDENCIES=(
   cudf
   cugraph
-  cugraph-dgl
   cugraph-pyg
   cugraph-service-server
   cugraph-service-client
diff --git a/dependencies.yaml b/dependencies.yaml
index f79daeaa028..250ab759bef 100755
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -48,12 +48,9 @@ files:
       - depends_on_libcugraph
       - depends_on_pylibcugraph
       - depends_on_cugraph
-      - depends_on_cugraph_pyg
-      - depends_on_cugraph_dgl
       - depends_on_cugraph_service_server
       - depends_on_cugraph_service_client
       - depends_on_libcugraph_etl
-      - depends_on_pylibwholegraph
       - depends_on_pytorch
   test_cpp:
     output: none
@@ -224,6 +221,18 @@ files:
       table: project
     includes:
       - python_run_cugraph_service_client
+  py_test_cugraph_service_client:
+    output: pyproject
+    pyproject_dir: python/cugraph-service/client
+    extras:
+      table: project.optional-dependencies
+      key: test
+    includes:
+      - depends_on_cudf
+      - depends_on_cugraph_pyg
+      - depends_on_cupy
+      - test_python_common
+      - test_python_cugraph_service_client
   py_build_cugraph_service_server:
     output: pyproject
     pyproject_dir: python/cugraph-service/server
@@ -484,7 +493,7 @@ dependencies:
     common:
       - output_types: [conda, pyproject]
         packages:
-          - pandas
+          - &pandas pandas
           - pytest
           - pytest-benchmark
           - pytest-cov
@@ -502,14 +511,20 @@ dependencies:
       - output_types: [conda]
         packages:
           - *thrift
+  test_python_cugraph_service_client:
+    common:
+      - output_types: [conda, pyproject, requirements]
+        packages:
+          - *numpy
+          - *pandas
   test_python_cugraph_service_server:
     common:
-      - output_types: [conda, pyproject]
+      - output_types: [conda, pyproject, requirements]
         packages:
           - *numpy
   test_python_pylibcugraph:
     common:
-      - output_types: [conda, pyproject]
+      - output_types: [conda, pyproject, requirements]
         packages:
           - *numpy
 
@@ -538,17 +553,30 @@ dependencies:
               - cugraph-cu11==25.4.*,>=0.0.0a0
           - {matrix: null, packages: [*cugraph_unsuffixed]}
 
-  depends_on_cugraph_dgl:
-    common:
-      - output_types: conda
-        packages:
-          - cugraph-dgl==25.4.*,>=0.0.0a0
-
   depends_on_cugraph_pyg:
     common:
       - output_types: conda
         packages:
-          - cugraph-pyg==25.4.*,>=0.0.0a0
+          - &cugraph_pyg_unsuffixed cugraph-pyg==25.4.*,>=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:
+              - cugraph-pyg-cu12==25.4.*,>=0.0.0a0
+          - matrix:
+              cuda: "11.*"
+              cuda_suffixed: "true"
+            packages:
+              - cugraph-pyg-cu11==25.4.*,>=0.0.0a0
+          - {matrix: null, packages: [*cugraph_pyg_unsuffixed]}
 
   depends_on_cugraph_service_client:
     common:
diff --git a/python/cugraph-service/client/pyproject.toml b/python/cugraph-service/client/pyproject.toml
index 093a578db2b..4ce2bacf80d 100644
--- a/python/cugraph-service/client/pyproject.toml
+++ b/python/cugraph-service/client/pyproject.toml
@@ -34,6 +34,20 @@ classifiers = [
 Homepage = "https://github.com/rapidsai/cugraph"
 Documentation = "https://docs.rapids.ai/api/cugraph/stable/"
 
+
+[project.optional-dependencies]
+test = [
+    "cudf==25.4.*,>=0.0.0a0",
+    "cugraph-pyg==25.4.*,>=0.0.0a0",
+    "cupy-cuda11x>=12.0.0",
+    "numpy>=1.23,<3.0a0",
+    "pandas",
+    "pytest",
+    "pytest-benchmark",
+    "pytest-cov",
+    "pytest-xdist",
+    "scipy",
+] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`.
 [tool.setuptools]
 license-files = ["LICENSE"]