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

Relax PyTorch upper bound (allowing 2.4) #75

Merged
merged 1 commit into from
Nov 22, 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
6 changes: 3 additions & 3 deletions ci/test_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ if [[ "${RUNNER_ARCH}" != "ARM64" ]]; then
--channel nvidia \
"pylibwholegraph=${RAPIDS_VERSION}" \
"cugraph-dgl=${RAPIDS_VERSION}" \
'pytorch::pytorch>=2.3,<2.4' \
'pytorch>=2.3' \
"ogb"

rapids-print-env
Expand Down Expand Up @@ -111,7 +111,7 @@ if [[ "${RUNNER_ARCH}" != "ARM64" ]]; then
--channel pytorch \
"pylibwholegraph=${RAPIDS_VERSION}" \
"cugraph-pyg=${RAPIDS_VERSION}" \
'pytorch::pytorch>=2.3,<2.4' \
'pytorch>=2.3' \
'ogb'

rapids-print-env
Expand Down Expand Up @@ -149,7 +149,7 @@ if [[ "${RUNNER_ARCH}" != "ARM64" ]]; then
--channel pytorch \
'mkl<2024.1.0' \
"pylibwholegraph=${RAPIDS_VERSION}" \
'pytorch::pytorch>=2.3,<2.4' \
'pytorch>=2.3' \
'pytest-forked' \
'ogb'

Expand Down
2 changes: 1 addition & 1 deletion ci/test_wheel_cugraph-dgl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ python -m pip install \
"$(echo ./local-deps/pylibwholegraph_${RAPIDS_PY_CUDA_SUFFIX}*.whl)" \
"$(echo ./dist/cugraph_dgl_${RAPIDS_PY_CUDA_SUFFIX}*.whl)[test]" \
'dgl==2.4.0' \
'torch>=2.0,<2.4.0a0'
'torch>=2.3'

# RAPIDS_DATASET_ROOT_DIR is used by test scripts
export RAPIDS_DATASET_ROOT_DIR="$(realpath datasets)"
Expand Down
2 changes: 1 addition & 1 deletion ci/test_wheel_pylibwholegraph.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ rapids-logger "Installing Packages"
rapids-retry python -m pip install \
--extra-index-url ${INDEX_URL} \
"$(echo ./dist/pylibwholegraph*.whl)[test]" \
'torch>=2.0,<2.4.0a0'
'torch>=2.3'

rapids-logger "pytest pylibwholegraph"
cd python/pylibwholegraph/pylibwholegraph/tests
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies:
- pytest-forked
- pytest-xdist
- pytorch-cuda=11.8
- pytorch::pytorch>=2.3,<2.4.0a0
- pytorch>=2.3
- pytorch_geometric>=2.5,<2.6
- raft-dask==24.12.*,>=0.0.0a0
- rapids-build-backend>=0.3.0,<0.4.0.dev0
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-121_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ dependencies:
- pytest-forked
- pytest-xdist
- pytorch-cuda=12.1
- pytorch::pytorch>=2.3,<2.4.0a0
- pytorch>=2.3
- pytorch_geometric>=2.5,<2.6
- raft-dask==24.12.*,>=0.0.0a0
- rapids-build-backend>=0.3.0,<0.4.0.dev0
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-124_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ dependencies:
- pytest-forked
- pytest-xdist
- pytorch-cuda=12.4
- pytorch::pytorch>=2.3,<2.4.0a0
- pytorch>=2.3
- pytorch_geometric>=2.5,<2.6
- raft-dask==24.12.*,>=0.0.0a0
- rapids-build-backend>=0.3.0,<0.4.0.dev0
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 @@ -32,7 +32,7 @@ requirements:
- pylibcugraphops ={{ minor_version }}
- tensordict >=0.1.2
- python
- pytorch >=2.3,<2.4.0a0
- pytorch >=2.3
- 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 @@ -32,7 +32,7 @@ requirements:
- numpy >=1.23,<3.0a0
- pandas
- python
- pytorch >=2.3,<2.4.0a0
- pytorch >=2.3
- cupy >=12.0.0
- cugraph ={{ minor_version }}
- pylibcugraphops ={{ minor_version }}
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ dependencies:
common:
- output_types: [conda]
packages:
- pytorch::pytorch>=2.3,<2.4.0a0
- pytorch>=2.3
- torchdata
- pydantic
specific:
Expand All @@ -405,7 +405,7 @@ dependencies:
matrices:
- matrix: {cuda: "12.*"}
packages:
- &pytorch_pip torch>=2.3,<2.4.0a0
- &pytorch_pip torch>=2.3
- *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 @@ -18,7 +18,7 @@ dependencies:
- pytest-cov
- pytest-xdist
- pytorch-cuda=11.8
- pytorch::pytorch>=2.3,<2.4.0a0
- pytorch>=2.3
- tensordict>=0.1.2
- torchdata
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 @@ -38,7 +38,7 @@ test = [
"pytest-cov",
"pytest-xdist",
"tensordict>=0.1.2",
"torch>=2.3,<2.4.0a0",
"torch>=2.3",
] # 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 @@ -16,7 +16,7 @@ dependencies:
- pytest-cov
- pytest-xdist
- pytorch-cuda=11.8
- pytorch::pytorch>=2.3,<2.4.0a0
- pytorch>=2.3
- pytorch_geometric>=2.5,<2.6
- tensordict>=0.1.2
- torchdata
Expand Down
2 changes: 1 addition & 1 deletion python/cugraph-pyg/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ test = [
"pytest-xdist",
"tensordict>=0.1.2",
"torch-geometric>=2.5,<2.6",
"torch>=2.3,<2.4.0a0",
"torch>=2.3",
] # 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
Loading