Skip to content

Commit eafcb5b

Browse files
authored
PyTorch 2.6 support (#246)
* update * update * update
1 parent 437bd18 commit eafcb5b

File tree

11 files changed

+69
-214
lines changed

11 files changed

+69
-214
lines changed

.github/workflows/building-conda.yml

Lines changed: 0 additions & 84 deletions
This file was deleted.

.github/workflows/building.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,22 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
os: [ubuntu-20.04, macos-14, windows-2019]
14-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
15-
torch-version: [2.5.0] # [2.3.0, 2.4.0, 2.5.0]
16-
cuda-version: ['cpu', 'cu118', 'cu121', 'cu124']
14+
python-version: ['3.9', '3.10', '3.11', '3.12']
15+
torch-version: [2.6.0] # [2.5.0]
16+
cuda-version: ['cpu', 'cu118', 'cu121', 'cu124', 'cu126']
1717
exclude:
1818
- torch-version: 2.5.0
19-
python-version: '3.8'
20-
- torch-version: 2.3.0
21-
cuda-version: 'cu124'
19+
cuda-version: 'cu126'
20+
- torch-version: 2.6.0
21+
cuda-version: 'cu121'
2222
- os: macos-14
2323
cuda-version: 'cu118'
2424
- os: macos-14
2525
cuda-version: 'cu121'
2626
- os: macos-14
2727
cuda-version: 'cu124'
28+
- os: macos-14
29+
cuda-version: 'cu126'
2830

2931
steps:
3032
- uses: actions/checkout@v2
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
3+
CUDA_HOME=/usr/local/cuda-12.6
4+
LD_LIBRARY_PATH=${CUDA_HOME}/lib64:${LD_LIBRARY_PATH}
5+
PATH=${CUDA_HOME}/bin:${PATH}
6+
7+
export FORCE_CUDA=1
8+
export TORCH_CUDA_ARCH_LIST="5.0+PTX;6.0;7.0;7.5;8.0;8.6;9.0"
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
3+
OS=ubuntu2004
4+
5+
wget -nv https://developer.download.nvidia.com/compute/cuda/repos/${OS}/x86_64/cuda-${OS}.pin
6+
sudo mv cuda-${OS}.pin /etc/apt/preferences.d/cuda-repository-pin-600
7+
wget -nv https://developer.download.nvidia.com/compute/cuda/12.6.0/local_installers/cuda-repo-${OS}-12-6-local_12.6.0-560.28.03-1_amd64.deb
8+
sudo dpkg -i cuda-repo-${OS}-12-6-local_12.6.0-560.28.03-1_amd64.deb
9+
sudo cp /var/cuda-repo-${OS}-12-6-local/cuda-*-keyring.gpg /usr/share/keyrings/
10+
11+
sudo apt-get -qq update
12+
sudo apt install cuda-nvcc-12-6 cuda-libraries-dev-12-6
13+
sudo apt clean
14+
15+
rm -f https://developer.download.nvidia.com/compute/cuda/12.6.0/local_installers/cuda-repo-${OS}-12-6-local_12.6.0-560.28.03-1_amd64.deb
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
3+
CUDA_HOME=/c/Program\ Files/NVIDIA\ GPU\ Computing\ Toolkit/CUDA/v12.6
4+
PATH=${CUDA_HOME}/bin:$PATH
5+
PATH=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/MSBuild/15.0/Bin:$PATH
6+
7+
export FORCE_CUDA=1
8+
export TORCH_CUDA_ARCH_LIST="6.0+PTX"
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
3+
# Install NVIDIA drivers, see:
4+
# https://github.com/pytorch/vision/blob/master/packaging/windows/internal/cuda_install.bat#L99-L102
5+
curl -k -L "https://drive.google.com/u/0/uc?id=1injUyo3lnarMgWyRcXqKg4UGnN0ysmuq&export=download" --output "/tmp/gpu_driver_dlls.zip"
6+
7z x "/tmp/gpu_driver_dlls.zip" -o"/c/Windows/System32"
7+
8+
export CUDA_SHORT=12.6
9+
export CUDA_URL=https://developer.download.nvidia.com/compute/cuda/${CUDA_SHORT}.0/local_installers
10+
export CUDA_FILE=cuda_${CUDA_SHORT}.0_560.76_windows.exe
11+
12+
# Install CUDA:
13+
curl -k -L "${CUDA_URL}/${CUDA_FILE}" --output "${CUDA_FILE}"
14+
echo ""
15+
echo "Installing from ${CUDA_FILE}..."
16+
PowerShell -Command "Start-Process -FilePath \"${CUDA_FILE}\" -ArgumentList \"-s nvcc_${CUDA_SHORT} cuobjdump_${CUDA_SHORT} nvprune_${CUDA_SHORT} cupti_${CUDA_SHORT} cublas_dev_${CUDA_SHORT} cudart_${CUDA_SHORT} cufft_dev_${CUDA_SHORT} curand_dev_${CUDA_SHORT} cusolver_dev_${CUDA_SHORT} cusparse_dev_${CUDA_SHORT} thrust_${CUDA_SHORT} npp_dev_${CUDA_SHORT} nvrtc_dev_${CUDA_SHORT} nvml_dev_${CUDA_SHORT}\" -Wait -NoNewWindow"
17+
echo "Done!"
18+
rm -f "${CUDA_FILE}"

.github/workflows/testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
matrix:
1717
os: [ubuntu-latest, windows-latest]
1818
python-version: [3.9]
19-
torch-version: [2.4.0, 2.5.0]
19+
torch-version: [2.5.0, 2.6.0]
2020

2121
steps:
2222
- uses: actions/checkout@v2

README.md

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,41 +30,33 @@ All included operations work on varying data types and are implemented both for
3030

3131
## Installation
3232

33-
### Anaconda
34-
35-
**Update:** You can now install `pytorch-cluster` via [Anaconda](https://anaconda.org/pyg/pytorch-cluster) for all major OS/PyTorch/CUDA combinations 🤗
36-
Given that you have [`pytorch >= 1.8.0` installed](https://pytorch.org/get-started/locally/), simply run
37-
38-
```
39-
conda install pytorch-cluster -c pyg
40-
```
41-
4233
### Binaries
4334

44-
We alternatively provide pip wheels for all major OS/PyTorch/CUDA combinations, see [here](https://data.pyg.org/whl).
35+
We provide pip wheels for all major OS/PyTorch/CUDA combinations, see [here](https://data.pyg.org/whl).
4536

46-
#### PyTorch 2.5
37+
#### PyTorch 2.6
4738

48-
To install the binaries for PyTorch 2.5.0, simply run
39+
To install the binaries for PyTorch 2.6.0, simply run
4940

5041
```
51-
pip install torch-cluster -f https://data.pyg.org/whl/torch-2.5.0+${CUDA}.html
42+
pip install torch-cluster -f https://data.pyg.org/whl/torch-2.6.0+${CUDA}.html
5243
```
5344

54-
where `${CUDA}` should be replaced by either `cpu`, `cu118`, `cu121`, or `cu124` depending on your PyTorch installation.
45+
where `${CUDA}` should be replaced by either `cpu`, `cu118`, `cu124`, or `cu126` depending on your PyTorch installation.
5546

56-
| | `cpu` | `cu118` | `cu121` | `cu124` |
47+
| | `cpu` | `cu118` | `cu124` | `cu126` |
5748
|-------------|-------|---------|---------|---------|
5849
| **Linux** |||||
5950
| **Windows** |||||
6051
| **macOS** || | | |
6152

62-
#### PyTorch 2.4
6353

64-
To install the binaries for PyTorch 2.4.0, simply run
54+
#### PyTorch 2.5
55+
56+
To install the binaries for PyTorch 2.5.0/2.5.1, simply run
6557

6658
```
67-
pip install torch-cluster -f https://data.pyg.org/whl/torch-2.4.0+${CUDA}.html
59+
pip install torch-cluster -f https://data.pyg.org/whl/torch-2.5.0+${CUDA}.html
6860
```
6961

7062
where `${CUDA}` should be replaced by either `cpu`, `cu118`, `cu121`, or `cu124` depending on your PyTorch installation.
@@ -75,7 +67,7 @@ where `${CUDA}` should be replaced by either `cpu`, `cu118`, `cu121`, or `cu124`
7567
| **Windows** |||||
7668
| **macOS** || | | |
7769

78-
**Note:** Binaries of older versions are also provided for PyTorch 1.4.0, PyTorch 1.5.0, PyTorch 1.6.0, PyTorch 1.7.0/1.7.1, PyTorch 1.8.0/1.8.1, PyTorch 1.9.0, PyTorch 1.10.0/1.10.1/1.10.2, PyTorch 1.11.0, PyTorch 1.12.0/1.12.1, PyTorch 1.13.0/1.13.1, PyTorch 2.0.0/2.0.1, PyTorch 2.1.0/2.1.1/2.1.2, PyTorch 2.2.0/2.2.1/2.2.2, and PyTorch 2.3.0/2.3.1 (following the same procedure).
70+
**Note:** Binaries of older versions are also provided for PyTorch 1.4.0, PyTorch 1.5.0, PyTorch 1.6.0, PyTorch 1.7.0/1.7.1, PyTorch 1.8.0/1.8.1, PyTorch 1.9.0, PyTorch 1.10.0/1.10.1/1.10.2, PyTorch 1.11.0, PyTorch 1.12.0/1.12.1, PyTorch 1.13.0/1.13.1, PyTorch 2.0.0/2.0.1, PyTorch 2.1.0/2.1.1/2.1.2, PyTorch 2.2.0/2.2.1/2.2.2, PyTorch 2.3.0/2.3.1, and PyTorch 2.4.0/2.4.1 (following the same procedure).
7971
For older versions, you need to explicitly specify the latest supported version number or install via `pip install --no-index` in order to prevent a manual installation from source.
8072
You can look up the latest supported version number [here](https://data.pyg.org/whl).
8173

conda/pytorch-cluster/README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

conda/pytorch-cluster/build_conda.sh

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)