diff --git a/.github/workflows/building-conda.yml b/.github/workflows/building-conda.yml index 816cb86f..9064805b 100644 --- a/.github/workflows/building-conda.yml +++ b/.github/workflows/building-conda.yml @@ -12,20 +12,22 @@ jobs: matrix: # We have trouble building for Windows - drop for now. os: [ubuntu-20.04, macos-11] # windows-2019 - python-version: ['3.8', '3.9', '3.10', '3.11'] - torch-version: [2.0.0, 2.1.0] - cuda-version: ['cpu', 'cu117', 'cu118', 'cu121'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + torch-version: [2.2.0] # [2.1.0, 2.2.0] + cuda-version: ['cpu', 'cu118', 'cu121'] exclude: - - torch-version: 2.0.0 - cuda-version: 'cu121' + - python-version: '3.12' # Python 3.12 not yet supported in `conda-build`. - torch-version: 2.1.0 - cuda-version: 'cu117' - - os: macos-11 - cuda-version: 'cu117' + 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 diff --git a/.github/workflows/building.yml b/.github/workflows/building.yml index 5325a816..52625401 100644 --- a/.github/workflows/building.yml +++ b/.github/workflows/building.yml @@ -11,20 +11,23 @@ jobs: fail-fast: false matrix: os: [ubuntu-20.04, macos-11, windows-2019] - python-version: ['3.8', '3.9', '3.10', '3.11'] - torch-version: [2.0.0, 2.1.0] - cuda-version: ['cpu', 'cu117', 'cu118', 'cu121'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + torch-version: [2.2.0] # [2.1.0, 2.2.0] + cuda-version: ['cpu', 'cu118', 'cu121'] exclude: - - torch-version: 2.0.0 - cuda-version: 'cu121' - torch-version: 2.1.0 - cuda-version: 'cu117' - - os: macos-11 - cuda-version: 'cu117' + 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 + - os: macos-11 + python-version: '3.11' + - os: macos-11 + python-version: '3.12' steps: - uses: actions/checkout@v2 @@ -39,7 +42,11 @@ jobs: - name: Upgrade pip run: | pip install --upgrade setuptools - pip install scipy==1.10.1 # Python 3.8 support + + - name: Install scipy + if: ${{ matrix.python-version == '3.8' }} + run: | + pip install scipy==1.10.1 - name: Free Disk Space (Ubuntu) if: ${{ runner.os == 'Linux' }} diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index b6dcf421..6de515ef 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -16,7 +16,7 @@ jobs: matrix: os: [ubuntu-latest, windows-2019] python-version: [3.8] - torch-version: [2.0.0, 2.1.0] + torch-version: [2.1.0, 2.2.0] steps: - uses: actions/checkout@v2 @@ -46,9 +46,13 @@ jobs: run: | bash .github/workflows/metis-${{ runner.os }}.sh + - name: Install scipy + if: ${{ matrix.python-version == '3.8' }} + run: | + pip install scipy==1.10.1 + - name: Install main package run: | - pip install scipy==1.10.1 # Python 3.8 support python setup.py develop env: WITH_METIS: 1 diff --git a/README.md b/README.md index 12a9b18b..2ec26a98 100644 --- a/README.md +++ b/README.md @@ -43,12 +43,12 @@ conda install pytorch-sparse -c pyg We alternatively provide pip wheels for all major OS/PyTorch/CUDA combinations, see [here](https://data.pyg.org/whl). -#### 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 torch-sparse -f https://data.pyg.org/whl/torch-2.1.0+${CUDA}.html +pip install torch-scatter torch-sparse -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. @@ -59,23 +59,24 @@ where `${CUDA}` should be replaced by either `cpu`, `cu118`, or `cu121` dependin | **Windows** | ✅ | ✅ | ✅ | | **macOS** | ✅ | | | -#### PyTorch 2.0 -To install the binaries for PyTorch 2.0.0, simply run +#### PyTorch 2.1 + +To install the binaries for PyTorch 2.1.0, simply run ``` -pip install torch-scatter torch-sparse -f https://data.pyg.org/whl/torch-2.0.0+${CUDA}.html +pip install torch-scatter torch-sparse -f https://data.pyg.org/whl/torch-2.1.0+${CUDA}.html ``` -where `${CUDA}` should be replaced by either `cpu`, `cu117`, or `cu118` depending on your PyTorch installation. +where `${CUDA}` should be replaced by either `cpu`, `cu118`, or `cu121` depending on your PyTorch installation. -| | `cpu` | `cu117` | `cu118` | +| | `cpu` | `cu118` | `cu121` | |-------------|-------|---------|---------| | **Linux** | ✅ | ✅ | ✅ | | **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 and PyTorch 1.13.0/1.13.1 (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, and PyTorch 2.0.0 (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). diff --git a/conda/pytorch-sparse/README.md b/conda/pytorch-sparse/README.md index 68162091..ef041bce 100644 --- a/conda/pytorch-sparse/README.md +++ b/conda/pytorch-sparse/README.md @@ -1,3 +1,3 @@ ``` -./build_conda.sh 3.9 2.1.0 cu118 # python, pytorch and cuda version +./build_conda.sh 3.11 2.2.0 cu118 # python, pytorch and cuda version ``` diff --git a/setup.cfg b/setup.cfg index 1947cbd2..863d7697 100644 --- a/setup.cfg +++ b/setup.cfg @@ -10,6 +10,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Programming Language :: Python :: 3 :: Only [aliases]