summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorphilkr <philkr@users.noreply.github.com>2015-07-08 14:30:29 -0700
committerphilkr <philkr@users.noreply.github.com>2015-07-20 21:33:33 -0700
commit4d3b1844fc70ab52fe9e22343f9a1154617be6a4 (patch)
treef71162b5f5a09bb7bad7dff24f939a8daca0ad02 /.travis.yml
parentff4e2861c15b45d46498c926d2f869b6a82975bb (diff)
downloadcaffe-4d3b1844fc70ab52fe9e22343f9a1154617be6a4.tar.gz
caffe-4d3b1844fc70ab52fe9e22343f9a1154617be6a4.tar.bz2
caffe-4d3b1844fc70ab52fe9e22343f9a1154617be6a4.zip
Travis scripts for python3 and pytest for cmake. Also fixes CUDA CMake build issue #2722.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml13
1 files changed, 10 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 955aa8c3..b920a935 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,24 +6,31 @@ env:
- WITH_CUDA=false WITH_CMAKE=true
- WITH_CUDA=true WITH_CMAKE=false
- WITH_CUDA=true WITH_CMAKE=true
+ - WITH_CUDA=false WITH_CMAKE=true PYTHON_VERSION=3
language: cpp
# Cache Ubuntu apt packages.
-cache: apt
+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"
install:
- sudo -E $SCRIPTS/travis_install.sh
before_script:
- - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/cuda/lib64
- - export PATH=/home/travis/miniconda/bin:$PATH
+ - 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
script: $SCRIPTS/travis_build_and_test.sh