diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index d77129f..18a2a46 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -5,7 +5,6 @@ channels: - rapidsai-nightly - dask/label/dev - pyg -- dglteam/label/cu118 - conda-forge - nvidia dependencies: @@ -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 @@ -30,7 +30,9 @@ dependencies: - numpydoc - pandas - pre-commit +- pydantic - pydata-sphinx-theme +- pyg::pyg - pylibcugraphops==24.8.* - pylibraft==24.8.* - pylibwholegraph==24.8.* @@ -38,6 +40,8 @@ dependencies: - 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.* @@ -48,6 +52,7 @@ dependencies: - sphinx-markdown-tables - sphinx<6 - sphinxcontrib-websupport +- torchdata - wget - wheel name: all_cuda-118_arch-x86_64 diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-121_arch-x86_64.yaml similarity index 85% rename from conda/environments/all_cuda-122_arch-x86_64.yaml rename to conda/environments/all_cuda-121_arch-x86_64.yaml index adb3cd0..ca6952f 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-121_arch-x86_64.yaml @@ -5,7 +5,6 @@ channels: - rapidsai-nightly - dask/label/dev - pyg -- dglteam/label/cu118 - conda-forge - nvidia dependencies: @@ -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 @@ -35,7 +35,9 @@ dependencies: - numpydoc - pandas - pre-commit +- pydantic - pydata-sphinx-theme +- pyg::pyg - pylibcugraphops==24.8.* - pylibraft==24.8.* - pylibwholegraph==24.8.* @@ -43,6 +45,8 @@ dependencies: - 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.* @@ -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 diff --git a/dependencies.yaml b/dependencies.yaml index 57e7bdd..1a4abb2 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -3,7 +3,7 @@ files: all: output: [conda] matrix: - cuda: ["11.8", "12.2"] + cuda: ["11.8", "12.1"] arch: [x86_64] includes: - checks @@ -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 @@ -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: @@ -132,6 +137,7 @@ files: - checks - depends_on_cugraph - depends_on_pylibcugraphops + - depends_on_pytorch - cugraph_pyg_dev - test_python_common channels: @@ -139,7 +145,6 @@ channels: - rapidsai-nightly - dask/label/dev - pyg - - dglteam/label/cu118 - conda-forge - nvidia dependencies: @@ -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: @@ -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 diff --git a/python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml b/python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml index b03bb14..6dd77f7 100644 --- a/python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml +++ b/python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml @@ -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 diff --git a/python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml b/python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml index 6d21e30..b08313c 100644 --- a/python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml +++ b/python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml @@ -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