[ci skip]

rusty1s · Oct 22, 2021 · 62a958f · 62a958f
1 parent 5ce60ec
commit 62a958f
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 15 deletions.
diff --git a/.github/workflows/building-conda.yml b/.github/workflows/building-conda.yml
@@ -10,21 +10,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest] # [ubuntu-18.04, macos-10.15, windows-latest]
+        os: [ubuntu-18.04, macos-10.15, windows-latest]
         python-version: [3.6, 3.7, 3.8, 3.9]
-        torch-version: [1.8.0, 1.9.0]
-        cuda-version: ['cu111'] # ['cpu', 'cu101', 'cu102', 'cu111']
+        torch-version: [1.9.0, 1.10.0]
+        cuda-version: ['cpu', 'cu102', 'cu111', 'cu113']
         exclude:
           - torch-version: 1.9.0
-            cuda-version: 'cu101'
-          - os: macos-10.15
-            cuda-version: 'cu101'
+            cuda-version: 'cu113'
+          - torch-version: 1.10.0
+            cuda-version: 'cu111'
           - os: macos-10.15
             cuda-version: 'cu102'
           - os: macos-10.15
             cuda-version: 'cu111'
-          - os: windows-latest
-            cuda-version: 'cu101'
+          - os: macos-10.15
+            cuda-version: 'cu113'
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/building.yml b/.github/workflows/building.yml
@@ -12,19 +12,19 @@ jobs:
       matrix:
         os: [ubuntu-18.04, macos-10.15, windows-latest]
         python-version: [3.6, 3.7, 3.8, 3.9]
-        torch-version: [1.8.0, 1.9.0]
-        cuda-version: ['cpu', 'cu101', 'cu102', 'cu111']
+        torch-version: [1.9.0, 1.10.0]
+        cuda-version: ['cpu', 'cu102', 'cu111', 'cu113']
         exclude:
           - torch-version: 1.9.0
-            cuda-version: 'cu101'
-          - os: macos-10.15
-            cuda-version: 'cu101'
+            cuda-version: 'cu113'
+          - torch-version: 1.10.0
+            cuda-version: 'cu111'
           - os: macos-10.15
             cuda-version: 'cu102'
           - os: macos-10.15
             cuda-version: 'cu111'
-          - os: windows-latest
-            cuda-version: 'cu101'
+          - os: macos-10.15
+            cuda-version: 'cu113'
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/cuda/cu113-Linux-env.sh b/.github/workflows/cuda/cu113-Linux-env.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+CUDA_HOME=/usr/local/cuda-11.3
+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"
diff --git a/.github/workflows/cuda/cu113-Linux.sh b/.github/workflows/cuda/cu113-Linux.sh
@@ -0,0 +1,15 @@
+#!/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.3.0/local_installers/cuda-repo-${OS}-11-3-local_11.3.0-465.19.01-1_amd64.deb
+sudo dpkg -i cuda-repo-${OS}-11-3-local_11.3.0-465.19.01-1_amd64.deb
+sudo apt-key add /var/cuda-repo-${OS}-11-3-local/7fa2af80.pub
+
+sudo apt-get -qq update
+sudo apt install cuda-nvcc-11-3 cuda-libraries-dev-11-3
+sudo apt clean
+
+rm -f https://developer.download.nvidia.com/compute/cuda/11.3.0/local_installers/cuda-repo-${OS}-11-3-local_11.3.0-465.19.01-1_amd64.deb
diff --git a/.github/workflows/cuda/cu113-Windows-env.sh b/.github/workflows/cuda/cu113-Windows-env.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+CUDA_HOME=/c/Program\ Files/NVIDIA\ GPU\ Computing\ Toolkit/CUDA/v11.3
+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="3.5;5.0+PTX;6.0;7.0;7.5;8.0;8.6"
diff --git a/.github/workflows/cuda/cu113-Windows.sh b/.github/workflows/cuda/cu113-Windows.sh
@@ -0,0 +1,18 @@
+#!/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.3
+export CUDA_URL=https://developer.download.nvidia.com/compute/cuda/${CUDA_SHORT}.0/local_installers
+export CUDA_FILE=cuda_${CUDA_SHORT}.0_465.89_win10.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}"
diff --git a/conda/pytorch-scatter/build_conda.sh b/conda/pytorch-scatter/build_conda.sh
@@ -10,6 +10,9 @@ if [ "${CUDA_VERSION}" = "cpu" ]; then
   export CONDA_CUDATOOLKIT_CONSTRAINT="cpuonly  # [not osx]"
 else
   case $CUDA_VERSION in
+    cu113)
+      export CONDA_CUDATOOLKIT_CONSTRAINT="cudatoolkit==11.3.*"
+      ;;
     cu111)
       export CONDA_CUDATOOLKIT_CONSTRAINT="cudatoolkit==11.1.*"
       ;;