Added Travis for CPU version

.travis.yml

@@ -26,7 +26,7 @@ env:
     #   WITH_CUDNN: true
     - BUILD_NAME="default-cmake-cuda8"
     # - BUILD_NAME="default-make-cuda8" WITH_CMAKE=false
-    # - BUILD_NAME="default-cmake-cpu" WITH_CUDA=false
+    - BUILD_NAME="default-cmake-cpu" WITH_CUDA=false
     # - BUILD_NAME="python3-cmake-cuda8" WITH_PYTHON3=true
     # - BUILD_NAME="default-make-cuda8_nocudnn" WITH_CUDNN=false
 
@@ -45,18 +45,19 @@ install:
   - sudo bash ./3rdparty/ubuntu/install_ubuntu_deps_and_cuda.sh
   - sudo apt-get -y install libatlas-base-dev
   - sudo apt-get -y install libopencv-dev
-  - pip install --upgrade numpy
 
 # Running CMake
 before_script:
-  - mkdir build
-  - cd build
-  - cmake -DBUILD_CAFFE=ON -DDOWNLOAD_BODY_25_MODEL=OFF -DDOWNLOAD_BODY_COCO_MODEL=OFF -DDOWNLOAD_FACE_MODEL=OFF -DDOWNLOAD_HAND_MODEL=OFF -DDOWNLOAD_BODY_MPI_MODEL=OFF ..
+  - bash ./cmake/travis/configure.sh
+  # Equivalent for CMake
+  # - mkdir build
+  # - cd build
+  # - cmake -DBUILD_CAFFE=ON -DDOWNLOAD_BODY_25_MODEL=OFF -DDOWNLOAD_BODY_COCO_MODEL=OFF -DDOWNLOAD_FACE_MODEL=OFF -DDOWNLOAD_HAND_MODEL=OFF -DDOWNLOAD_BODY_MPI_MODEL=OFF ..
 
 # Build your code e.g., by calling make
 script:
-  - make -j`nproc`
-  # - bash ./cmake/travis/build.sh
+  - bash ./cmake/travis/run_make.sh
+  # - make -j`nproc`
 # Equivalent to make -j`nproc`
 #   - no_cores=`cat /proc/cpuinfo | grep processor | wc -l`
 #   - make -j${no_cores}

3rdparty/ubuntu/install_ubuntu_deps_and_cuda.sh

@@ -3,10 +3,10 @@
 ### INSTALL PREREQUISITES
 
 # Install CUDA 8.0
-bash install_cuda.sh
+bash 3rdparty/ubuntu/install_cuda.sh
 
 # Install cuDNN 5.1
-bash install_cudnn.sh
+bash 3rdparty/ubuntu/install_cudnn.sh
 
 # Caffe prerequisites
-bash install_ubuntu_deps.sh
+bash 3rdparty/ubuntu/install_ubuntu_deps.sh

cmake/travis/configure-cmake.sh

+# CMake configuration
+
+mkdir build
+# mkdir -p build
+cd build
+
+ARGS="-DDOWNLOAD_BODY_25_MODEL=OFF -DDOWNLOAD_FACE_MODEL=OFF -DDOWNLOAD_HAND_MODEL=OFF"
+# ARGS="-DBUILD_CAFFE=ON -DDOWNLOAD_BODY_25_MODEL=OFF -DDOWNLOAD_BODY_COCO_MODEL=OFF -DDOWNLOAD_FACE_MODEL=OFF -DDOWNLOAD_HAND_MODEL=OFF -DDOWNLOAD_BODY_MPI_MODEL=OFF"
+
+if $WITH_PYTHON3 ; then
+  ARGS="$ARGS -DBUILD_PYTHON=On"
+  # ARGS="$ARGS -Dpython_version=3"
+fi
+
+if $WITH_CUDA ; then
+  # Only build SM50
+  ARGS="$ARGS -DGPU_MODE=CUDA -DCUDA_ARCH=Manual -DCUDA_ARCH_BIN=\"52\" -DCUDA_ARCH_PTX=\"50\""
+else
+  ARGS="$ARGS -DGPU_MODE=CPU_ONLY -DUSE_MKL=Off"
+fi
+
+if $WITH_CUDNN ; then
+  ARGS="$ARGS -DUSE_CUDNN=On"
+else
+  ARGS="$ARGS -DUSE_CUDNN=Off"
+fi
+
+cmake .. $ARGS

cmake/travis/configure.sh

+#!/bin/bash
+# configure the project
+
+BASEDIR=$(dirname $0)
+source $BASEDIR/defaults.sh
+
+if ! $WITH_CMAKE ; then
+  source $BASEDIR/configure-make.sh
+else
+  source $BASEDIR/configure-cmake.sh
+fi

cmake/travis/run_make.sh

+#!/bin/bash
+# build the project
+
+BASEDIR=$(dirname $0)
+source $BASEDIR/defaults.sh
+
+if $WITH_CMAKE ; then
+  cd build
+  make -j`nproc`
+  # make --jobs $NUM_THREADS
+else # if ! $WITH_CMAKE ; then
+  make all -j`nproc`
+  # make --jobs $NUM_THREADS all
+fi