collect CUDA includes and calls, separate from CPU-only mode, leave out

- collect CUDA includes in device_alternate.hpp
- add guards for CUDA code
- move GPU code into cu from cpp
- make CUDA includes and libraries conditional in Makefile
- drop CUDA dependency from travis-ci build

1 files changed, 6 insertions, 0 deletions

diff --git a/src/caffe/test/test_caffe_main.cpp b/src/caffe/test/test_caffe_main.cpp
index 07e6b8d5..bb5e6b46 100644
--- a/src/caffe/test/test_caffe_main.cpp
+++ b/src/caffe/test/test_caffe_main.cpp
@@ -6,14 +6,19 @@
 #include "caffe/test/test_caffe_main.hpp"
 
 namespace caffe {
+#ifndef CPU_ONLY
   cudaDeviceProp CAFFE_TEST_CUDA_PROP;
+#endif
 }
 
+#ifndef CPU_ONLY
 using caffe::CAFFE_TEST_CUDA_PROP;
+#endif
 
 int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
   ::google::InitGoogleLogging(argv[0]);
+#ifndef CPU_ONLY
   // Before starting testing, let's first print out a few cuda defice info.
   int device;
   cudaGetDeviceCount(&device);
@@ -27,6 +32,7 @@ int main(int argc, char** argv) {
   cudaGetDevice(&device);
   cout << "Current device id: " << device << endl;
   cudaGetDeviceProperties(&CAFFE_TEST_CUDA_PROP, device);
+#endif
   // invoke the test.
   return RUN_ALL_TESTS();
 }