From 4d66d77bdbea8cbc12871071dac966f3b131e9fa Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Tue, 15 Oct 2024 15:37:40 -0500
Subject: [PATCH] consolidate 'cugraph' dependency, avoid unsuffixed use for
 pyproject/requirements

---
 ci/test_wheel_cugraph-dgl.sh     |  2 +-
 ci/test_wheel_pylibwholegraph.sh |  2 +-
 dependencies.yaml                | 13 +++----------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/ci/test_wheel_cugraph-dgl.sh b/ci/test_wheel_cugraph-dgl.sh
index 733b851..3eaa098 100755
--- a/ci/test_wheel_cugraph-dgl.sh
+++ b/ci/test_wheel_cugraph-dgl.sh
@@ -16,7 +16,7 @@ RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" RAPIDS_PY_WHEEL_
 PKG_CUDA_VER="$(echo ${CUDA_VERSION} | cut -d '.' -f1,2 | tr -d '.')"
 PKG_CUDA_VER_MAJOR=${PKG_CUDA_VER:0:2}
 if [[ "${PKG_CUDA_VER_MAJOR}" == "12" ]]; then
-  PYTORCH_CUDA_VER="124"
+  PYTORCH_CUDA_VER="121"
 else
   PYTORCH_CUDA_VER=$PKG_CUDA_VER
 fi
diff --git a/ci/test_wheel_pylibwholegraph.sh b/ci/test_wheel_pylibwholegraph.sh
index 518da45..60598bc 100755
--- a/ci/test_wheel_pylibwholegraph.sh
+++ b/ci/test_wheel_pylibwholegraph.sh
@@ -12,7 +12,7 @@ RAPIDS_PY_WHEEL_NAME="pylibwholegraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-
 PKG_CUDA_VER="$(echo ${CUDA_VERSION} | cut -d '.' -f1,2 | tr -d '.')"
 PKG_CUDA_VER_MAJOR=${PKG_CUDA_VER:0:2}
 if [[ "${PKG_CUDA_VER_MAJOR}" == "12" ]]; then
-  INDEX_URL="https://download.pytorch.org/whl/cu124"
+  INDEX_URL="https://download.pytorch.org/whl/cu121"
 else
   INDEX_URL="https://download.pytorch.org/whl/cu${PKG_CUDA_VER}"
 fi
diff --git a/dependencies.yaml b/dependencies.yaml
index 4d60123..f12ace6 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -75,6 +75,7 @@ files:
       table: project
     includes:
       - python_run_cugraph_dgl
+      - depends_on_cugraph
       - depends_on_pylibcugraphops
   py_test_cugraph_dgl:
     output: pyproject
@@ -101,6 +102,7 @@ files:
       table: project
     includes:
       - python_run_cugraph_pyg
+      - depends_on_cugraph
       - depends_on_pylibcugraphops
   py_test_cugraph_pyg:
     output: pyproject
@@ -216,7 +218,6 @@ dependencies:
       - output_types: [requirements, pyproject]
         packages:
           - ninja
-
       - output_types: [conda]
         packages:
           - &cmake_ver cmake>=3.26.4,!=3.30.0
@@ -292,18 +293,12 @@ dependencies:
         packages:
           - &numba numba>=0.57
           - &numpy numpy>=1.23,<3.0a0
-      - output_types: [pyproject, requirements]
-        packages:
-          - &cugraph cugraph==24.12.*,>=0.0.0a0
   python_run_cugraph_pyg:
     common:
       - output_types: [conda, pyproject]
         packages:
           - *numba
           - *numpy
-      - output_types: [pyproject]
-        packages:
-          - *cugraph
   test_notebook:
     common:
       - output_types: [conda, requirements]
@@ -334,7 +329,6 @@ dependencies:
     common:
       - output_types: [conda]
         packages:
-          - &cugraph_unsuffixed cugraph==24.12.*,>=0.0.0a0
           - &pytorch_conda pytorch>=2.3,<2.4.0a0
           - dgl>=2.4.0.cu*
           - &tensordict tensordict>=0.1.2
@@ -342,7 +336,6 @@ dependencies:
     common:
       - output_types: [conda]
         packages:
-          - *cugraph_unsuffixed
           - *pytorch_conda
           - *tensordict
           - pytorch_geometric>=2.5,<2.6
@@ -405,7 +398,7 @@ dependencies:
     common:
       - output_types: conda
         packages:
-          - *cugraph_unsuffixed
+          - &cugraph_unsuffixed cugraph==24.12.*,>=0.0.0a0
       - output_types: requirements
         packages:
           # pip recognizes the index as a global option for the requirements.txt file