summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorAdam Kosiorek <a.kosiorek@samsung.com>2014-07-25 09:38:42 +0200
committerJeff Donahue <jeff.donahue@gmail.com>2014-08-17 01:07:17 -0700
commit15f0a5ed52a7f6858ba9b7817b229c493e7b12f4 (patch)
tree120d0231771daa034d35634a1dd46ed05d3f1056 /.travis.yml
parentd69b0be45b33d82d622c58afd2d0e0ff993ca626 (diff)
downloadcaffe-15f0a5ed52a7f6858ba9b7817b229c493e7b12f4.tar.gz
caffe-15f0a5ed52a7f6858ba9b7817b229c493e7b12f4.tar.bz2
caffe-15f0a5ed52a7f6858ba9b7817b229c493e7b12f4.zip
Examples_SOURCE_DIR cmake variable bugfix
* it was set only when BUILD_EXAMPLES==OFF
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml11
1 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 1883c086..26d435b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,11 +50,11 @@ script:
# CMake build.
- mkdir build
- cd build
- ## CPU-GPU build
+ ## CPU-GPU: build only.
- cmake -DBUILD_PYTHON=ON -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Release ..
- make --keep-going --jobs=$NUM_THREADS
- make clean && rm -rf *
- ## CPU-only build
+ ## CPU-only: comprehensive
- 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 -
@@ -62,12 +62,13 @@ script:
## Cleaning
- cd ..
- rm -r build
-
- # CPU-GPU: build only.
+
+ # Make build
+ ## CPU-GPU: build only.
- export CPU_ONLY=0
- make --keep-going --jobs=$NUM_THREADS all
- make clean
- # CPU-only: comprehensive.
+ ## CPU-only: comprehensive.
- export CPU_ONLY=1
- make --keep-going --jobs=$NUM_THREADS all test warn lint
- make runtest