pin to dgl 2.4 for conda packages, 2.2.1 for wheels

rapidsai · Oct 4, 2024 · 2124570 · 2124570
1 parent f267c77
commit 2124570
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 18 deletions.
diff --git a/ci/build_docs.sh b/ci/build_docs.sh
@@ -26,10 +26,10 @@ PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
 
 if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then
   CONDA_CUDA_VERSION="11.8"
-  DGL_CHANNEL="dglteam/label/cu118"
+  DGL_CHANNEL="dglteam/label/th23_cu118"
 else
   CONDA_CUDA_VERSION="12.1"
-  DGL_CHANNEL="dglteam/label/cu121"
+  DGL_CHANNEL="dglteam/label/th23_cu121"
 fi
 
 rapids-mamba-retry install \
@@ -48,7 +48,7 @@ rapids-mamba-retry install \
   "libcugraph_etl=${RAPIDS_VERSION_MAJOR_MINOR}.*" \
   "pylibcugraphops=${RAPIDS_VERSION_MAJOR_MINOR}.*" \
   "pylibwholegraph=${RAPIDS_VERSION_MAJOR_MINOR}.*" \
-  pytorch \
+  "pytorch>=2.3,<2.4" \
   "cuda-version=${CONDA_CUDA_VERSION}"
 
 export RAPIDS_DOCS_DIR="$(mktemp -d)"

diff --git a/ci/test_wheel_cugraph-dgl.sh b/ci/test_wheel_cugraph-dgl.sh
@@ -34,6 +34,6 @@ DGL_URL="https://data.dgl.ai/wheels/cu${PYTORCH_CUDA_VER}/repo.html"
 
 rapids-logger "Installing PyTorch and DGL"
 rapids-retry python -m pip install torch==2.3.0 --index-url ${PYTORCH_URL}
-rapids-retry python -m pip install dgl==2.0.0 --find-links ${DGL_URL}
+rapids-retry python -m pip install dgl==2.2.1 --find-links ${DGL_URL}
 
 python -m pytest python/cugraph-dgl/tests
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -4,7 +4,7 @@ channels:
 - rapidsai
 - rapidsai-nightly
 - dask/label/dev
-- dglteam/label/cu118
+- dglteam/label/th23_cu118
 - conda-forge
 - nvidia
 dependencies:

diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -4,7 +4,7 @@ channels:
 - rapidsai
 - rapidsai-nightly
 - dask/label/dev
-- dglteam/label/cu118
+- dglteam/label/th23_cu118
 - conda-forge
 - nvidia
 dependencies:

diff --git a/conda/recipes/cugraph-dgl/meta.yaml b/conda/recipes/cugraph-dgl/meta.yaml
@@ -25,7 +25,7 @@ requirements:
     - setuptools>=61.0.0
   run:
     - cugraph ={{ version }}
-    - dgl >=1.1.0.cu*
+    - dgl >=2.4.0
     - numba >=0.57
     - numpy >=1.23,<3.0a0
     - pylibcugraphops ={{ minor_version }}

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -323,7 +323,7 @@ channels:
   - rapidsai
   - rapidsai-nightly
   - dask/label/dev
-  - dglteam/label/cu118
+  - dglteam/label/th23_cu118
   - conda-forge
   - nvidia
 dependencies:
@@ -699,7 +699,7 @@ dependencies:
           - &pytorch_conda pytorch>=2.3,<2.4.0a0
           - pytorch-cuda==11.8
           - &tensordict tensordict>=0.1.2
-          - dgl>=1.1.0.cu*
+          - dgl>=2.4.0.cu*
   cugraph_pyg_dev:
     common:
       - output_types: [conda]

diff --git a/docs/cugraph/source/graph_support/DGL_support.md b/docs/cugraph/source/graph_support/DGL_support.md
@@ -8,9 +8,12 @@
 
 Install and update cugraph-dgl and the required dependencies using the command:
 
-```
-conda install mamba -n base -c conda-forge
-mamba install cugraph-dgl -c rapidsai-nightly -c rapidsai -c pytorch -c conda-forge -c nvidia -c dglteam
+```shell
+# CUDA 11
+conda install -c rapidsai -c pytorch -c conda-forge -c nvidia -c dglteam/label/th23_cu118 cugraph-dgl
+
+# CUDA 12
+conda install -c rapidsai -c pytorch -c conda-forge -c nvidia -c dglteam/label/th23_cu121 cugraph-dgl
 ```
 
 ## Build from Source

diff --git a/python/cugraph-dgl/README.md b/python/cugraph-dgl/README.md
@@ -8,9 +8,12 @@
 
 Install and update cugraph-dgl and the required dependencies using the command:
 
-```
-conda install mamba -n base -c conda-forge
-mamba install cugraph-dgl -c rapidsai-nightly -c rapidsai -c pytorch -c conda-forge -c nvidia -c dglteam
+```shell
+# CUDA 11
+conda install -c rapidsai -c pytorch -c conda-forge -c nvidia -c dglteam/label/th23_cu118 cugraph-dgl
+
+# CUDA 12
+conda install -c rapidsai -c pytorch -c conda-forge -c nvidia -c dglteam/label/th23_cu121 cugraph-dgl
 ```
 
 ## Build from Source

diff --git a/python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml b/python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml
@@ -4,12 +4,12 @@ channels:
 - rapidsai
 - rapidsai-nightly
 - dask/label/dev
-- dglteam/label/cu118
+- dglteam/label/th23_cu118
 - conda-forge
 - nvidia
 dependencies:
 - cugraph==24.10.*,>=0.0.0a0
-- dgl>=1.1.0.cu*
+- dgl>=2.4.0.cu*
 - pandas
 - pre-commit
 - pylibcugraphops==24.10.*,>=0.0.0a0

diff --git a/python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml b/python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml
@@ -4,7 +4,7 @@ channels:
 - rapidsai
 - rapidsai-nightly
 - dask/label/dev
-- dglteam/label/cu118
+- dglteam/label/th23_cu118
 - conda-forge
 - nvidia
 dependencies: