Skip to content

Commit 6de2c89

Browse files
rusty1srusty1s
committed
clean up
1 parent 4764b48 commit 6de2c89

File tree

5 files changed

+30
-39
lines changed

5 files changed

+30
-39
lines changed

‎.travis.yml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,35 @@ env:
1010
- CUDA_HOME=/usr/local/cuda
1111
jobs:
1212
# Python 3.6
13-
# - PYTHON_VERSION=3.6 TORCH_VERSION=1.7.0 IDX=cpu
14-
# - PYTHON_VERSION=3.6 TORCH_VERSION=1.7.0 IDX=cu92
15-
# - PYTHON_VERSION=3.6 TORCH_VERSION=1.7.0 IDX=cu101
13+
- PYTHON_VERSION=3.6 TORCH_VERSION=1.7.0 IDX=cpu
14+
- PYTHON_VERSION=3.6 TORCH_VERSION=1.7.0 IDX=cu92
15+
- PYTHON_VERSION=3.6 TORCH_VERSION=1.7.0 IDX=cu101
1616
- PYTHON_VERSION=3.6 TORCH_VERSION=1.7.0 IDX=cu102
1717
- PYTHON_VERSION=3.6 TORCH_VERSION=1.7.0 IDX=cu110
18-
# - PYTHON_VERSION=3.6 TORCH_VERSION=1.6.0 IDX=cpu
19-
# - PYTHON_VERSION=3.6 TORCH_VERSION=1.6.0 IDX=cu92
20-
# - PYTHON_VERSION=3.6 TORCH_VERSION=1.6.0 IDX=cu101
21-
# - PYTHON_VERSION=3.6 TORCH_VERSION=1.6.0 IDX=cu102
18+
- PYTHON_VERSION=3.6 TORCH_VERSION=1.6.0 IDX=cpu
19+
- PYTHON_VERSION=3.6 TORCH_VERSION=1.6.0 IDX=cu92
20+
- PYTHON_VERSION=3.6 TORCH_VERSION=1.6.0 IDX=cu101
21+
- PYTHON_VERSION=3.6 TORCH_VERSION=1.6.0 IDX=cu102
2222
# Python 3.7
23-
# - PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cpu
24-
# - PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cu92
25-
# - PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cu101
26-
# - PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cu102
27-
# - PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cu110
28-
# - PYTHON_VERSION=3.7 TORCH_VERSION=1.6.0 IDX=cpu
29-
# - PYTHON_VERSION=3.7 TORCH_VERSION=1.6.0 IDX=cu92
30-
# - PYTHON_VERSION=3.7 TORCH_VERSION=1.6.0 IDX=cu101
31-
# - PYTHON_VERSION=3.7 TORCH_VERSION=1.6.0 IDX=cu102
23+
- PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cpu
24+
- PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cu92
25+
- PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cu101
26+
- PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cu102
27+
- PYTHON_VERSION=3.7 TORCH_VERSION=1.7.0 IDX=cu110
28+
- PYTHON_VERSION=3.7 TORCH_VERSION=1.6.0 IDX=cpu
29+
- PYTHON_VERSION=3.7 TORCH_VERSION=1.6.0 IDX=cu92
30+
- PYTHON_VERSION=3.7 TORCH_VERSION=1.6.0 IDX=cu101
31+
- PYTHON_VERSION=3.7 TORCH_VERSION=1.6.0 IDX=cu102
3232
# Python 3.8
33-
# - PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cpu
34-
# - PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cu92
35-
# - PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cu101
36-
# - PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cu102
37-
# - PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cu110
38-
# - PYTHON_VERSION=3.8 TORCH_VERSION=1.6.0 IDX=cpu
39-
# - PYTHON_VERSION=3.8 TORCH_VERSION=1.6.0 IDX=cu92
40-
# - PYTHON_VERSION=3.8 TORCH_VERSION=1.6.0 IDX=cu101
41-
# - PYTHON_VERSION=3.8 TORCH_VERSION=1.6.0 IDX=cu102
33+
- PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cpu
34+
- PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cu92
35+
- PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cu101
36+
- PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cu102
37+
- PYTHON_VERSION=3.8 TORCH_VERSION=1.7.0 IDX=cu110
38+
- PYTHON_VERSION=3.8 TORCH_VERSION=1.6.0 IDX=cpu
39+
- PYTHON_VERSION=3.8 TORCH_VERSION=1.6.0 IDX=cu92
40+
- PYTHON_VERSION=3.8 TORCH_VERSION=1.6.0 IDX=cu101
41+
- PYTHON_VERSION=3.8 TORCH_VERSION=1.6.0 IDX=cu102
4242

4343
jobs:
4444
# For daily builds, we only test on Python 3.6 with CUDA 10.2/11.0.

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.0)
22
project(torchcluster)
33
set(CMAKE_CXX_STANDARD 14)
4-
set(TORCHCLUSTER_VERSION 1.6.0)
4+
set(TORCHCLUSTER_VERSION 1.5.8)
55

66
option(WITH_CUDA "Enable CUDA support" OFF)
77

‎script/cuda.sh

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,21 +99,12 @@ if [ "${TRAVIS_OS_NAME}" = "linux" ] && [ "${IDX}" = "cu110" ]; then
9999
sudo dpkg -i cuda-repo-ubuntu1804-11-0-local_11.0.3-450.51.06-1_amd64.deb
100100
sudo apt-key add /var/cuda-repo-ubuntu1804-11-0-local/7fa2af80.pub
101101
sudo apt update -qq
102-
sudo apt search cuda
103-
sudo apt install cuda-nvcc-11-0
104-
sudo apt install cuda-libraries-dev-11-0
102+
sudo apt install cuda-nvcc-11-0 cuda-libraries-dev-11-0
105103
sudo apt clean
106104
CUDA_HOME=/usr/local/cuda-${CUDA_SHORT}
107105
LD_LIBRARY_PATH=${CUDA_HOME}/lib64:${LD_LIBRARY_PATH}
108106
PATH=${CUDA_HOME}/bin:${PATH}
109107
nvcc --version
110-
111-
echo "LIB"
112-
ls $CUDA_HOME/lib
113-
echo "LIB64"
114-
ls $CUDA_HOME/lib64
115-
echo "LIB"
116-
ls $CUDA_HOME/include
117108
fi
118109

119110
if [ "${TRAVIS_OS_NAME}" = "windows" ] && [ "${IDX}" != "cpu" ]; then
@@ -122,7 +113,7 @@ if [ "${TRAVIS_OS_NAME}" = "windows" ] && [ "${IDX}" != "cpu" ]; then
122113
curl -k -L "https://drive.google.com/u/0/uc?id=1injUyo3lnarMgWyRcXqKg4UGnN0ysmuq&export=download" --output "/tmp/gpu_driver_dlls.zip"
123114
7z x "/tmp/gpu_driver_dlls.zip" -o"/c/Windows/System32"
124115

125-
# Install CUDA
116+
# Install CUDA:
126117
wget -nv "${CUDA_URL}/${CUDA_FILE}"
127118
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} npp_dev_${CUDA_SHORT} nvrtc_dev_${CUDA_SHORT} nvml_dev_${CUDA_SHORT}\" -Wait -NoNewWindow"
128119
CUDA_HOME=/c/Program\ Files/NVIDIA\ GPU\ Computing\ Toolkit/CUDA/v${CUDA_SHORT}

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def get_extensions():
7777

7878
setup(
7979
name='torch_cluster',
80-
version='1.6.0',
80+
version='1.5.8',
8181
author='Matthias Fey',
8282
author_email='[email protected]',
8383
url='https://github.com/rusty1s/pytorch_cluster',

‎torch_cluster/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import torch
55

6-
__version__ = '1.6.0'
6+
__version__ = '1.5.8'
77

88
for library in [
99
'_version', '_grid', '_graclus', '_fps', '_rw', '_sampler', '_nearest',

0 commit comments

Comments
 (0)