diff --git a/.travis.yml b/.travis.yml
index 4dc7ed72d6cc97a1bf924c7b1e35d66574ceb885..6478c866904cdd234193d4b53e27b29af1361ffe 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
-# Use a build matrix to do two builds in parallel:
-# one using CMake, and one using make.
-env:
- matrix:
- - WITH_CUDA=false WITH_CMAKE=false WITH_IO=true
- - WITH_CUDA=false WITH_CMAKE=true WITH_IO=true PYTHON_VERSION=3
- - WITH_CUDA=true WITH_CMAKE=false WITH_IO=true
- - WITH_CUDA=true WITH_CMAKE=true WITH_IO=true
- - WITH_CUDA=false WITH_CMAKE=false WITH_IO=false
- - WITH_CUDA=false WITH_CMAKE=true WITH_IO=false PYTHON_VERSION=3
+dist: trusty
+sudo: required
language: cpp
+compiler: gcc
+
+env:
+ global:
+ - NUM_THREADS=8
+ matrix:
+ # Use a build matrix to test many builds in parallel
+ # envvar defaults:
+ # WITH_CMAKE: false
+ # WITH_PYTHON3: false
+ # WITH_CUDA: const true since v0.17
+ # WITH_CUDNN: false
+ - BUILD_NAME="default-make"
+# - BUILD_NAME="python3-make" WITH_PYTHON3=true
+ - BUILD_NAME="cudnn-make" WITH_CUDNN=true
+
+ - BUILD_NAME="default-cmake" WITH_CMAKE=true
+ - BUILD_NAME="python3-cmake" WITH_CMAKE=true WITH_PYTHON3=true
+ - BUILD_NAME="cudnn-cmake" WITH_CMAKE=true WITH_CUDNN=true
+ - BUILD_NAME="cudnn-python3-cmake" WITH_CMAKE=true WITH_CUDNN=true WITH_PYTHON3=true
-# Cache Ubuntu apt packages.
cache:
apt: true
- directories:
- - /home/travis/miniconda
- - /home/travis/miniconda2
- - /home/travis/miniconda3
-
-compiler: gcc
before_install:
- - export NUM_THREADS=4
- - export SCRIPTS=./scripts/travis
- - export CONDA_DIR="/home/travis/miniconda$PYTHON_VERSION"
+ - source ./scripts/travis/defaults.sh
install:
- - sudo -E $SCRIPTS/travis_install.sh
+ - sudo -E ./scripts/travis/install-deps.sh
+ - ./scripts/travis/setup-venv.sh ~/venv
+ - source ~/venv/bin/activate
+ - ./scripts/travis/install-python-deps.sh
before_script:
- - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/cuda/lib64:$CONDA_DIR/lib
- - export PATH=$CONDA_DIR/bin:$PATH
- - if ! $WITH_CMAKE; then $SCRIPTS/travis_setup_makefile_config.sh; fi
+ - ./scripts/travis/configure.sh
-script: $SCRIPTS/travis_build_and_test.sh
+script:
+ - ./scripts/travis/build.sh
+ - ./scripts/travis/test.sh
notifications:
# Emails are sent to the committer's git-configured email address by default,