From aa099e44d9a8eb7d9f57e21e6d5920c5ad69ae8c Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 22 Nov 2024 03:39:25 -0800 Subject: [PATCH] Relax PyTorch upper bound (allowing 2.4) (#75) As the issue around PyTorch being built without NumPy was fixed in conda-forge, we can now relax these upper bounds to allow PyTorch 2.4. xref: https://github.com/conda-forge/pytorch-cpu-feedstock/issues/254 xref: https://github.com/conda-forge/pytorch-cpu-feedstock/issues/266 xref: https://github.com/rapidsai/cugraph/pull/4615 xref: https://github.com/rapidsai/cugraph/pull/4703 xref: https://github.com/rapidsai/cugraph-gnn/pull/59 Authors: - https://github.com/jakirkham Approvers: - Jake Awe (https://github.com/AyodeAwe) - Tingyu Wang (https://github.com/tingyu66) URL: https://github.com/rapidsai/cugraph-gnn/pull/75 --- ci/test_python.sh | 6 +++--- ci/test_wheel_cugraph-dgl.sh | 2 +- ci/test_wheel_pylibwholegraph.sh | 2 +- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-121_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-124_arch-x86_64.yaml | 2 +- conda/recipes/cugraph-dgl/meta.yaml | 2 +- conda/recipes/cugraph-pyg/meta.yaml | 2 +- dependencies.yaml | 4 ++-- python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml | 2 +- python/cugraph-dgl/pyproject.toml | 2 +- python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml | 2 +- python/cugraph-pyg/pyproject.toml | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ci/test_python.sh b/ci/test_python.sh index 9c02a486..15949b40 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -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 @@ -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 @@ -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' diff --git a/ci/test_wheel_cugraph-dgl.sh b/ci/test_wheel_cugraph-dgl.sh index 9cd0e9e1..30a52e19 100755 --- a/ci/test_wheel_cugraph-dgl.sh +++ b/ci/test_wheel_cugraph-dgl.sh @@ -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)" diff --git a/ci/test_wheel_pylibwholegraph.sh b/ci/test_wheel_pylibwholegraph.sh index 6d4b7d98..acd9e16c 100755 --- a/ci/test_wheel_pylibwholegraph.sh +++ b/ci/test_wheel_pylibwholegraph.sh @@ -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 diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 48adcf51..fd907e78 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -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 diff --git a/conda/environments/all_cuda-121_arch-x86_64.yaml b/conda/environments/all_cuda-121_arch-x86_64.yaml index 825aa8c0..ee0fda9f 100644 --- a/conda/environments/all_cuda-121_arch-x86_64.yaml +++ b/conda/environments/all_cuda-121_arch-x86_64.yaml @@ -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 diff --git a/conda/environments/all_cuda-124_arch-x86_64.yaml b/conda/environments/all_cuda-124_arch-x86_64.yaml index 69e24e60..fd036066 100644 --- a/conda/environments/all_cuda-124_arch-x86_64.yaml +++ b/conda/environments/all_cuda-124_arch-x86_64.yaml @@ -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 diff --git a/conda/recipes/cugraph-dgl/meta.yaml b/conda/recipes/cugraph-dgl/meta.yaml index 16bbe24b..c2ca0a89 100644 --- a/conda/recipes/cugraph-dgl/meta.yaml +++ b/conda/recipes/cugraph-dgl/meta.yaml @@ -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: diff --git a/conda/recipes/cugraph-pyg/meta.yaml b/conda/recipes/cugraph-pyg/meta.yaml index 95432095..511f6824 100644 --- a/conda/recipes/cugraph-pyg/meta.yaml +++ b/conda/recipes/cugraph-pyg/meta.yaml @@ -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 }} diff --git a/dependencies.yaml b/dependencies.yaml index 8cb55d1c..21027dce 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -388,7 +388,7 @@ dependencies: common: - output_types: [conda] packages: - - pytorch::pytorch>=2.3,<2.4.0a0 + - pytorch>=2.3 - torchdata - pydantic specific: @@ -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: 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 2bf192e3..12cc2b7c 100644 --- a/python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml +++ b/python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml @@ -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 diff --git a/python/cugraph-dgl/pyproject.toml b/python/cugraph-dgl/pyproject.toml index 97e5cbca..ece24ac5 100644 --- a/python/cugraph-dgl/pyproject.toml +++ b/python/cugraph-dgl/pyproject.toml @@ -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] 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 f5f1bfbe..10cb8015 100644 --- a/python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml +++ b/python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml @@ -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 diff --git a/python/cugraph-pyg/pyproject.toml b/python/cugraph-pyg/pyproject.toml index a7ae5d0f..b9c89859 100644 --- a/python/cugraph-pyg/pyproject.toml +++ b/python/cugraph-pyg/pyproject.toml @@ -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]