From 66af063790dc65691a65315ff7fc6131851f8f61 Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Thu, 12 Mar 2020 02:13:50 +0100
Subject: [PATCH] Try to install CUDA version corresponding to CUDA_VERSION
---
.travis.yml | 16 ++++++++--------
tests/travis_install.sh | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index fa1adab..7e72165 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,35 +13,35 @@ matrix:
- os: windows
include:
- python: 3.5
- env: CUDA_VERSION=9.2
+ env: CUDA_VERSION=9-2
before_install:
- sudo apt-get install -y ninja-build build-essential nvidia-cuda-toolkit rename
- python: 3.6
- env: CUDA_VERSION=9.2
+ env: CUDA_VERSION=9-2
before_install:
- sudo apt-get install -y ninja-build build-essential nvidia-cuda-toolkit rename
- python: 3.7
- env: CUDA_VERSION=9.2
+ env: CUDA_VERSION=9-2
before_install:
- sudo apt-get install -y ninja-build build-essential nvidia-cuda-toolkit rename
- python: 3.8
- env: CUDA_VERSION=9.2
+ env: CUDA_VERSION=9-2
before_install:
- sudo apt-get install -y ninja-build build-essential nvidia-cuda-toolkit rename
- python: 3.5
- env: CUDA_VERSION=10.1
+ env: CUDA_VERSION=10-1
before_install:
- sudo apt-get install -y ninja-build build-essential rename
- python: 3.6
- env: CUDA_VERSION=10.1
+ env: CUDA_VERSION=10-1
before_install:
- sudo apt-get install -y ninja-build build-essential rename
- python: 3.7
- env: CUDA_VERSION=10.1
+ env: CUDA_VERSION=10-1
before_install:
- sudo apt-get install -y ninja-build build-essential rename
- python: 3.8
- env: CUDA_VERSION=10.1
+ env: CUDA_VERSION=10-1
before_install:
- sudo apt-get install -y ninja-build build-essential rename
- name: Python 3.7.2 on macOS
diff --git a/tests/travis_install.sh b/tests/travis_install.sh
index 245950a..6c73883 100755
--- a/tests/travis_install.sh
+++ b/tests/travis_install.sh
@@ -42,13 +42,13 @@ if [[ "$DISTRIB" == "conda" ]]; then
shopt -s expand_aliases
fi
-if [[ "$CUDA_VERSION" == "10.1" ]]; then
+if [[ "$CUDA_VERSION" != "9-2" ]]; then
wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-ubuntu1804.pin
sudo mv cuda-ubuntu1804.pin /etc/apt/preferences.d/cuda-repository-pin-600
sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub
sudo add-apt-repository "deb http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/ /"
sudo apt-get update
-sudo apt-get -y install cuda
+sudo apt-get -y install cuda-$CUDA_VERSION
sudo ldconfig
export CUDA_HOME=/usr/local/cuda
export PATH=/usr/local/cuda/bin:$PATH
--
GitLab