Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add PyTorch 2.3 support #439

Merged
merged 4 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions .github/workflows/building-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,14 @@ jobs:
fail-fast: false
matrix:
# We have trouble building for Windows - drop for now.
os: [ubuntu-20.04, macos-11] # windows-2019
os: [ubuntu-20.04] # windows-2019
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
torch-version: [2.2.0] # [2.1.0, 2.2.0]
torch-version: [2.3.0] # [2.1.0, 2.2.0, 2.3.0]
cuda-version: ['cpu', 'cu118', 'cu121']
exclude:
- python-version: '3.12' # Python 3.12 not yet supported in `conda-build`.
- torch-version: 2.1.0
python-version: '3.12'
- os: macos-11
cuda-version: 'cu118'
- os: macos-11
cuda-version: 'cu121'
# Fails with:
# * note: 'value' has been explicitly marked unavailable here
# * error: 'value' is unavailable: introduced in macOS 10.13
- torch-version: 2.2.0
os: macos-11

steps:
- uses: actions/checkout@v2
Expand Down
15 changes: 4 additions & 11 deletions .github/workflows/building.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,17 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, macos-11, windows-2019]
os: [ubuntu-20.04, macos-14, windows-2019]
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
torch-version: [2.2.0] # [2.1.0, 2.2.0]
torch-version: [2.3.0] # [2.1.0, 2.2.0, 2.3.0]
cuda-version: ['cpu', 'cu118', 'cu121']
exclude:
- torch-version: 2.1.0
python-version: '3.12'
- os: macos-11
- os: macos-14
cuda-version: 'cu118'
- os: macos-11
- os: macos-14
cuda-version: 'cu121'
# Fails with:
# * note: 'value' has been explicitly marked unavailable here
# * error: 'value' is unavailable: introduced in macOS 10.13
- os: macos-11
python-version: '3.11'
- os: macos-11
python-version: '3.12'

steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest]
python-version: [3.8]
torch-version: [2.1.0, 2.2.0]
torch-version: [2.2.0, 2.3.0]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
pytest --cov --cov-report=xml

- name: Upload coverage
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v4
if: success()
with:
fail_ci_if_error: false
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ conda install pytorch-scatter -c pyg

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

#### PyTorch 2.2
#### PyTorch 2.3

To install the binaries for PyTorch 2.2.0, simply run
To install the binaries for PyTorch 2.3.0, simply run

```
pip install torch-scatter -f https://data.pyg.org/whl/torch-2.2.0+${CUDA}.html
pip install torch-scatter -f https://data.pyg.org/whl/torch-2.3.0+${CUDA}.html
```

where `${CUDA}` should be replaced by either `cpu`, `cu118`, or `cu121` depending on your PyTorch installation.
Expand All @@ -70,12 +70,12 @@ where `${CUDA}` should be replaced by either `cpu`, `cu118`, or `cu121` dependin
| **Windows** | ✅ | ✅ | ✅ |
| **macOS** | ✅ | | |

#### PyTorch 2.1
#### PyTorch 2.2

To install the binaries for PyTorch 2.1.0, simply run
To install the binaries for PyTorch 2.2.0, simply run

```
pip install torch-scatter -f https://data.pyg.org/whl/torch-2.1.0+${CUDA}.html
pip install torch-scatter -f https://data.pyg.org/whl/torch-2.2.0+${CUDA}.html
```

where `${CUDA}` should be replaced by either `cpu`, `cu118`, or `cu121` depending on your PyTorch installation.
Expand All @@ -86,7 +86,7 @@ where `${CUDA}` should be replaced by either `cpu`, `cu118`, or `cu121` dependin
| **Windows** | ✅ | ✅ | ✅ |
| **macOS** | ✅ | | |

**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).
**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, and PyTorch 2.1.0/2.1.1/2.1.2 (following the same procedure).
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.
You can look up the latest supported version number [here](https://data.pyg.org/whl).

Expand Down
2 changes: 1 addition & 1 deletion conda/pytorch-scatter/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
```
./build_conda.sh 3.11 2.2.0 cu118 # python, pytorch and cuda version
./build_conda.sh 3.11 2.3.0 cu118 # python, pytorch and cuda version
```
8 changes: 5 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,11 @@ def get_extensions():
print('Compiling without OpenMP...')

# Compile for mac arm64
if (sys.platform == 'darwin' and platform.machine() == 'arm64'):
extra_compile_args['cxx'] += ['-arch', 'arm64']
extra_link_args += ['-arch', 'arm64']
if sys.platform == 'darwin':
extra_compile_args['cxx'] += ['-D_LIBCPP_DISABLE_AVAILABILITY']
if platform.machine == 'arm64':
extra_compile_args['cxx'] += ['-arch', 'arm64']
extra_link_args += ['-arch', 'arm64']

if suffix == 'cuda':
define_macros += [('WITH_CUDA', None)]
Expand Down
Loading