Skip to content

GitLab

"git@developer.sourcefind.cn:OpenDAS/torchani.git" did not exist on "30f4ec4ed1cfe6ec3bbe7265fa323556c3cc69e1"
Unverified Commit 5d32d3e8 authored by Matthias Fey's avatar Matthias Fey Committed by GitHub
Browse files

PyTorch 1.13 support (#151) 

* update

* update

* update
parent 7c5a6b70
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 42 deletions
.github/workflows/building-conda.yml
View file @ 5d32d3e8
...@@ -10,23 +10,26 @@ jobs: ...@@ -10,23 +10,26 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: 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'] python-version: ['3.7', '3.8', '3.9', '3.10']
torch-version: [1.11.0, 1.12.0] torch-version: [1.13.0] # [1.12.0, 1.13.0]
cuda-version: ['cpu', 'cu102', 'cu113', 'cu115', 'cu116'] cuda-version: ['cpu', 'cu102', 'cu113', 'cu116', 'cu117']
exclude: exclude:
- torch-version: 1.11.0
cuda-version: 'cu116'
- torch-version: 1.12.0 - 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 - os: macos-10.15
cuda-version: 'cu102' cuda-version: 'cu102'
- os: macos-10.15 - os: macos-10.15
cuda-version: 'cu113' cuda-version: 'cu113'
- os: macos-10.15
cuda-version: 'cu115'
- os: macos-10.15 - os: macos-10.15
cuda-version: 'cu116' cuda-version: 'cu116'
- os: macos-10.15
cuda-version: 'cu117'
- os: windows-2019 - os: windows-2019
cuda-version: 'cu102' cuda-version: 'cu102'
- os: windows-2019 # Complains about CUDA mismatch. - os: windows-2019 # Complains about CUDA mismatch.
......
.github/workflows/building.yml
View file @ 5d32d3e8
...@@ -12,21 +12,23 @@ jobs: ...@@ -12,21 +12,23 @@ jobs:
matrix: matrix:
os: [ubuntu-18.04, macos-10.15, windows-2019] os: [ubuntu-18.04, macos-10.15, windows-2019]
python-version: ['3.7', '3.8', '3.9', '3.10'] python-version: ['3.7', '3.8', '3.9', '3.10']
torch-version: [1.11.0, 1.12.0] torch-version: [1.13.0] # [1.12.0, 1.13.0]
cuda-version: ['cpu', 'cu102', 'cu113', 'cu115', 'cu116'] cuda-version: ['cpu', 'cu102', 'cu113', 'cu116', 'cu117']
exclude: exclude:
- torch-version: 1.11.0
cuda-version: 'cu116'
- torch-version: 1.12.0 - 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 - os: macos-10.15
cuda-version: 'cu102' cuda-version: 'cu102'
- os: macos-10.15 - os: macos-10.15
cuda-version: 'cu113' cuda-version: 'cu113'
- os: macos-10.15
cuda-version: 'cu115'
- os: macos-10.15 - os: macos-10.15
cuda-version: 'cu116' cuda-version: 'cu116'
- os: macos-10.15
cuda-version: 'cu117'
- os: windows-2019 - os: windows-2019
cuda-version: 'cu102' cuda-version: 'cu102'
- os: windows-2019 # Complains about CUDA mismatch. - os: windows-2019 # Complains about CUDA mismatch.
...@@ -51,11 +53,18 @@ jobs: ...@@ -51,11 +53,18 @@ jobs:
- name: Install PyTorch ${{ matrix.torch-version }}+${{ matrix.cuda-version }} - name: Install PyTorch ${{ matrix.torch-version }}+${{ matrix.cuda-version }}
run: | run: |
pip install numpy typing-extensions dataclasses pip install torch==${{ matrix.torch-version }} --extra-index-url https://download.pytorch.org/whl/${{ matrix.cuda-version }}
pip install --no-index --no-cache-dir torch==${{ matrix.torch-version}} -f https://download.pytorch.org/whl/${{ matrix.cuda-version }}/torch_stable.html
python -c "import torch; print('PyTorch:', torch.__version__)" python -c "import torch; print('PyTorch:', torch.__version__)"
python -c "import torch; print('CUDA:', torch.version.cuda)" 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_cluster/__init__.py`
sed -i "s/$VERSION/$VERSION+${{ matrix.cuda-version }}/" torch_cluster/__init__.py
shell:
bash
- name: Install main package for CPU - name: Install main package for CPU
if: ${{ matrix.cuda-version == 'cpu' }} if: ${{ matrix.cuda-version == 'cpu' }}
run: | run: |
...@@ -71,6 +80,10 @@ jobs: ...@@ -71,6 +80,10 @@ jobs:
shell: shell:
bash bash
- name: Test installation
run: |
python -c "import torch_cluster; print('torch-cluster:', torch_cluster.__version__)"
- name: Build wheel - name: Build wheel
run: | run: |
pip install wheel pip install wheel
......
.github/workflows/cuda/cu117-Linux-env.sh 0 → 100644
View file @ 5d32d3e8
#!/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"
.github/workflows/cuda/cu117-Linux.sh 0 → 100755
View file @ 5d32d3e8
#!/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
.github/workflows/cuda/cu117-Windows-env.sh 0 → 100644
View file @ 5d32d3e8
#!/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"
.github/workflows/cuda/cu117-Windows.sh 0 → 100755
View file @ 5d32d3e8
#!/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}"
.github/workflows/linting.yml
View file @ 5d32d3e8
...@@ -32,7 +32,7 @@ jobs: ...@@ -32,7 +32,7 @@ jobs:
strategy: strategy:
matrix: matrix:
torch-version: [1.12.0] torch-version: [1.13.0]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
...@@ -44,7 +44,7 @@ jobs: ...@@ -44,7 +44,7 @@ jobs:
- name: Install PyTorch ${{ matrix.torch-version }} - name: Install PyTorch ${{ matrix.torch-version }}
run: | 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 - name: Install dependencies
run: | run: |
......
.github/workflows/testing.yml
View file @ 5d32d3e8
...@@ -16,7 +16,7 @@ jobs: ...@@ -16,7 +16,7 @@ jobs:
matrix: matrix:
os: [ubuntu-latest, windows-latest] os: [ubuntu-latest, windows-latest]
python-version: [3.7] python-version: [3.7]
torch-version: [1.11.0, 1.12.0] torch-version: [1.12.0, 1.13.0]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
...@@ -27,7 +27,7 @@ jobs: ...@@ -27,7 +27,7 @@ jobs:
- name: Install PyTorch ${{ matrix.torch-version }} - name: Install PyTorch ${{ matrix.torch-version }}
run: | 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 main package - name: Install main package
run: | run: |
......
README.md
View file @ 5d32d3e8
...@@ -43,40 +43,40 @@ conda install pytorch-cluster -c pyg ...@@ -43,40 +43,40 @@ conda install pytorch-cluster -c pyg
We alternatively provide pip wheels for all major OS/PyTorch/CUDA combinations, see [here](https://data.pyg.org/whl). 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-cluster -f https://data.pyg.org/whl/torch-1.12.0+${CUDA}.html pip install torch-spline-conv -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` | | | `cpu` | `cu116` | `cu117` |
|-------------|-------|---------|---------|---------| |-------------|-------|---------|---------|
| **Linux** | ✅ | ✅ | ✅ | ✅ | | **Linux** | ✅ | ✅ | ✅ |
| **Windows** | ✅ | | ✅ | ✅ | | **Windows** | ✅ | ✅ | ✅ |
| **macOS** | ✅ | | | | | **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-cluster -f https://data.pyg.org/whl/torch-1.11.0+${CUDA}.html pip install torch-spline-conv -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** | ✅ | ✅ | ✅ | ✅ | | **Linux** | ✅ | ✅ | ✅ | ✅ |
| **Windows** | ✅ | | ✅ | ✅ | | **Windows** | ✅ | | ✅ | ✅ |
| **macOS** | ✅ | | | | | **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). **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 might need to explicitly specify the latest supported version number in order to prevent a manual installation from source. 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). You can look up the latest supported version number [here](https://data.pyg.org/whl).
### From source ### From source
......
conda/pytorch-cluster/README.md
View file @ 5d32d3e8
``` ```
./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
``` ```
conda/pytorch-cluster/build_conda.sh
View file @ 5d32d3e8
...@@ -10,8 +10,15 @@ if [ "${CUDA_VERSION}" = "cpu" ]; then ...@@ -10,8 +10,15 @@ if [ "${CUDA_VERSION}" = "cpu" ]; then
export CONDA_CUDATOOLKIT_CONSTRAINT="cpuonly # [not osx]" export CONDA_CUDATOOLKIT_CONSTRAINT="cpuonly # [not osx]"
else else
case $CUDA_VERSION in case $CUDA_VERSION in
cu117)
export CONDA_CUDATOOLKIT_CONSTRAINT="pytorch-cuda==11.7.*"
;;
cu116) cu116)
export CONDA_CUDATOOLKIT_CONSTRAINT="cudatoolkit==11.6.*" 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) cu115)
export CONDA_CUDATOOLKIT_CONSTRAINT="cudatoolkit==11.5.*" export CONDA_CUDATOOLKIT_CONSTRAINT="cudatoolkit==11.5.*"
...@@ -39,7 +46,7 @@ echo "PyTorch $TORCH_VERSION+$CUDA_VERSION" ...@@ -39,7 +46,7 @@ echo "PyTorch $TORCH_VERSION+$CUDA_VERSION"
echo "- $CONDA_PYTORCH_CONSTRAINT" echo "- $CONDA_PYTORCH_CONSTRAINT"
echo "- $CONDA_CUDATOOLKIT_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 default -c nvidia -c conda-forge --output-folder "$HOME/conda-bld" conda build . -c pytorch -c default -c nvidia -c conda-forge --output-folder "$HOME/conda-bld"
else else
conda build . -c pytorch -c default -c nvidia --output-folder "$HOME/conda-bld" conda build . -c pytorch -c default -c nvidia --output-folder "$HOME/conda-bld"
......
setup.py
View file @ 5d32d3e8
...@@ -106,12 +106,13 @@ def get_extensions(): ...@@ -106,12 +106,13 @@ def get_extensions():
return extensions return extensions
install_requires = [] install_requires = [
'scipy',
]
test_requires = [ test_requires = [
'pytest', 'pytest',
'pytest-cov', 'pytest-cov',
'scipy',
] ]
# work-around hipify abs paths # work-around hipify abs paths
......
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