diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-09-15 16:38:08 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-09-15 16:38:08 +0200 |
| commit | aa31a06235496c0d808e57c8ce914cb4b640bc6e (patch) | |
| tree | 33385e828ddca0b2857bac9e3dac4dd3723a3eee /.travis.yml | |
| parent | f6aa2db83dfea89f9d2cfc6fcbd3da141ee77e02 (diff) | |
| parent | 00a1c6118b2d64b867c8e640c295462bcccfc7c9 (diff) | |
| download | astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.tar.gz astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.tar.bz2 astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.tar.xz astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.zip | |
Merge branch 'master' into parallel_vec
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 53 |
1 files changed, 40 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 4a179f1..6d0a3ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,5 @@ language: python -python: - - "2.7" - - "3.5" - os: - linux @@ -13,13 +9,42 @@ addons: apt: packages: - libboost-all-dev - - nvidia-common - - nvidia-current - - nvidia-cuda-toolkit - - nvidia-cuda-dev -env: - - CUDA=yes - - CUDA=no + +matrix: + include: + - env: CUDA=no CLANG=yes + python: "3.6" + + - env: CUDA=no + python: "2.7" + + - env: CUDA=no + python: "3.6" + + - env: CUDA=yes + python: "2.7" + addons: + apt: + packages: + - libboost-all-dev + - nvidia-common + - nvidia-current + - nvidia-cuda-toolkit + - nvidia-cuda-dev + + - env: CUDA=yes + python: "3.6" + addons: + apt: + packages: + - libboost-all-dev + - nvidia-common + - nvidia-current + - nvidia-cuda-toolkit + - nvidia-cuda-dev + exclude: + - os: linux + before_install: - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then @@ -37,9 +62,11 @@ install: - conda info -a - cd build/linux - ./autogen.sh - - if [ $CUDA == yes ]; then ./configure --prefix=$HOME/astra --with-python --with-cuda; else ./configure --prefix=$HOME/astra --with-python --without-cuda; fi + - if [ x$CLANG == xyes ]; then export CXX=clang++; export CC=clang; fi + - if [ $CUDA == yes ]; then ./configure --prefix=$HOME/astra --with-python --with-cuda --with-install-type=module; else ./configure --prefix=$HOME/astra --with-python --without-cuda --with-install-type=module; fi - make -j 4 + - make test - make install script: - - LD_LIBRARY_PATH=$HOME/astra/lib/:$LD_LIBRARY_PATH PYTHONPATH=$HOME/astra/python/:$PYTHONPATH python -c "import astra" + - python -c "import astra" |