PyTorch 1.13 support (#290)

* update * update * update

PyTorch 1.13 support (#290)
* update * update * update
bc262e31 · Matthias Fey · GitHub · 31388573 · bc262e31 · bc262e31
Unverified Commit bc262e31 authored Nov 14, 2022 by Matthias Fey Committed by GitHub Nov 14, 2022
11 changed files
--- a/.github/workflows/building-conda.yml
+++ b/.github/workflows/building-conda.yml
@@ -10,23 +10,26 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-18.04, macos-10.15, windows-2019]
+        # We have trouble building for Windows - drop for now.
+        os: [ubuntu-18.04, macos-10.15]  # windows-2019
        python-version: ['3.7', '3.8', '3.9', '3.10']
-        torch-version: [1.11.0, 1.12.0]
-        cuda-version: ['cpu', 'cu102', 'cu113', 'cu115', 'cu116']
+        torch-version: [1.13.0]  # [1.12.0, 1.13.0]
+        cuda-version: ['cpu', 'cu102', 'cu113', 'cu116', 'cu117']
        exclude:
-          - torch-version: 1.11.0
-            cuda-version: 'cu116'
          - torch-version: 1.12.0
-            cuda-version: 'cu115'
+            cuda-version: 'cu117'
+          - torch-version: 1.13.0
+            cuda-version: 'cu102'
+          - torch-version: 1.13.0
+            cuda-version: 'cu113'
          - os: macos-10.15
            cuda-version: 'cu102'
          - os: macos-10.15
            cuda-version: 'cu113'
-          - os: macos-10.15
-            cuda-version: 'cu115'
          - os: macos-10.15
            cuda-version: 'cu116'
+          - os: macos-10.15
+            cuda-version: 'cu117'
          - os: windows-2019
            cuda-version: 'cu102'
          - os: windows-2019  # Complains about CUDA mismatch.

--- a/.github/workflows/building.yml
+++ b/.github/workflows/building.yml
@@ -12,21 +12,23 @@ jobs:
      matrix:
        os: [ubuntu-18.04, macos-10.15, windows-2019]
        python-version: ['3.7', '3.8', '3.9', '3.10']
-        torch-version: [1.11.0, 1.12.0]
-        cuda-version: ['cpu', 'cu102', 'cu113', 'cu115', 'cu116']
+        torch-version: [1.13.0]  # [1.12.0, 1.13.0]
+        cuda-version: ['cpu', 'cu102', 'cu113', 'cu116', 'cu117']
        exclude:
-          - torch-version: 1.11.0
-            cuda-version: 'cu116'
          - torch-version: 1.12.0
-            cuda-version: 'cu115'
+            cuda-version: 'cu117'
+          - torch-version: 1.13.0
+            cuda-version: 'cu102'
+          - torch-version: 1.13.0
+            cuda-version: 'cu113'
          - os: macos-10.15
            cuda-version: 'cu102'
          - os: macos-10.15
            cuda-version: 'cu113'
-          - os: macos-10.15
-            cuda-version: 'cu115'
          - os: macos-10.15
            cuda-version: 'cu116'
+          - os: macos-10.15
+            cuda-version: 'cu117'
          - os: windows-2019
            cuda-version: 'cu102'
          - os: windows-2019  # Complains about CUDA mismatch.
@@ -54,11 +56,18 @@ jobs:

      - name: Install PyTorch ${{ matrix.torch-version }}+${{ matrix.cuda-version }}
        run: |
-          pip install numpy typing-extensions dataclasses
-          pip install --no-index --no-cache-dir torch==${{ matrix.torch-version}} -f https://download.pytorch.org/whl/${{ matrix.cuda-version }}/torch_stable.html
+          pip install torch==${{ matrix.torch-version }} --extra-index-url https://download.pytorch.org/whl/${{ matrix.cuda-version }}
          python -c "import torch; print('PyTorch:', torch.__version__)"
          python -c "import torch; print('CUDA:', torch.version.cuda)"

+      - name: Set version
+        if: ${{ runner.os != 'macOS' }}
+        run: |
+          VERSION=`sed -n "s/^__version__ = '\(.*\)'/\1/p" torch_sparse/__init__.py`
+          sed -i "s/$VERSION/$VERSION+${{ matrix.cuda-version }}/" torch_sparse/__init__.py
+        shell:
+          bash
+
      - name: Install torch-scatter
        run: |
          pip install torch-scatter -f https://data.pyg.org/whl/torch-${{ matrix.torch-version }}+${{ matrix.cuda-version }}.html
@@ -88,6 +97,10 @@ jobs:
        shell:
          bash

+      - name: Test installation
+        run: |
+          python -c "import torch_sparse; print('torch-sparse:', torch_sparse.__version__)"
+
      - name: Build wheel
        run: |
          pip install wheel

--- a/.github/workflows/cuda/cu117-Linux-env.sh
+++ b/.github/workflows/cuda/cu117-Linux-env.sh
+#!/bin/bash
+
+CUDA_HOME=/usr/local/cuda-11.7
+LD_LIBRARY_PATH=${CUDA_HOME}/lib64:${LD_LIBRARY_PATH}
+PATH=${CUDA_HOME}/bin:${PATH}
+
+export FORCE_CUDA=1
+export TORCH_CUDA_ARCH_LIST="3.5;5.0+PTX;6.0;7.0;7.5;8.0;8.6"
--- a/.github/workflows/cuda/cu117-Linux.sh
+++ b/.github/workflows/cuda/cu117-Linux.sh
+#!/bin/bash
+
+OS=ubuntu1804
+
+wget -nv https://developer.download.nvidia.com/compute/cuda/repos/${OS}/x86_64/cuda-${OS}.pin
+sudo mv cuda-${OS}.pin /etc/apt/preferences.d/cuda-repository-pin-600
+wget -nv https://developer.download.nvidia.com/compute/cuda/11.7.1/local_installers/cuda-repo-${OS}-11-7-local_11.7.1-515.65.01-1_amd64.deb
+sudo dpkg -i cuda-repo-${OS}-11-7-local_11.7.1-515.65.01-1_amd64.deb
+sudo cp /var/cuda-repo-${OS}-11-7-local/cuda-*-keyring.gpg /usr/share/keyrings/
+
+sudo apt-get -qq update
+sudo apt install cuda-nvcc-11-7 cuda-libraries-dev-11-7
+sudo apt clean
+
+rm -f https://developer.download.nvidia.com/compute/cuda/11.7.1/local_installers/cuda-repo-${OS}-11-7-local_11.7.1-515.65.01-1_amd64.deb
--- a/.github/workflows/cuda/cu117-Windows-env.sh
+++ b/.github/workflows/cuda/cu117-Windows-env.sh
+#!/bin/bash
+
+CUDA_HOME=/c/Program\ Files/NVIDIA\ GPU\ Computing\ Toolkit/CUDA/v11.7
+PATH=${CUDA_HOME}/bin:$PATH
+PATH=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/MSBuild/15.0/Bin:$PATH
+
+export FORCE_CUDA=1
+export TORCH_CUDA_ARCH_LIST="6.0+PTX"
--- a/.github/workflows/cuda/cu117-Windows.sh
+++ b/.github/workflows/cuda/cu117-Windows.sh
+#!/bin/bash
+
+# Install NVIDIA drivers, see:
+# https://github.com/pytorch/vision/blob/master/packaging/windows/internal/cuda_install.bat#L99-L102
+curl -k -L "https://drive.google.com/u/0/uc?id=1injUyo3lnarMgWyRcXqKg4UGnN0ysmuq&export=download" --output "/tmp/gpu_driver_dlls.zip"
+7z x "/tmp/gpu_driver_dlls.zip" -o"/c/Windows/System32"
+
+export CUDA_SHORT=11.7
+export CUDA_URL=https://developer.download.nvidia.com/compute/cuda/${CUDA_SHORT}.1/local_installers
+export CUDA_FILE=cuda_${CUDA_SHORT}.1_516.94_windows.exe
+
+# Install CUDA:
+curl -k -L "${CUDA_URL}/${CUDA_FILE}" --output "${CUDA_FILE}"
+echo ""
+echo "Installing from ${CUDA_FILE}..."
+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"
+echo "Done!"
+rm -f "${CUDA_FILE}"
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -32,7 +32,7 @@ jobs:

    strategy:
      matrix:
-        torch-version: [1.12.0]
+        torch-version: [1.13.0]

    steps:
      - uses: actions/checkout@v2
@@ -44,7 +44,7 @@ jobs:

      - name: Install PyTorch ${{ matrix.torch-version }}
        run: |
-          pip install torch==${{ matrix.torch-version}}+cpu -f https://download.pytorch.org/whl/torch_stable.html
+          pip install torch==${{ matrix.torch-version }} --extra-index-url https://download.pytorch.org/whl/cpu

      - name: Install dependencies
        run: |

--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -16,7 +16,7 @@ jobs:
      matrix:
        os: [ubuntu-latest, windows-2019]
        python-version: [3.7]
-        torch-version: [1.11.0, 1.12.0]
+        torch-version: [1.12.0, 1.13.0]

    steps:
      - uses: actions/checkout@v2
@@ -30,7 +30,7 @@ jobs:

      - name: Install PyTorch ${{ matrix.torch-version }}
        run: |
-          pip install torch==${{ matrix.torch-version}}+cpu -f https://download.pytorch.org/whl/torch_stable.html
+          pip install torch==${{ matrix.torch-version }} --extra-index-url https://download.pytorch.org/whl/cpu

      - name: Install torch-scatter
        run: |

--- a/README.md
+++ b/README.md
@@ -38,45 +38,45 @@ Given that you have [`pytorch >= 1.8.0` installed](https://pytorch.org/get-start
 ```
 conda install pytorch-sparse -c pyg
 ```
-#### Note: Conda packages are not published for PyTorch 1.12 yet
+
 ### Binaries

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

-#### PyTorch 1.12
+#### PyTorch 1.13

-To install the binaries for PyTorch 1.12.0, simply run
+To install the binaries for PyTorch 1.13.0, simply run

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

-where `${CUDA}` should be replaced by either `cpu`, `cu102`, `cu113`, or `cu116` depending on your PyTorch installation.
+where `${CUDA}` should be replaced by either `cpu`, `cu116`, or `cu117` depending on your PyTorch installation.

-|             | `cpu` | `cu102` | `cu113` | `cu116` |
-|-------------|-------|---------|---------|---------|
-| **Linux**   | ✅    | ✅      | ✅      | ✅      |
-| **Windows** | ✅    |         | ✅      | ✅      |
-| **macOS**   | ✅    |         |         |         |
+|             | `cpu` | `cu116` | `cu117` |
+|-------------|-------|---------|---------|
+| **Linux**   | ✅    | ✅      | ✅      |
+| **Windows** | ✅    | ✅      | ✅      |
+| **macOS**   | ✅    |         |         |

-#### PyTorch 1.11
+#### PyTorch 1.12

-To install the binaries for PyTorch 1.11.0, simply run
+To install the binaries for PyTorch 1.12.0, simply run

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

-where `${CUDA}` should be replaced by either `cpu`, `cu102`, `cu113`, or `cu115` depending on your PyTorch installation.
+where `${CUDA}` should be replaced by either `cpu`, `cu102`, `cu113`, or `cu116` depending on your PyTorch installation.

-|             | `cpu` | `cu102` | `cu113` | `cu115` |
+|             | `cpu` | `cu102` | `cu113` | `cu116` |
 |-------------|-------|---------|---------|---------|
 | **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, and PyTorch 1.10.0/1.10.1/1.10.2 (following the same procedure).
-For older versions, you might need to explicitly specify the latest supported version number in order to prevent a manual installation from source.
+**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 and PyTorch 1.11.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).

 ### From source

--- a/conda/pytorch-sparse/README.md
+++ b/conda/pytorch-sparse/README.md
 ```
-./build_conda.sh 3.9 1.12.0 cu113  # python, pytorch and cuda version
+./build_conda.sh 3.9 1.13.0 cu116  # python, pytorch and cuda version
 ```
--- a/conda/pytorch-sparse/build_conda.sh
+++ b/conda/pytorch-sparse/build_conda.sh
@@ -10,8 +10,15 @@ if [ "${CUDA_VERSION}" = "cpu" ]; then
  export CONDA_CUDATOOLKIT_CONSTRAINT="cpuonly  # [not osx]"
 else
  case $CUDA_VERSION in
+    cu117)
+      export CONDA_CUDATOOLKIT_CONSTRAINT="pytorch-cuda==11.7.*"
+      ;;
    cu116)
+      if [ "${TORCH_VERSION}" = "1.12.0" ]; then
        export CONDA_CUDATOOLKIT_CONSTRAINT="cudatoolkit==11.6.*"
+      else
+        export CONDA_CUDATOOLKIT_CONSTRAINT="pytorch-cuda==11.6.*"
+      fi
      ;;
    cu115)
      export CONDA_CUDATOOLKIT_CONSTRAINT="cudatoolkit==11.5.*"
@@ -39,7 +46,7 @@ echo "PyTorch $TORCH_VERSION+$CUDA_VERSION"
 echo "- $CONDA_PYTORCH_CONSTRAINT"
 echo "- $CONDA_CUDATOOLKIT_CONSTRAINT"

-if [ "${CUDA_VERSION}" = "cu116" ]; then
+if [ "${TORCH_VERSION}" = "1.12.0" ] && [ "${CUDA_VERSION}" = "cu116" ]; then
  conda build . -c pytorch -c pyg -c default -c nvidia -c conda-forge --output-folder "$HOME/conda-bld"
 else
  conda build . -c pytorch -c pyg -c default -c nvidia --output-folder "$HOME/conda-bld"