summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2016-03-01 17:08:40 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2016-03-03 13:55:59 +0100
commita27cb41f2d1dda5df3bf783fc5e2010552eb43be (patch)
tree387d38336483260b96d6c12810e942c9b61926fa
parentac5d33197f5e1e07327ba1f7eee8b1c91fad2fe6 (diff)
downloadastra-a27cb41f2d1dda5df3bf783fc5e2010552eb43be.tar.gz
astra-a27cb41f2d1dda5df3bf783fc5e2010552eb43be.tar.bz2
astra-a27cb41f2d1dda5df3bf783fc5e2010552eb43be.tar.xz
astra-a27cb41f2d1dda5df3bf783fc5e2010552eb43be.zip
Use travis-ci's apt packages for cuda
-rw-r--r--.travis.yml8
1 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index f7e09e2..c6c2801 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,10 @@ addons:
apt:
packages:
- libboost-all-dev
+ - nvidia-common
+ - nvidia-current
+ - nvidia-cuda-toolkit
+ - nvidia-cuda-dev
env:
- CUDA=yes
- CUDA=no
@@ -27,15 +31,13 @@ before_install:
- export PATH="$HOME/miniconda/bin:$PATH"
- conda config --set always_yes yes --set changeps1 no
- conda update conda
- - if [ $CUDA == yes ]; then wget http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run; fi
- - if [ $CUDA == yes ]; then bash cuda_6.0.37_linux_64.run -toolkit -toolkitpath=$HOME/cuda/ -silent; fi
install:
- conda install python=$TRAVIS_PYTHON_VERSION six numpy scipy cython
- conda info -a
- cd build/linux
- ./autogen.sh
- - if [ $CUDA == yes ]; then ./configure --prefix=$HOME/astra --with-python --with-cuda=$HOME/cuda/; else ./configure --prefix=$HOME/astra --with-python; fi
+ - if [ $CUDA == yes ]; then ./configure --prefix=$HOME/astra --with-python --with-cuda=$HOME/cuda/; else ./configure --prefix=$HOME/astra --with-python --without-cuda; fi
- make -j 4
- make install