Makefile, Cmake and Travis script update.

Author: naibaf7

CMakeLists.txt

@@ -15,7 +15,7 @@ include(cmake/Summary.cmake)
 include(cmake/ConfigGen.cmake)
 
 # ---[ Options
-caffe_option(CPU_ONLY  "Build Caffe wihtout CUDA and OpenCL support" OFF) # TODO: rename to USE_CUDA
+caffe_option(CPU_ONLY  "Build Caffe wihtout CUDA and OpenCL support" OFF)
 caffe_option(USE_CUDA "Build Caffe with CUDA support" ON)
 caffe_option(USE_GREENTEA "Build Caffe with OpenCL support" ON)
 caffe_option(USE_CUDNN "Build Caffe with cuDNN libary support" ON IF USE_CUDA AND NOT CPU_ONLY)

Makefile.config.example

@@ -7,7 +7,7 @@
 USE_CUDA := 1
 
 # Enable the OpenCL/Greentea backend
-USE_GREENTEA := 1
+USE_GREENTEA := 0
 
 # Folder of the ViennaCL header-only library
 VIENNACL_DIR = ../ViennaCL
@@ -17,7 +17,7 @@ VIENNACL_DIR = ../ViennaCL
 # When both are disabled, GPUs won't work. CPUs always use CBLAS (Atlas, MKL or OpenBLAS).
 # The chosen BLAS library needs to be compiled and installed from source.
 # CLBLAS should be faster, especially on AMD cards.
-USE_CLBLAS := 1
+USE_CLBLAS := 0
 USE_VIENNACLBLAS := 0
 
 # Enable or disable double precision support for OpenCL/Greentea

scripts/travis/travis_install.sh

@@ -9,17 +9,25 @@ MAKE="make --jobs=$NUM_THREADS"
 
 # This ppa is for gflags and glog
 add-apt-repository -y ppa:tuleu/precise-backports
+# This ppa is for boost 1.54
+add-apt-repository -y ppa:boost-latest/ppa
+# This ppa is for g++ 4.8
+add-apt repository -y ppa:ubuntu-toolchain-r/test
+
 apt-get -y update
 apt-get install \
-    wget git curl \
+    g++-4.8 wget git curl \
     python-dev python-numpy \
     libleveldb-dev libsnappy-dev libopencv-dev \
-    libboost-dev libboost-system-dev libboost-python-dev libboost-thread-dev \
+    libboost-dev libboost-system-dev libboost-python-dev libboost-thread-dev libboost-python1.54-dev \
     libprotobuf-dev protobuf-compiler \
     libatlas-dev libatlas-base-dev \
     libhdf5-serial-dev libgflags-dev libgoogle-glog-dev \
     bc
 
+update-alternatives
+--install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
+
 # Add a special apt-repository to install CMake 2.8.9 for CMake Caffe build,
 # if needed.  By default, Aptitude in Ubuntu 12.04 installs CMake 2.8.7, but
 # Caffe requires a minimum CMake version of 2.8.8.
@@ -31,19 +39,19 @@ fi
 
 # Install CUDA, if needed
 if $WITH_CUDA; then
-  CUDA_URL=http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1204/x86_64/cuda-repo-ubuntu1204_6.5-14_amd64.deb
+  CUDA_URL=http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1204/x86_64/cuda-repo-ubuntu1204_7.0-28_amd64.deb
   CUDA_FILE=/tmp/cuda_install.deb
   curl $CUDA_URL -o $CUDA_FILE
   dpkg -i $CUDA_FILE
   rm -f $CUDA_FILE
   apt-get -y update
   # Install the minimal CUDA subpackages required to test Caffe build.
   # For a full CUDA installation, add 'cuda' to the list of packages.
-  apt-get -y install cuda-core-6-5 cuda-cublas-6-5 cuda-cublas-dev-6-5 cuda-cudart-6-5 cuda-cudart-dev-6-5 cuda-curand-6-5 cuda-curand-dev-6-5
+  apt-get -y install cuda-core-7-0 cuda-cublas-7-0 cuda-cublas-dev-7-0 cuda-cudart-7-0 cuda-cudart-dev-7-0 cuda-curand-7-0 cuda-curand-dev-7-0
   # Create CUDA symlink at /usr/local/cuda
   # (This would normally be created by the CUDA installer, but we create it
   # manually since we did a partial installation.)
-  ln -s /usr/local/cuda-6.5 /usr/local/cuda
+  ln -s /usr/local/cuda-7.0 /usr/local/cuda
 fi
 
 # Install LMDB

src/caffe/layers/cudnn_conv_layer.cu

@@ -150,7 +150,7 @@ void CuDNNConvolutionLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
     // Synchronize the work across groups, each of which went into its own
     // stream, by launching an empty kernel into the default (null) stream.
     // NOLINT_NEXT_LINE(whitespace/operators)
-    sync_conv_groupsCUDA_KERNEL(1, 1)();
+    sync_conv_groups CUDA_KERNEL(1, 1)();
   }
 }