Merge branch 'master' into cmake

.travis.yml

@@ -1,24 +1,56 @@
-dist: xenial
+dist: trusty
 sudo: required
 language: cpp
-
 compiler: gcc
-
+matrix:
+  include:
+  - os: linux
+    compiler: gcc
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        packages:
+        - g++-4.8
+    env: COMPILER=g++-4.8
+  - os: linux
+    compiler: gcc
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        packages:
+        - g++-4.9
+    env: COMPILER=g++-4.9
+  - os: linux
+    compiler: gcc
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        packages:
+        - g++-5
+    env: COMPILER=g++-5
 install:
-  - sudo apt-get install libprotobuf-dev protobuf-compiler libatlas-base-dev libgoogle-glog-dev libgtest-dev liblmdb-dev libleveldb-dev libsnappy-dev python-dev python-pip libiomp-dev libopencv-dev nvidia-cuda-toolkit libpthread-stubs0-dev cmake
-  - pip install numpy
-  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-  - sudo apt-get update -y
-  - sudo apt-get install gcc-5 g++-5
-  - wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_8.0.44-1_amd64.deb
-  - sudo dpkg -i cuda-repo-ubuntu1404_8.0.44-1_amd64.deb
-  - sudo apt-get update
-  - sudo apt-get install cuda
+- sudo apt-get install libprotobuf-dev protobuf-compiler libatlas-base-dev libgoogle-glog-dev
+  libgtest-dev liblmdb-dev libleveldb-dev libsnappy-dev python-dev python-pip libiomp-dev
+  libopencv-dev nvidia-cuda-toolkit libpthread-stubs0-dev cmake
+- pip install numpy
+- wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_8.0.44-1_amd64.deb   
+- sudo dpkg -i cuda-repo-ubuntu1404_8.0.44-1_amd64.deb
+- sudo apt-get update
+- sudo apt-get install cuda
 
 script:
-  - mkdir build && cd build && cmake .. && make
-
-# safelist
+- mkdir build && cd build && export CXX=$COMPILER && cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON
+  && make CXX=$COMPILER
 branches:
   only:
-    - master
+  - master
+before_install:
+- CUDNN_DOWNLOAD_SUM=a87cb2df2e5e7cc0a05e266734e679ee1a2fadad6f06af82a76ed81a23b102c8 &&
+    curl -fsSL http://developer.download.nvidia.com/compute/redist/cudnn/v5.1/cudnn-8.0-linux-x64-v5.1.tgz -O &&
+    echo "$CUDNN_DOWNLOAD_SUM  cudnn-8.0-linux-x64-v5.1.tgz" | sha256sum -c --strict - &&
+    sudo tar -xzf cudnn-8.0-linux-x64-v5.1.tgz -C /usr/local &&
+    rm cudnn-8.0-linux-x64-v5.1.tgz &&
+    sudo ldconfig

caffe2/CMakeLists.txt

@@ -46,7 +46,7 @@ set(Caffe2_CPU_TEST_SRCS
     "/operators/utility_ops_test.cc"
     "/operators/elementwise_op_test.cc"
     "/operators/fully_connected_op_test.cc"
-    "/operators/conv_op_cache_cudnn_test.cc"
+    #"/operators/conv_op_cache_cudnn_test.cc"
     "/operators/text_file_reader_utils_test.cc"
     "/utils/proto_utils_test.cc"
     "/utils/math_test.cc"

cmake/Dependencies.cmake

@@ -109,6 +109,12 @@ endif()
 
 # ---[ CUDA
 include(cmake/Cuda.cmake)
+if(HAVE_CUDA)
+  SET(CUDA_PROPAGATE_HOST_FLAGS OFF)
+  LIST(APPEND CUDA_NVCC_FLAGS -Xcompiler -std=c++11)
+  LIST(APPEND CUDA_NVCC_FLAGS -std=c++11)
+  LIST(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_52,code=sm_52)
+endif()
 
 
 # ---[ CUDNN