Skip to content

GitLab

Commit c893aa26 authored by rusty1s's avatar rusty1s
Browse files

push pytorch 1.9.0

parent 7c6fa5d3
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 110 deletions
.travis.yml
View file @ c893aa26
...@@ -10,100 +10,112 @@ env: ...@@ -10,100 +10,112 @@ env:
- CUDA_HOME=/usr/local/cuda - CUDA_HOME=/usr/local/cuda
jobs: jobs:
# Python 3.6 # Python 3.6
- PYTHON_VERSION=3.6 TORCH_VERSION=1.8.0 IDX=cpu # - PYTHON_VERSION=3.6 TORCH_VERSION=1.9.0 IDX=cpu
- PYTHON_VERSION=3.6 TORCH_VERSION=1.8.0 IDX=cu101 # - PYTHON_VERSION=3.6 TORCH_VERSION=1.9.0 IDX=cu102
- PYTHON_VERSION=3.6 TORCH_VERSION=1.8.0 IDX=cu102 # - PYTHON_VERSION=3.6 TORCH_VERSION=1.9.0 IDX=cu111
- PYTHON_VERSION=3.6 TORCH_VERSION=1.8.0 IDX=cu111 # - PYTHON_VERSION=3.6 TORCH_VERSION=1.8.0 IDX=cpu
- PYTHON_VERSION=3.6 TORCH_VERSION=1.7.0 IDX=cpu # - PYTHON_VERSION=3.6 TORCH_VERSION=1.8.0 IDX=cu101
- PYTHON_VERSION=3.6 TORCH_VERSION=1.7.0 IDX=cu92 # - PYTHON_VERSION=3.6 TORCH_VERSION=1.8.0 IDX=cu102
- PYTHON_VERSION=3.6 TORCH_VERSION=1.7.0 IDX=cu101 # - PYTHON_VERSION=3.6 TORCH_VERSION=1.8.0 IDX=cu111
- PYTHON_VERSION=3.6 TORCH_VERSION=1.7.0 IDX=cu102
- PYTHON_VERSION=3.6 TORCH_VERSION=1.7.0 IDX=cu110
# Python 3.7 # Python 3.7
- PYTHON_VERSION=3.7 TORCH_VERSION=1.8.0 IDX=cpu # - PYTHON_VERSION=3.7 TORCH_VERSION=1.9.0 IDX=cpu
- PYTHON_VERSION=3.7 TORCH_VERSION=1.8.0 IDX=cu101 # - PYTHON_VERSION=3.7 TORCH_VERSION=1.9.0 IDX=cu102
- PYTHON_VERSION=3.7 TORCH_VERSION=1.8.0 IDX=cu102 # - PYTHON_VERSION=3.7 TORCH_VERSION=1.9.0 IDX=cu111
- PYTHON_VERSION=3.7 TORCH_VERSION=1.8.0 IDX=cu111 # - PYTHON_VERSION=3.7 TORCH_VERSION=1.8.0 IDX=cpu
- PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cpu # - PYTHON_VERSION=3.7 TORCH_VERSION=1.8.0 IDX=cu101
- PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cu92 # - PYTHON_VERSION=3.7 TORCH_VERSION=1.8.0 IDX=cu102
- PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cu101 # - PYTHON_VERSION=3.7 TORCH_VERSION=1.8.0 IDX=cu111
- PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cu102
- PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cu110
# Python 3.8 # Python 3.8
- PYTHON_VERSION=3.8 TORCH_VERSION=1.8.0 IDX=cpu # - PYTHON_VERSION=3.8 TORCH_VERSION=1.9.0 IDX=cpu
- PYTHON_VERSION=3.8 TORCH_VERSION=1.8.0 IDX=cu101 # - PYTHON_VERSION=3.8 TORCH_VERSION=1.9.0 IDX=cu102
- PYTHON_VERSION=3.8 TORCH_VERSION=1.8.0 IDX=cu102 # - PYTHON_VERSION=3.8 TORCH_VERSION=1.9.0 IDX=cu111
- PYTHON_VERSION=3.8 TORCH_VERSION=1.8.0 IDX=cu111 # - PYTHON_VERSION=3.8 TORCH_VERSION=1.8.0 IDX=cpu
- PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cpu # - PYTHON_VERSION=3.8 TORCH_VERSION=1.8.0 IDX=cu101
- PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cu92 # - PYTHON_VERSION=3.8 TORCH_VERSION=1.8.0 IDX=cu102
- PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cu101 # - PYTHON_VERSION=3.8 TORCH_VERSION=1.8.0 IDX=cu111
- PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cu102 # Python 3.9
- PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cu110 - PYTHON_VERSION=3.9 TORCH_VERSION=1.9.0 IDX=cpu
- PYTHON_VERSION=3.9 TORCH_VERSION=1.9.0 IDX=cu102
- PYTHON_VERSION=3.9 TORCH_VERSION=1.9.0 IDX=cu111
# - PYTHON_VERSION=3.9 TORCH_VERSION=1.8.0 IDX=cpu
# - PYTHON_VERSION=3.9 TORCH_VERSION=1.8.0 IDX=cu101
# - PYTHON_VERSION=3.9 TORCH_VERSION=1.8.0 IDX=cu102
# - PYTHON_VERSION=3.9 TORCH_VERSION=1.8.0 IDX=cu111
jobs: jobs:
# For daily builds, we only test on Python 3.6 with 11.0/11.1. # For daily builds, we only test on Python 3.6 with CUDA 11.1.
# For deployment, we exclude *all* macOS CUDA and Windows CUDA 9.2 jobs. # For deployment, we exclude *all* macOS CUDA jobs.
exclude: exclude:
# Python 3.6 / PyTorch 1.8.0 # Python 3.6 / PyTorch 1.9.0
- if: not (tag is present or commit_message =~ ci-deploy) and os != osx # - if: not (tag is present or commit_message =~ ci-deploy) and os != osx
env: PYTHON_VERSION=3.6 TORCH_VERSION=1.8.0 IDX=cpu # env: PYTHON_VERSION=3.6 TORCH_VERSION=1.9.0 IDX=cpu
- if: not (tag is present or commit_message =~ ci-deploy) or os = osx # - if: not (tag is present or commit_message =~ ci-deploy) or os = osx
env: PYTHON_VERSION=3.6 TORCH_VERSION=1.8.0 IDX=cu101 # env: PYTHON_VERSION=3.6 TORCH_VERSION=1.9.0 IDX=cu102
- if: not (tag is present or commit_message =~ ci-deploy) or os = osx # - if: os = osx
env: PYTHON_VERSION=3.6 TORCH_VERSION=1.8.0 IDX=cu102 # env: PYTHON_VERSION=3.6 TORCH_VERSION=1.9.0 IDX=cu111
- if: os = osx # # Python 3.6 / PyTorch 1.8.0
env: PYTHON_VERSION=3.6 TORCH_VERSION=1.8.0 IDX=cu111 # - if: not (tag is present or commit_message =~ ci-deploy) and os != osx
# Python 3.6 / PyTorch 1.7.0 # env: PYTHON_VERSION=3.6 TORCH_VERSION=1.8.0 IDX=cpu
- if: not (tag is present or commit_message =~ ci-deploy) and os != osx # - if: not (tag is present or commit_message =~ ci-deploy) or os = osx
env: PYTHON_VERSION=3.6 TORCH_VERSION=1.7.0 IDX=cpu # env: PYTHON_VERSION=3.6 TORCH_VERSION=1.8.0 IDX=cu101
- if: not (tag is present or commit_message =~ ci-deploy) or os != linux # - if: not (tag is present or commit_message =~ ci-deploy) or os = osx
env: PYTHON_VERSION=3.6 TORCH_VERSION=1.7.0 IDX=cu92 # env: PYTHON_VERSION=3.6 TORCH_VERSION=1.8.0 IDX=cu102
- if: not (tag is present or commit_message =~ ci-deploy) or os = osx # - if: os = osx
env: PYTHON_VERSION=3.6 TORCH_VERSION=1.7.0 IDX=cu101 # env: PYTHON_VERSION=3.6 TORCH_VERSION=1.8.0 IDX=cu111
- if: not (tag is present or commit_message =~ ci-deploy) or os = osx # # Python 3.7 / PyTorch 1.9.0
env: PYTHON_VERSION=3.6 TORCH_VERSION=1.7.0 IDX=cu102 # - if: not (tag is present or commit_message =~ ci-deploy)
- if: os = osx # env: PYTHON_VERSION=3.7 TORCH_VERSION=1.9.0 IDX=cpu
env: PYTHON_VERSION=3.6 TORCH_VERSION=1.7.0 IDX=cu110 # - if: not (tag is present or commit_message =~ ci-deploy) or os = osx
# Python 3.7 / PyTorch 1.8.0 # env: PYTHON_VERSION=3.7 TORCH_VERSION=1.9.0 IDX=cu102
- if: not (tag is present or commit_message =~ ci-deploy) # - if: not (tag is present or commit_message =~ ci-deploy) or os = osx
env: PYTHON_VERSION=3.7 TORCH_VERSION=1.8.0 IDX=cpu # env: PYTHON_VERSION=3.7 TORCH_VERSION=1.9.0 IDX=cu111
- if: not (tag is present or commit_message =~ ci-deploy) or os = osx # - if: not (tag is present or commit_message =~ ci-deploy)
env: PYTHON_VERSION=3.7 TORCH_VERSION=1.8.0 IDX=cu101 # # Python 3.7 / PyTorch 1.8.0
- if: not (tag is present or commit_message =~ ci-deploy) or os = osx # - if: not (tag is present or commit_message =~ ci-deploy)
env: PYTHON_VERSION=3.7 TORCH_VERSION=1.8.0 IDX=cu102 # env: PYTHON_VERSION=3.7 TORCH_VERSION=1.8.0 IDX=cpu
- if: not (tag is present or commit_message =~ ci-deploy) or os = osx # - if: not (tag is present or commit_message =~ ci-deploy) or os = osx
env: PYTHON_VERSION=3.7 TORCH_VERSION=1.8.0 IDX=cu111 # env: PYTHON_VERSION=3.7 TORCH_VERSION=1.8.0 IDX=cu101
- if: not (tag is present or commit_message =~ ci-deploy) # - if: not (tag is present or commit_message =~ ci-deploy) or os = osx
# Python 3.7 / PyTorch 1.7.0 # env: PYTHON_VERSION=3.7 TORCH_VERSION=1.8.0 IDX=cu102
env: PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cpu # - if: not (tag is present or commit_message =~ ci-deploy) or os = osx
- if: not (tag is present or commit_message =~ ci-deploy) or os != linux # env: PYTHON_VERSION=3.7 TORCH_VERSION=1.8.0 IDX=cu111
env: PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cu92 # - if: not (tag is present or commit_message =~ ci-deploy)
- if: not (tag is present or commit_message =~ ci-deploy) or os = osx # # Python 3.8 / PyTorch 1.9.0
env: PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cu101 # - if: not (tag is present or commit_message =~ ci-deploy)
- if: not (tag is present or commit_message =~ ci-deploy) or os = osx # env: PYTHON_VERSION=3.8 TORCH_VERSION=1.9.0 IDX=cpu
env: PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cu102 # - if: not (tag is present or commit_message =~ ci-deploy) or os = osx
- if: not (tag is present or commit_message =~ ci-deploy) or os = osx # env: PYTHON_VERSION=3.8 TORCH_VERSION=1.9.0 IDX=cu102
env: PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cu110 # - if: not (tag is present or commit_message =~ ci-deploy) or os = osx
# Python 3.8 / PyTorch 1.8.0 # env: PYTHON_VERSION=3.8 TORCH_VERSION=1.9.0 IDX=cu111
- if: not (tag is present or commit_message =~ ci-deploy) # - if: not (tag is present or commit_message =~ ci-deploy)
env: PYTHON_VERSION=3.8 TORCH_VERSION=1.8.0 IDX=cpu # # Python 3.8 / PyTorch 1.8.0
- if: not (tag is present or commit_message =~ ci-deploy) or os = osx # - if: not (tag is present or commit_message =~ ci-deploy)
env: PYTHON_VERSION=3.8 TORCH_VERSION=1.8.0 IDX=cu101 # env: PYTHON_VERSION=3.8 TORCH_VERSION=1.8.0 IDX=cpu
- if: not (tag is present or commit_message =~ ci-deploy) or os = osx # - if: not (tag is present or commit_message =~ ci-deploy) or os = osx
env: PYTHON_VERSION=3.8 TORCH_VERSION=1.8.0 IDX=cu102 # env: PYTHON_VERSION=3.8 TORCH_VERSION=1.8.0 IDX=cu101
- if: not (tag is present or commit_message =~ ci-deploy) or os = osx # - if: not (tag is present or commit_message =~ ci-deploy) or os = osx
env: PYTHON_VERSION=3.8 TORCH_VERSION=1.8.0 IDX=cu111 # env: PYTHON_VERSION=3.8 TORCH_VERSION=1.8.0 IDX=cu102
- if: not (tag is present or commit_message =~ ci-deploy) # - if: not (tag is present or commit_message =~ ci-deploy) or os = osx
# Python 3.8 / PyTorch 1.7.0 # env: PYTHON_VERSION=3.8 TORCH_VERSION=1.8.0 IDX=cu111
env: PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cpu # - if: not (tag is present or commit_message =~ ci-deploy)
- if: not (tag is present or commit_message =~ ci-deploy) or os != linux # # Python 3.9 / PyTorch 1.9.0
env: PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cu92 # - if: not (tag is present or commit_message =~ ci-deploy)
- if: not (tag is present or commit_message =~ ci-deploy) or os = osx # env: PYTHON_VERSION=3.9 TORCH_VERSION=1.9.0 IDX=cpu
env: PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cu101 # - if: not (tag is present or commit_message =~ ci-deploy) or os = osx
- if: not (tag is present or commit_message =~ ci-deploy) or os = osx # env: PYTHON_VERSION=3.9 TORCH_VERSION=1.9.0 IDX=cu102
env: PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cu102 # - if: not (tag is present or commit_message =~ ci-deploy) or os = osx
- if: not (tag is present or commit_message =~ ci-deploy) or os = osx # env: PYTHON_VERSION=3.9 TORCH_VERSION=1.9.0 IDX=cu111
env: PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cu110 # - if: not (tag is present or commit_message =~ ci-deploy)
# # Python 3.9 / PyTorch 1.8.0
# - if: not (tag is present or commit_message =~ ci-deploy)
# env: PYTHON_VERSION=3.8 TORCH_VERSION=1.9.0 IDX=cpu
# - if: not (tag is present or commit_message =~ ci-deploy) or os = osx
# env: PYTHON_VERSION=3.8 TORCH_VERSION=1.9.0 IDX=cu101
# - if: not (tag is present or commit_message =~ ci-deploy) or os = osx
# env: PYTHON_VERSION=3.8 TORCH_VERSION=1.9.0 IDX=cu102
# - if: not (tag is present or commit_message =~ ci-deploy) or os = osx
# env: PYTHON_VERSION=3.8 TORCH_VERSION=1.9.0 IDX=cu111
# - if: not (tag is present or commit_message =~ ci-deploy)
install: install:
- source script/gcc.sh - source script/gcc.sh
......
README.md
View file @ c893aa26
...@@ -42,47 +42,47 @@ All included operations are broadcastable, work on varying data types, are imple ...@@ -42,47 +42,47 @@ All included operations are broadcastable, work on varying data types, are imple
We provide pip wheels for all major OS/PyTorch/CUDA combinations, see [here](https://pytorch-geometric.com/whl). We provide pip wheels for all major OS/PyTorch/CUDA combinations, see [here](https://pytorch-geometric.com/whl).
#### PyTorch 1.8.0 #### PyTorch 1.9.0
To install the binaries for PyTorch 1.8.0, simply run To install the binaries for PyTorch 1.9.0, simply run
``` ```
pip install torch-scatter -f https://pytorch-geometric.com/whl/torch-1.8.0+${CUDA}.html pip install torch-scatter -f https://pytorch-geometric.com/whl/torch-1.9.0+${CUDA}.html
``` ```
where `${CUDA}` should be replaced by either `cpu`, `cu101`, `cu102`, or `cu111` depending on your PyTorch installation. where `${CUDA}` should be replaced by either `cpu`, `cu102`, or `cu111` depending on your PyTorch installation.
| | `cpu` | `cu101` | `cu102` | `cu111` | | | `cpu` | `cu102` | `cu111` |
|-------------|-------|---------|---------|---------| |-------------|-------|---------|---------|
| **Linux** | ✅ | ✅ | ✅ | ✅ | | **Linux** | ✅ | ✅ | ✅ |
| **Windows** | ✅ | ✅ | ✅ | ✅ | | **Windows** | ✅ | ✅ | ✅ |
| **macOS** | ✅ | | | | | **macOS** | ✅ | | |
#### PyTorch 1.7.0/1.7.1 #### PyTorch 1.8.0/1.8.1
To install the binaries for PyTorch 1.7.0 and 1.7.1, simply run To install the binaries for PyTorch 1.8.0 and 1.8.1, simply run
``` ```
pip install torch-scatter -f https://pytorch-geometric.com/whl/torch-1.7.0+${CUDA}.html pip install torch-scatter -f https://pytorch-geometric.com/whl/torch-1.8.0+${CUDA}.html
``` ```
where `${CUDA}` should be replaced by either `cpu`, `cu92`, `cu101`, `cu102`, or `cu110` depending on your PyTorch installation. where `${CUDA}` should be replaced by either `cpu`, `cu101`, `cu102`, or `cu111` depending on your PyTorch installation.
| | `cpu` | `cu92` | `cu101` | `cu102` | `cu110` | | | `cpu` | `cu101` | `cu102` | `cu111` |
|-------------|-------|--------|---------|---------|---------| |-------------|-------|---------|---------|---------|
| **Linux** | ✅ | ✅ | ✅ | ✅ | ✅ | | **Linux** | ✅ | ✅ | ✅ | ✅ |
| **Windows** | ✅ | ❌ | ✅ | ✅ | ✅ | | **Windows** | ✅ | ✅ | ✅ | ✅ |
| **macOS** | ✅ | | | | | | **macOS** | ✅ | | | |
**Note:** Binaries of older versions are also provided for PyTorch 1.4.0, PyTorch 1.5.0 and PyTorch 1.6.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 and PyTorch 1.7.0/1.7.1 (following the same procedure).
### From source ### From source
Ensure that at least PyTorch 1.5.0 is installed and verify that `cuda/bin` and `cuda/include` are in your `$PATH` and `$CPATH` respectively, *e.g.*: Ensure that at least PyTorch 1.4.0 is installed and verify that `cuda/bin` and `cuda/include` are in your `$PATH` and `$CPATH` respectively, *e.g.*:
``` ```
$ python -c "import torch; print(torch.__version__)" $ python -c "import torch; print(torch.__version__)"
>>> 1.5.0 >>> 1.4.0
$ echo $PATH $ echo $PATH
>>> /usr/local/cuda/bin:... >>> /usr/local/cuda/bin:...
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment