Add PyTorch 2.5 support (#360)

.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

.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)

.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

.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

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))

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`
-* `${CUDA}` should be replaced by either `cpu`, `cu102`, `cu113`, `cu116`, `cu117`, `cu118`, or `cu121`
+* `${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`, `cu121`, or `cu124`
 
 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**    | ✅    |         |         |         | ✅      | ✅      | ✅      |

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

pyg_lib/csrc/random/cpu/rand_engine.h

@@ -134,19 +134,20 @@ class RandintEngine {
       for (auto& val : dst)
         val = static_cast<int>((*this)(beg, end));
     };
-#if WITH_MKL_BLAS()
-    const bool use_fallback_func = count > std::numeric_limits<MKL_INT>::max();
-    if (use_fallback_func) {
-      fallback_func(beg, end, result);
-    } else {
-      const auto b = static_cast<int>(beg);
-      const auto e = static_cast<int>(end);
-      const auto c = static_cast<MKL_INT>(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<MKL_INT>::max(); if (use_fallback_func) {
+    //   fallback_func(beg, end, result);
+    // } else {
+    //   const auto b = static_cast<int>(beg);
+    //   const auto e = static_cast<int>(end);
+    //   const auto c = static_cast<MKL_INT>(count);
+    //   viRngUniform(VSL_RNG_METHOD_UNIFORM_STD, stream_, c, result.data(),
+    //   b, e);
+    // }
+    // #else
     fallback_func(beg, end, result);
-#endif
+    // #endif
     return result;
   }