Skip to content

Commit

Permalink
Bump nccl; update torch pins
Browse files Browse the repository at this point in the history
  • Loading branch information
hcho3 committed Sep 26, 2024
1 parent 195c5df commit 7d7d042
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 20 deletions.
9 changes: 3 additions & 6 deletions ci/test_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@ if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then
cugraph \
cugraph-dgl \
'dgl>=1.1.0.cu*,<=2.0.0.cu*' \
'pytorch>=2.0,<2.4' \
'numpy>=2.0' \
'pytorch>=2.3,<2.4' \
'cuda-version=11.8'

rapids-print-env
Expand Down Expand Up @@ -211,8 +210,7 @@ if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then
--channel "${PYTHON_CHANNEL}" \
--channel pyg \
"cugraph-pyg" \
"ogb" \
"numpy>=2.0"
"ogb"

pip install \
pyg_lib \
Expand Down Expand Up @@ -255,8 +253,7 @@ if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then
--channel "${PYTHON_CHANNEL}" \
--channel conda-forge \
--channel nvidia \
cugraph-equivariant \
"numpy>=2.0"
cugraph-equivariant
pip install e3nn==0.5.1

rapids-print-env
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies:
- libraft==24.10.*,>=0.0.0a0
- librmm==24.10.*,>=0.0.0a0
- nbsphinx
- nccl>=2.18.1.1
- nccl>=2.19
- networkx>=2.5.1
- networkx>=3.0
- ninja
Expand All @@ -57,7 +57,7 @@ dependencies:
- pytest-mpl
- pytest-xdist
- python-louvain
- pytorch>=2.0,<2.4.0a0
- pytorch>=2.3,<2.4.0a0
- raft-dask==24.10.*,>=0.0.0a0
- rapids-build-backend>=0.3.1,<0.4.0.dev0
- rapids-dask-dependency==24.10.*,>=0.0.0a0
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies:
- libraft==24.10.*,>=0.0.0a0
- librmm==24.10.*,>=0.0.0a0
- nbsphinx
- nccl>=2.18.1.1
- nccl>=2.19
- networkx>=2.5.1
- networkx>=3.0
- ninja
Expand All @@ -62,7 +62,7 @@ dependencies:
- pytest-mpl
- pytest-xdist
- python-louvain
- pytorch>=2.0,<2.4.0a0
- pytorch>=2.3,<2.4.0a0
- raft-dask==24.10.*,>=0.0.0a0
- rapids-build-backend>=0.3.1,<0.4.0.dev0
- rapids-dask-dependency==24.10.*,>=0.0.0a0
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cugraph-dgl/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ requirements:
- pylibcugraphops ={{ minor_version }}
- tensordict >=0.1.2
- python
- pytorch >=2.0,<2.4.0a0
- pytorch >=2.3,<2.4.0a0
- cupy >=12.0.0

tests:
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cugraph-pyg/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ requirements:
- numba >=0.57
- numpy >=1.23,<3.0a0
- python
- pytorch >=2.0,<2.4.0a0
- pytorch >=2.3,<2.4.0a0
- cupy >=12.0.0
- cugraph ={{ version }}
- pylibcugraphops ={{ minor_version }}
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/libcugraph/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ doxygen_version:
- ">=1.8.11"

nccl_version:
- ">=2.18.1.1"
- ">=2.19"

c_stdlib:
- sysroot
Expand Down
6 changes: 3 additions & 3 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ dependencies:
- aiohttp
- fsspec>=0.6.0
- requests
- nccl>=2.18.1.1
- nccl>=2.19
- ucx-proc=*=gpu
- &ucx_py_unsuffixed ucx-py==0.40.*,>=0.0.0a0
- output_types: pyproject
Expand Down Expand Up @@ -697,7 +697,7 @@ dependencies:
- *cugraph_unsuffixed
# ceiling could be removed when this is fixed:
# https://github.com/conda-forge/pytorch-cpu-feedstock/issues/254
- &pytorch_conda pytorch>=2.0,<2.4.0a0
- &pytorch_conda pytorch>=2.3,<2.4.0a0
- pytorch-cuda==11.8
- &tensordict tensordict>=0.1.2
- dgl>=1.1.0.cu*
Expand Down Expand Up @@ -735,7 +735,7 @@ dependencies:
matrices:
- matrix: {cuda: "12.*"}
packages:
- &pytorch_pip torch>=2.0,<2.4.0a0
- &pytorch_pip torch>=2.3,<2.4.0a0
- *tensordict
- matrix: {cuda: "11.*"}
packages:
Expand Down
2 changes: 1 addition & 1 deletion python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies:
- pytest-cov
- pytest-xdist
- pytorch-cuda==11.8
- pytorch>=2.0,<2.4.0a0
- pytorch>=2.3,<2.4.0a0
- scipy
- tensordict>=0.1.2
name: cugraph_dgl_dev_cuda-118
2 changes: 1 addition & 1 deletion python/cugraph-dgl/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ test = [
"pytest-xdist",
"scipy",
"tensordict>=0.1.2",
"torch>=2.0,<2.4.0a0",
"torch>=2.3,<2.4.0a0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies:
- pytest-cov
- pytest-xdist
- pytorch-cuda==11.8
- pytorch>=2.0,<2.4.0a0
- pytorch>=2.3,<2.4.0a0
- scipy
- tensordict>=0.1.2
name: cugraph_pyg_dev_cuda-118
2 changes: 1 addition & 1 deletion python/cugraph-pyg/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ test = [
"pytest-xdist",
"scipy",
"tensordict>=0.1.2",
"torch>=2.0,<2.4.0a0",
"torch>=2.3,<2.4.0a0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

[tool.setuptools]
Expand Down

0 comments on commit 7d7d042

Please sign in to comment.