diff options
| author | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2014-07-15 15:56:36 +0200 |
|---|---|---|
| committer | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2014-07-17 11:57:47 +0200 |
| commit | e52d91ea331dfd1430384808db272926561b116f (patch) | |
| tree | 34704ca094edd1cee6b812e0a2a7c2fec9947995 /src/caffe/test/test_data_layer.cpp | |
| parent | b882c3b4707eeb072a04490c6f36bd7c4deb03df (diff) | |
| download | caffeonacl-e52d91ea331dfd1430384808db272926561b116f.tar.gz caffeonacl-e52d91ea331dfd1430384808db272926561b116f.tar.bz2 caffeonacl-e52d91ea331dfd1430384808db272926561b116f.zip | |
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
Diffstat (limited to 'src/caffe/test/test_data_layer.cpp')
| -rw-r--r-- | src/caffe/test/test_data_layer.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/caffe/test/test_data_layer.cpp b/src/caffe/test/test_data_layer.cpp index 8cd157dd..ed7337c5 100644 --- a/src/caffe/test/test_data_layer.cpp +++ b/src/caffe/test/test_data_layer.cpp @@ -3,7 +3,6 @@ #include <string> #include <vector> -#include "cuda_runtime.h" #include "leveldb/db.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" @@ -18,8 +17,6 @@ using std::stringstream; namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class DataLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; |