use conda-forge::torch_geometric instead of pyg::pyg

rapidsai · Oct 3, 2024 · f267c77 · f267c77
1 parent 8364839
commit f267c77
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 11 deletions.
diff --git a/ci/build_docs.sh b/ci/build_docs.sh
@@ -36,7 +36,6 @@ rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \
   --channel "${PYTHON_CHANNEL}" \
   --channel conda-forge \
-  --channel pyg \
   --channel nvidia \
   --channel "${DGL_CHANNEL}" \
   "libcugraph=${RAPIDS_VERSION_MAJOR_MINOR}.*" \

diff --git a/ci/build_python.sh b/ci/build_python.sh
@@ -61,7 +61,6 @@ if [[ ${RAPIDS_CUDA_MAJOR} == "11" ]]; then
     --no-test \
     --channel "${CPP_CHANNEL}" \
     --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
-    --channel pyg \
     --channel pytorch \
     --channel pytorch-nightly \
     conda/recipes/cugraph-pyg

diff --git a/ci/test_python.sh b/ci/test_python.sh
@@ -210,7 +210,6 @@ if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then
     rapids-mamba-retry install \
       --channel "${CPP_CHANNEL}" \
       --channel "${PYTHON_CHANNEL}" \
-      --channel pyg \
       "cugraph-pyg=${RAPIDS_VERSION_MAJOR_MINOR}.*" \
       "pytorch>=2.3,<2.4" \
       "ogb"

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,6 @@ channels:
 - rapidsai
 - rapidsai-nightly
 - dask/label/dev
-- pyg
 - dglteam/label/cu118
 - conda-forge
 - nvidia

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,6 @@ channels:
 - rapidsai
 - rapidsai-nightly
 - dask/label/dev
-- pyg
 - dglteam/label/cu118
 - conda-forge
 - nvidia

diff --git a/conda/recipes/cugraph-pyg/meta.yaml b/conda/recipes/cugraph-pyg/meta.yaml
@@ -36,7 +36,7 @@ requirements:
     - cugraph ={{ version }}
     - pylibcugraphops ={{ minor_version }}
     - tensordict >=0.1.2
-    - pyg >=2.5,<2.6
+    - pytorch_geometric >=2.5,<2.6
 
 tests:
   imports:

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -323,7 +323,6 @@ channels:
   - rapidsai
   - rapidsai-nightly
   - dask/label/dev
-  - pyg
   - dglteam/label/cu118
   - conda-forge
   - nvidia
@@ -709,7 +708,7 @@ dependencies:
           - *pytorch_conda
           - pytorch-cuda==11.8
           - *tensordict
-          - pyg>=2.5,<2.6
+          - pytorch_geometric>=2.5,<2.6
 
   depends_on_pytorch:
     common:

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,7 +4,6 @@ channels:
 - rapidsai
 - rapidsai-nightly
 - dask/label/dev
-- pyg
 - dglteam/label/cu118
 - conda-forge
 - nvidia

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,22 +4,21 @@ channels:
 - rapidsai
 - rapidsai-nightly
 - dask/label/dev
-- pyg
 - dglteam/label/cu118
 - conda-forge
 - nvidia
 dependencies:
 - cugraph==24.10.*,>=0.0.0a0
 - pandas
 - pre-commit
-- pyg>=2.5,<2.6
 - pylibcugraphops==24.10.*,>=0.0.0a0
 - pytest
 - pytest-benchmark
 - pytest-cov
 - pytest-xdist
 - pytorch-cuda==11.8
 - pytorch>=2.3,<2.4.0a0
+- pytorch_geometric>=2.5,<2.6
 - scipy
 - tensordict>=0.1.2
 name: cugraph_pyg_dev_cuda-118