From 5474e87293875766e6a4d83a837181e6ac1fbde2 Mon Sep 17 00:00:00 2001
From: "Daniel M. Pelt" <D.M.Pelt@cwi.nl>
Date: Tue, 1 Mar 2016 13:18:44 +0100
Subject: Add Travis CI configuration file

---
 .travis.yml | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 .travis.yml

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..f7e09e2
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,43 @@
+language: python
+
+python:
+  - "2.7"
+  - "3.5"
+
+os:
+  - linux
+
+sudo: false
+
+addons:
+  apt:
+    packages:
+      - libboost-all-dev
+env:
+    - CUDA=yes
+    - CUDA=no
+
+before_install:
+  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
+      wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
+    else
+      wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+    fi
+  - bash miniconda.sh -b -p $HOME/miniconda
+  - 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
+  - make -j 4
+  - make install
+
+script:
+  - LD_LIBRARY_PATH=$HOME/astra/lib/:$HOME/cuda/lib64/:$HOME/cuda/lib/:$LD_LIBRARY_PATH PYTHONPATH=$HOME/astra/python/:$PYTHONPATH python -c "import astra"
-- 
cgit v1.2.3


From a27cb41f2d1dda5df3bf783fc5e2010552eb43be Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Tue, 1 Mar 2016 17:08:40 +0100
Subject: Use travis-ci's apt packages for cuda

---
 .travis.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to '.travis.yml')

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
 
-- 
cgit v1.2.3


From 4a8f153e1228f6a25fb8b7fd00157af5393c1fa5 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Thu, 3 Mar 2016 15:04:35 +0100
Subject: Remove outdated cuda paths

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index c6c2801..4a179f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,9 +37,9 @@ install:
   - 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 --without-cuda; fi
+  - if [ $CUDA == yes ]; then ./configure --prefix=$HOME/astra --with-python --with-cuda; else ./configure --prefix=$HOME/astra --with-python --without-cuda; fi
   - make -j 4
   - make install
 
 script:
-  - LD_LIBRARY_PATH=$HOME/astra/lib/:$HOME/cuda/lib64/:$HOME/cuda/lib/:$LD_LIBRARY_PATH PYTHONPATH=$HOME/astra/python/:$PYTHONPATH python -c "import astra"
+  - LD_LIBRARY_PATH=$HOME/astra/lib/:$LD_LIBRARY_PATH PYTHONPATH=$HOME/astra/python/:$PYTHONPATH python -c "import astra"
-- 
cgit v1.2.3