Skip to content

Commit ef79a92

Browse files
rusty1srusty1s
authored
Added PyTorch 2.2 support (#205)
* update * update * update * update
1 parent 29cd22b commit ef79a92

File tree

6 files changed

+43
-30
lines changed

6 files changed

+43
-30
lines changed

‎.github/workflows/building-conda.yml

+10-8
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,22 @@ jobs:
1212
matrix:
1313
# We have trouble building for Windows - drop for now.
1414
os: [ubuntu-20.04, macos-11] # windows-2019
15-
python-version: ['3.8', '3.9', '3.10', '3.11']
16-
torch-version: [2.0.0, 2.1.0]
17-
cuda-version: ['cpu', 'cu117', 'cu118', 'cu121']
15+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
16+
torch-version: [2.2.0] # [2.1.0, 2.2.0]
17+
cuda-version: ['cpu', 'cu118', 'cu121']
1818
exclude:
19-
- torch-version: 2.0.0
20-
cuda-version: 'cu121'
19+
- python-version: '3.12' # Python 3.12 not yet supported in `conda-build`.
2120
- torch-version: 2.1.0
22-
cuda-version: 'cu117'
23-
- os: macos-11
24-
cuda-version: 'cu117'
21+
python-version: '3.12'
2522
- os: macos-11
2623
cuda-version: 'cu118'
2724
- os: macos-11
2825
cuda-version: 'cu121'
26+
# Fails with:
27+
# * note: 'value' has been explicitly marked unavailable here
28+
# * error: 'value' is unavailable: introduced in macOS 10.13
29+
- torch-version: 2.2.0
30+
os: macos-11
2931

3032
steps:
3133
- uses: actions/checkout@v2

‎.github/workflows/building.yml

+16-10
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,23 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
os: [ubuntu-20.04, macos-11, windows-2019]
14-
python-version: ['3.8', '3.9', '3.10', '3.11']
15-
torch-version: [2.0.0, 2.1.0]
16-
cuda-version: ['cpu', 'cu117', 'cu118', 'cu121']
14+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
15+
torch-version: [2.2.0] # [2.1.0, 2.2.0]
16+
cuda-version: ['cpu', 'cu118', 'cu121']
1717
exclude:
18-
- torch-version: 2.0.0
19-
cuda-version: 'cu121'
2018
- torch-version: 2.1.0
21-
cuda-version: 'cu117'
22-
- os: macos-11
23-
cuda-version: 'cu117'
19+
python-version: '3.12'
2420
- os: macos-11
2521
cuda-version: 'cu118'
2622
- os: macos-11
2723
cuda-version: 'cu121'
24+
# Fails with:
25+
# * note: 'value' has been explicitly marked unavailable here
26+
# * error: 'value' is unavailable: introduced in macOS 10.13
27+
- os: macos-11
28+
python-version: '3.11'
29+
- os: macos-11
30+
python-version: '3.12'
2831

2932
steps:
3033
- uses: actions/checkout@v2
@@ -36,8 +39,11 @@ jobs:
3639
- name: Upgrade pip
3740
run: |
3841
pip install --upgrade setuptools
39-
pip install scipy==1.10.1 # Python 3.8 support
40-
pip list
42+
43+
- name: Install scipy
44+
if: ${{ matrix.python-version == '3.8' }}
45+
run: |
46+
pip install scipy==1.10.1
4147
4248
- name: Free Disk Space (Ubuntu)
4349
if: ${{ runner.os == 'Linux' }}

‎.github/workflows/testing.yml

+6-2
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.8]
19-
torch-version: [2.0.0, 2.1.0]
19+
torch-version: [2.1.0, 2.2.0]
2020

2121
steps:
2222
- uses: actions/checkout@v2
@@ -29,9 +29,13 @@ jobs:
2929
run: |
3030
pip install torch==${{ matrix.torch-version }} --extra-index-url https://download.pytorch.org/whl/cpu
3131
32+
- name: Install scipy
33+
if: ${{ matrix.python-version == '3.8' }}
34+
run: |
35+
pip install scipy==1.10.1
36+
3237
- name: Install main package
3338
run: |
34-
pip install scipy==1.10.1 # Python 3.8 support
3539
python setup.py develop
3640
3741
- name: Run test-suite

‎README.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ conda install pytorch-cluster -c pyg
4343

4444
We alternatively provide pip wheels for all major OS/PyTorch/CUDA combinations, see [here](https://data.pyg.org/whl).
4545

46-
#### PyTorch 2.1
46+
#### PyTorch 2.2
4747

48-
To install the binaries for PyTorch 2.1.0, simply run
48+
To install the binaries for PyTorch 2.2.0, simply run
4949

5050
```
51-
pip install torch-cluster -f https://data.pyg.org/whl/torch-2.1.0+${CUDA}.html
51+
pip install torch-cluster -f https://data.pyg.org/whl/torch-2.2.0+${CUDA}.html
5252
```
5353

5454
where `${CUDA}` should be replaced by either `cpu`, `cu118`, or `cu121` depending on your PyTorch installation.
@@ -59,23 +59,23 @@ where `${CUDA}` should be replaced by either `cpu`, `cu118`, or `cu121` dependin
5959
| **Windows** | ✅ | ✅ | ✅ |
6060
| **macOS** | ✅ | | |
6161

62-
#### PyTorch 2.0
62+
#### PyTorch 2.1
6363

64-
To install the binaries for PyTorch 2.0.0, simply run
64+
To install the binaries for PyTorch 2.1.0, simply run
6565

6666
```
67-
pip install torch-cluster -f https://data.pyg.org/whl/torch-2.0.0+${CUDA}.html
67+
pip install torch-cluster -f https://data.pyg.org/whl/torch-2.1.0+${CUDA}.html
6868
```
6969

70-
where `${CUDA}` should be replaced by either `cpu`, `cu117`, or `cu118` depending on your PyTorch installation.
70+
where `${CUDA}` should be replaced by either `cpu`, `cu118`, or `cu121` depending on your PyTorch installation.
7171

72-
| | `cpu` | `cu117` | `cu118` |
72+
| | `cpu` | `cu118` | `cu121` |
7373
|-------------|-------|---------|---------|
7474
| **Linux** | ✅ | ✅ | ✅ |
7575
| **Windows** | ✅ | ✅ | ✅ |
7676
| **macOS** | ✅ | | |
7777

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 and PyTorch 1.13.0/1.13.1 (following the same procedure).
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, and PyTorch 2.0.0 (following the same procedure).
7979
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.
8080
You can look up the latest supported version number [here](https://data.pyg.org/whl).
8181

‎conda/pytorch-cluster/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
```
2-
./build_conda.sh 3.9 2.1.0 cu118 # python, pytorch and cuda version
2+
./build_conda.sh 3.11 2.2.0 cu118 # python, pytorch and cuda version
33
```

‎setup.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ classifiers =
1010
Programming Language :: Python :: 3.9
1111
Programming Language :: Python :: 3.10
1212
Programming Language :: Python :: 3.11
13+
Programming Language :: Python :: 3.12
1314
Programming Language :: Python :: 3 :: Only
1415

1516
[aliases]

0 commit comments

Comments
 (0)