summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorAdam Kosiorek <a.kosiorek@samsung.com>2014-07-24 15:37:26 +0200
committerJeff Donahue <jeff.donahue@gmail.com>2014-08-17 01:07:17 -0700
commitd69b0be45b33d82d622c58afd2d0e0ff993ca626 (patch)
tree53c3b264a725545b0ff859e2c53bea88c1546921 /.travis.yml
parentf83407d4c0abc8b9cc4180be8947cdd03ebd3926 (diff)
downloadcaffe-d69b0be45b33d82d622c58afd2d0e0ff993ca626.tar.gz
caffe-d69b0be45b33d82d622c58afd2d0e0ff993ca626.tar.bz2
caffe-d69b0be45b33d82d622c58afd2d0e0ff993ca626.zip
enable both GPU and CPU builds + testing in travis
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml9
1 files changed, 8 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index da60258f..1883c086 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,9 +50,16 @@ script:
# CMake build.
- mkdir build
- cd build
+ ## CPU-GPU build
- cmake -DBUILD_PYTHON=ON -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Release ..
- make --keep-going --jobs=$NUM_THREADS
- - make clean
+ - make clean && rm -rf *
+ ## CPU-only build
+ - cmake -DBUILD_PYTHON=ON -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Release -DCPU_ONLY=ON ..
+ - make --keep-going --jobs=$NUM_THREADS
+ - cd test && ./test --gtest_shuffle --gtest_filter="-*GPU*" && cd -
+ - make clean && rm -rf *
+ ## Cleaning
- cd ..
- rm -r build