From 5c85d03f481eeeda2143cd665a69eb7dcc79667d Mon Sep 17 00:00:00 2001 From: rusty1s Date: Mon, 11 Nov 2024 18:53:18 +0000 Subject: [PATCH 1/3] update --- .github/actions/setup/action.yml | 2 +- .github/workflows/aws/upload_nightly_index.py | 4 ++++ .github/workflows/building.yml | 10 ++++++++-- .github/workflows/nightly.yml | 8 +++++++- README.md | 8 +++++++- 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 99e06303b..1e91451d0 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -6,7 +6,7 @@ inputs: default: '3.9' torch-version: required: false - default: '2.4.0' + default: '2.5.0' cuda-version: required: false default: cpu diff --git a/.github/workflows/aws/upload_nightly_index.py b/.github/workflows/aws/upload_nightly_index.py index ddbb38fff..50264376b 100644 --- a/.github/workflows/aws/upload_nightly_index.py +++ b/.github/workflows/aws/upload_nightly_index.py @@ -35,6 +35,10 @@ wheels_dict[torch_version.replace('2.2.0', '2.2.2')].append(wheel) if '2.3.0' in torch_version: wheels_dict[torch_version.replace('2.3.0', '2.3.1')].append(wheel) + if '2.4.0' in torch_version: + wheels_dict[torch_version.replace('2.4.0', '2.4.1')].append(wheel) + if '2.5.0' in torch_version: + wheels_dict[torch_version.replace('2.5.0', '2.5.1')].append(wheel) index_html = html.format('\n'.join([ href.format(f'{version}.html'.replace('+', '%2B'), version) diff --git a/.github/workflows/building.yml b/.github/workflows/building.yml index 34a47c6c9..df72269a1 100644 --- a/.github/workflows/building.yml +++ b/.github/workflows/building.yml @@ -12,8 +12,8 @@ jobs: matrix: os: [ubuntu-20.04, macos-14, windows-2019] python-version: ['3.9', '3.10', '3.11', '3.12'] - # torch-version: [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.2.0, 2.3.0, 2.4.0] - torch-version: [2.4.0] + # torch-version: [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.2.0, 2.3.0, 2.4.0, 2.5.0] + torch-version: [2.5.0] cuda-version: ['cpu', 'cu113', 'cu116', 'cu117', 'cu118', 'cu121', 'cu124'] exclude: - torch-version: 1.12.0 @@ -80,6 +80,12 @@ jobs: cuda-version: 'cu116' - torch-version: 2.4.0 cuda-version: 'cu117' + - torch-version: 2.5.0 + cuda-version: 'cu113' + - torch-version: 2.5.0 + cuda-version: 'cu116' + - torch-version: 2.5.0 + cuda-version: 'cu117' - os: macos-14 cuda-version: 'cu113' - os: macos-14 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index b0dc0f23f..7155e61cb 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -16,7 +16,7 @@ jobs: matrix: os: [ubuntu-20.04, macos-14, windows-2019] python-version: ['3.9', '3.10', '3.11', '3.12'] - torch-version: [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.2.0, 2.3.0, 2.4.0] + torch-version: [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.2.0, 2.3.0, 2.4.0, 2.5.0] cuda-version: ['cpu', 'cu113', 'cu116', 'cu117', 'cu118', 'cu121', 'cu124'] exclude: - torch-version: 1.12.0 @@ -83,6 +83,12 @@ jobs: cuda-version: 'cu116' - torch-version: 2.4.0 cuda-version: 'cu117' + - torch-version: 2.5.0 + cuda-version: 'cu113' + - torch-version: 2.5.0 + cuda-version: 'cu116' + - torch-version: 2.5.0 + cuda-version: 'cu117' - os: macos-14 cuda-version: 'cu113' - os: macos-14 diff --git a/README.md b/README.md index 00832eee8..80293a405 100644 --- a/README.md +++ b/README.md @@ -29,11 +29,17 @@ pip install pyg-lib -f https://data.pyg.org/whl/torch-${TORCH}+${CUDA}.html where -* `${TORCH}` should be replaced by either `1.12.0`, `1.13.0`, `2.0.0`, `2.1.0`, `2.2.0`, `2.3.0`, or `2.4.0` +* `${TORCH}` should be replaced by either `1.12.0`, `1.13.0`, `2.0.0`, `2.1.0`, `2.2.0`, `2.3.0`, `2.4.0` or `2.5.0` * `${CUDA}` should be replaced by either `cpu`, `cu102`, `cu113`, `cu116`, `cu117`, `cu118`, or `cu121` The following combinations are supported: +| PyTorch 2.5 | `cpu` | `cu113` | `cu116` | `cu117` | `cu118` | `cu121` | `cu124` | +|--------------|-------|---------|---------|---------|---------|---------|---------| +| **Linux** | ✅ | | | | ✅ | ✅ | ✅ | +| **Windows** | ✅ | | | | ✅ | ✅ | ✅ | +| **macOS** | ✅ | | | | | | | + | PyTorch 2.4 | `cpu` | `cu113` | `cu116` | `cu117` | `cu118` | `cu121` | `cu124` | |--------------|-------|---------|---------|---------|---------|---------|---------| | **Linux** | ✅ | | | | ✅ | ✅ | ✅ | From c63e087ce91190719b38ad225bfe9e064d951188 Mon Sep 17 00:00:00 2001 From: rusty1s Date: Mon, 11 Nov 2024 18:55:35 +0000 Subject: [PATCH 2/3] update --- CHANGELOG.md | 1 + README.md | 2 +- docs/requirements.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db05f9710..d1cd6ddb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). ## [0.5.0] - 2023-MM-DD ### Added +- Added PyTorch 2.5 support ([#360](https://github.com/pyg-team/pyg-lib/pull/338)) - Added PyTorch 2.4 support ([#338](https://github.com/pyg-team/pyg-lib/pull/338)) - Added PyTorch 2.3 support ([#322](https://github.com/pyg-team/pyg-lib/pull/322)) - Added Windows support ([#315](https://github.com/pyg-team/pyg-lib/pull/315)) diff --git a/README.md b/README.md index 80293a405..f4ce33f02 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ pip install pyg-lib -f https://data.pyg.org/whl/torch-${TORCH}+${CUDA}.html where * `${TORCH}` should be replaced by either `1.12.0`, `1.13.0`, `2.0.0`, `2.1.0`, `2.2.0`, `2.3.0`, `2.4.0` or `2.5.0` -* `${CUDA}` should be replaced by either `cpu`, `cu102`, `cu113`, `cu116`, `cu117`, `cu118`, or `cu121` +* `${CUDA}` should be replaced by either `cpu`, `cu102`, `cu113`, `cu116`, `cu117`, `cu118`, `cu121`, or `cu124` The following combinations are supported: diff --git a/docs/requirements.txt b/docs/requirements.txt index 0f487c7a3..907cd381d 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ -https://download.pytorch.org/whl/cpu/torch-2.4.1%2Bcpu-cp39-cp39-linux_x86_64.whl +https://download.pytorch.org/whl/cpu/torch-2.5.0%2Bcpu-cp39-cp39-linux_x86_64.whl git+https://github.com/pyg-team/pyg_sphinx_theme.git From f69ee535032eb08f00c9088dd110e86f6ab1e41e Mon Sep 17 00:00:00 2001 From: rusty1s Date: Mon, 11 Nov 2024 19:12:53 +0000 Subject: [PATCH 3/3] update --- pyg_lib/csrc/random/cpu/rand_engine.h | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pyg_lib/csrc/random/cpu/rand_engine.h b/pyg_lib/csrc/random/cpu/rand_engine.h index 61aa977ca..290b940aa 100644 --- a/pyg_lib/csrc/random/cpu/rand_engine.h +++ b/pyg_lib/csrc/random/cpu/rand_engine.h @@ -134,19 +134,20 @@ class RandintEngine { for (auto& val : dst) val = static_cast((*this)(beg, end)); }; -#if WITH_MKL_BLAS() - const bool use_fallback_func = count > std::numeric_limits::max(); - if (use_fallback_func) { - fallback_func(beg, end, result); - } else { - const auto b = static_cast(beg); - const auto e = static_cast(end); - const auto c = static_cast(count); - viRngUniform(VSL_RNG_METHOD_UNIFORM_STD, stream_, c, result.data(), b, e); - } -#else + // #if WITH_MKL_BLAS() + // const bool use_fallback_func = count > + // std::numeric_limits::max(); if (use_fallback_func) { + // fallback_func(beg, end, result); + // } else { + // const auto b = static_cast(beg); + // const auto e = static_cast(end); + // const auto c = static_cast(count); + // viRngUniform(VSL_RNG_METHOD_UNIFORM_STD, stream_, c, result.data(), + // b, e); + // } + // #else fallback_func(beg, end, result); -#endif + // #endif return result; }