Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Issues with DGL Dependencies #10

Merged
merged 1 commit into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ channels:
- rapidsai-nightly
- dask/label/dev
- pyg
- dglteam/label/cu118
- conda-forge
- nvidia
dependencies:
Expand All @@ -19,6 +18,7 @@ dependencies:
- cupy>=12.0.0
- cython>=3.0.0
- dask-cudf==24.8.*
- dglteam/label/th21_cu118::dgl
- doxygen
- graphviz
- ipython
Expand All @@ -30,14 +30,18 @@ dependencies:
- numpydoc
- pandas
- pre-commit
- pydantic
- pydata-sphinx-theme
- pyg::pyg
- pylibcugraphops==24.8.*
- pylibraft==24.8.*
- pylibwholegraph==24.8.*
- pytest
- pytest-benchmark
- pytest-cov
- pytest-xdist
- pytorch-cuda=11.8
- pytorch::pytorch>=2.0,<2.2.0a0
- raft-dask==24.8.*
- recommonmark
- rmm==24.8.*
Expand All @@ -48,6 +52,7 @@ dependencies:
- sphinx-markdown-tables
- sphinx<6
- sphinxcontrib-websupport
- torchdata
- wget
- wheel
name: all_cuda-118_arch-x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ channels:
- rapidsai-nightly
- dask/label/dev
- pyg
- dglteam/label/cu118
- conda-forge
- nvidia
dependencies:
Expand All @@ -14,12 +13,13 @@ dependencies:
- cuda-cudart-dev
- cuda-nvtx-dev
- cuda-profiler-api
- cuda-version=12.2
- cuda-version=12.1
- cudf==24.8.*
- cugraph==24.8.*
- cupy>=12.0.0
- cython>=3.0.0
- dask-cudf==24.8.*
- dglteam/label/th21_cu121::dgl
- doxygen
- graphviz
- ipython
Expand All @@ -35,14 +35,18 @@ dependencies:
- numpydoc
- pandas
- pre-commit
- pydantic
- pydata-sphinx-theme
- pyg::pyg
- pylibcugraphops==24.8.*
- pylibraft==24.8.*
- pylibwholegraph==24.8.*
- pytest
- pytest-benchmark
- pytest-cov
- pytest-xdist
- pytorch-cuda=12.1
- pytorch::pytorch>=2.0,<2.2.0a0
- raft-dask==24.8.*
- recommonmark
- rmm==24.8.*
Expand All @@ -53,6 +57,7 @@ dependencies:
- sphinx-markdown-tables
- sphinx<6
- sphinxcontrib-websupport
- torchdata
- wget
- wheel
name: all_cuda-122_arch-x86_64
name: all_cuda-121_arch-x86_64
83 changes: 76 additions & 7 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ files:
all:
output: [conda]
matrix:
cuda: ["11.8", "12.2"]
cuda: ["11.8", "12.1"]
arch: [x86_64]
includes:
- checks
Expand All @@ -22,6 +22,9 @@ files:
- depends_on_pylibcugraphops
- depends_on_pylibwholegraph
- depends_on_cupy
- depends_on_pytorch
- depends_on_dgl
- depends_on_pyg
- python_run_cugraph_dgl
- python_run_cugraph_pyg
- test_notebook
Expand Down Expand Up @@ -121,6 +124,8 @@ files:
- checks
- depends_on_cugraph
- depends_on_pylibcugraphops
- depends_on_dgl
- depends_on_pytorch
- cugraph_dgl_dev
- test_python_common
cugraph_pyg_dev:
Expand All @@ -132,14 +137,14 @@ files:
- checks
- depends_on_cugraph
- depends_on_pylibcugraphops
- depends_on_pytorch
- cugraph_pyg_dev
- test_python_common
channels:
- rapidsai
- rapidsai-nightly
- dask/label/dev
- pyg
- dglteam/label/cu118
- conda-forge
- nvidia
dependencies:
Expand Down Expand Up @@ -172,6 +177,10 @@ dependencies:
cuda: "12.0"
packages:
- cuda-version=12.0
- matrix:
cuda: "12.1"
packages:
- cuda-version=12.1
- matrix:
cuda: "12.2"
packages:
Expand Down Expand Up @@ -296,19 +305,79 @@ dependencies:
- output_types: [conda]
packages:
- cugraph==24.8.*
- pytorch>=2.0
- pytorch-cuda==11.8
- pytorch::pytorch>=2.0
- dgl>=1.1.0.cu*
- &tensordict tensordict>=0.1.2
cugraph_pyg_dev:
common:
- output_types: [conda]
packages:
- cugraph==24.8.*
- pytorch>=2.0
- pytorch-cuda==11.8
- tensordict>=0.1.2
- pytorch::pytorch>=2.0
- *tensordict
- pyg>=2.5,<2.6

depends_on_pytorch:
common:
- output_types: [conda]
packages:
- &pytorch_conda pytorch::pytorch>=2.0,<2.2.0a0
- torchdata
- pydantic
specific:
- output_types: [requirements]
matrices:
- matrix: {cuda: "12.*"}
packages:
- --extra-index-url=https://download.pytorch.org/whl/cu121
- matrix: {cuda: "11.*"}
packages:
- --extra-index-url=https://download.pytorch.org/whl/cu118
- {matrix: null, packages: null}
- output_types: [requirements, pyproject]
matrices:
- matrix: {cuda: "12.*"}
packages:
- &pytorch_pip torch>=2.0,<2.2.0a0
- *tensordict
- matrix: {cuda: "11.*"}
packages:
- *pytorch_pip
- *tensordict
- {matrix: null, packages: [*pytorch_pip, *tensordict]}
- output_types: [conda]
matrices:
- matrix: {cuda: "12.*"}
packages:
- pytorch-cuda=12.1
- matrix: {cuda: "11.*"}
packages:
- pytorch-cuda=11.8

depends_on_dgl:
specific:
- output_types: [conda]
matrices:
- matrix: {cuda: "12.*"}
packages:
- "dglteam/label/th21_cu121::dgl"
- matrix: {cuda: "11.*"}
packages:
- "dglteam/label/th21_cu118::dgl"
- {matrix: null, packages: ["dglteam/label/th23_cu121::dgl"]}

depends_on_pyg:
specific:
- output_types: [conda]
matrices:
- matrix: {cuda: "12.*"}
packages:
- "pyg::pyg"
- matrix: {cuda: "11.*"}
packages:
- "pyg::pyg"
- {matrix: null, packages: ["pyg::pyg"]}

depends_on_pylibwholegraph:
common:
- output_types: conda
Expand Down
10 changes: 7 additions & 3 deletions python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,24 @@ channels:
- rapidsai-nightly
- dask/label/dev
- pyg
- dglteam/label/cu118
- conda-forge
- nvidia
dependencies:
- cugraph==24.8.*
- dgl>=1.1.0.cu*
- dglteam/label/th21_cu118::dgl
- pandas
- pre-commit
- pydantic
- pylibcugraphops==24.8.*
- pytest
- pytest-benchmark
- pytest-cov
- pytest-xdist
- pytorch-cuda==11.8
- pytorch>=2.0
- pytorch-cuda=11.8
- pytorch::pytorch>=2.0
- pytorch::pytorch>=2.0,<2.2.0a0
- scipy
- tensordict>=0.1.2
- torchdata
name: cugraph_dgl_dev_cuda-118
8 changes: 5 additions & 3 deletions python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,23 @@ channels:
- rapidsai-nightly
- dask/label/dev
- pyg
- dglteam/label/cu118
- conda-forge
- nvidia
dependencies:
- cugraph==24.8.*
- pandas
- pre-commit
- pydantic
- pyg>=2.5,<2.6
- pylibcugraphops==24.8.*
- pytest
- pytest-benchmark
- pytest-cov
- pytest-xdist
- pytorch-cuda==11.8
- pytorch>=2.0
- pytorch-cuda=11.8
- pytorch::pytorch>=2.0
- pytorch::pytorch>=2.0,<2.2.0a0
- scipy
- tensordict>=0.1.2
- torchdata
name: cugraph_pyg_dev_cuda-118