From 0348b1ba57eef0bdcb592856f56cc8fd5825e99c Mon Sep 17 00:00:00 2001
From: Isaac Yang <isaacy@nvidia.com>
Date: Wed, 14 Mar 2018 15:08:15 -0700
Subject: [PATCH] Update CI scripts to add some new deps to Caffe build.

---
 .travis.yml                     |  4 ++++
 scripts/travis/install-caffe.sh | 11 ++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 03c7eb876..f77d84924 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ env:
     global:
         - PROTOBUF_ROOT=~/protobuf
         - CAFFE_ROOT=~/caffe
+        - CAFFE_TAG=v0.16.4
         - TORCH_ROOT=~/torch
         - OMP_NUM_THREADS=1
         - OPENBLAS_MAIN_FREE=1
@@ -86,6 +87,7 @@ addons:
             - libboost-python-dev
             - libboost-system-dev
             - libboost-thread-dev
+            - libboost-regex-dev
             - libgflags-dev
             - libgoogle-glog-dev
             - libhdf5-serial-dev
@@ -93,6 +95,7 @@ addons:
             - liblmdb-dev
             - libopenblas-dev
             - libopencv-dev
+            - libturbojpeg
             - libsnappy-dev
             - python-dev
             - python-flask
@@ -124,6 +127,7 @@ install:
     - echo "backend:agg" > ~/.config/matplotlib/matplotlibrc
     - ./scripts/travis/install-protobuf.sh $PROTOBUF_ROOT
     - ./scripts/travis/install-caffe.sh $CAFFE_ROOT
+    - pip install tornado==4.5.3
     - if [ "$DIGITS_TEST_FRAMEWORK" == "torch" ]; then travis_wait ./scripts/travis/install-torch.sh $TORCH_ROOT; else unset TORCH_ROOT; fi
     - pip install -r ./requirements.txt --force-reinstall
     - if [ "$DIGITS_TEST_FRAMEWORK" == "tensorflow" ]; then travis_wait ./scripts/travis/install-tensorflow.sh; fi
diff --git a/scripts/travis/install-caffe.sh b/scripts/travis/install-caffe.sh
index a17bb729d..ecf4cbab0 100755
--- a/scripts/travis/install-caffe.sh
+++ b/scripts/travis/install-caffe.sh
@@ -29,9 +29,14 @@ set -x
 git clone "https://github.com/${CAFFE_FORK}/caffe.git" "$INSTALL_DIR" $CAFFE_BRANCH --depth 1
 
 # configure project
-mkdir -p "${INSTALL_DIR}/build"
-cd "${INSTALL_DIR}/build"
-cmake .. -DCPU_ONLY=On -DBLAS=Open
+cd "$INSTALL_DIR"
+if [ "$CAFFE_FORK" == "NVIDIA" ]; then
+    git fetch --all --tags --prune
+    git checkout "tags/$CAFFE_TAG"
+fi
+mkdir -p build
+cd build
+cmake .. -DCPU_ONLY=1 -DBLAS=Open
 
 # build
 make --jobs="$(nproc)"