diff options
Diffstat (limited to 'src/caffe/test')
39 files changed, 48 insertions, 96 deletions
diff --git a/src/caffe/test/test_accuracy_layer.cpp b/src/caffe/test/test_accuracy_layer.cpp index 355a36b3..40b08748 100644 --- a/src/caffe/test/test_accuracy_layer.cpp +++ b/src/caffe/test/test_accuracy_layer.cpp @@ -5,7 +5,6 @@ #include <cfloat> #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" @@ -16,8 +15,6 @@ namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename Dtype> class AccuracyLayerTest : public ::testing::Test { protected: diff --git a/src/caffe/test/test_argmax_layer.cpp b/src/caffe/test/test_argmax_layer.cpp index 44a13b99..d3bdfbde 100644 --- a/src/caffe/test/test_argmax_layer.cpp +++ b/src/caffe/test/test_argmax_layer.cpp @@ -2,7 +2,6 @@ #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" @@ -14,8 +13,6 @@ namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename Dtype> class ArgMaxLayerTest : public ::testing::Test { protected: diff --git a/src/caffe/test/test_benchmark.cpp b/src/caffe/test/test_benchmark.cpp index 82880088..b613a873 100644 --- a/src/caffe/test/test_benchmark.cpp +++ b/src/caffe/test/test_benchmark.cpp @@ -1,7 +1,6 @@ // Copyright 2014 BVLC and contributors. #include <unistd.h> // for usleep -#include <cuda_runtime.h> #include <gtest/gtest.h> #include "caffe/common.hpp" @@ -10,8 +9,6 @@ namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class BenchmarkTest : public MultiDeviceTest<TypeParam> {}; diff --git a/src/caffe/test/test_blob.cpp b/src/caffe/test/test_blob.cpp index a5240940..aec88f32 100644 --- a/src/caffe/test/test_blob.cpp +++ b/src/caffe/test/test_blob.cpp @@ -2,7 +2,6 @@ #include <cstring> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/common.hpp" #include "caffe/blob.hpp" 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(); } diff --git a/src/caffe/test/test_common.cpp b/src/caffe/test/test_common.cpp index a452b612..a8e2eb15 100644 --- a/src/caffe/test/test_common.cpp +++ b/src/caffe/test/test_common.cpp @@ -2,7 +2,6 @@ #include <cstring> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/common.hpp" #include "caffe/syncedmem.hpp" @@ -13,12 +12,16 @@ namespace caffe { class CommonTest : public ::testing::Test {}; +#ifndef CPU_ONLY // GPU Caffe singleton test. + TEST_F(CommonTest, TestCublasHandlerGPU) { int cuda_device_id; CUDA_CHECK(cudaGetDevice(&cuda_device_id)); EXPECT_TRUE(Caffe::cublas_handle()); } +#endif + TEST_F(CommonTest, TestBrewMode) { Caffe::set_mode(Caffe::CPU); EXPECT_EQ(Caffe::mode(), Caffe::CPU); @@ -48,6 +51,8 @@ TEST_F(CommonTest, TestRandSeedCPU) { } } +#ifndef CPU_ONLY // GPU Caffe singleton test. + TEST_F(CommonTest, TestRandSeedGPU) { SyncedMemory data_a(10 * sizeof(unsigned int)); SyncedMemory data_b(10 * sizeof(unsigned int)); @@ -63,4 +68,6 @@ TEST_F(CommonTest, TestRandSeedGPU) { } } +#endif + } // namespace caffe diff --git a/src/caffe/test/test_concat_layer.cpp b/src/caffe/test/test_concat_layer.cpp index ff208a90..0550bb2d 100644 --- a/src/caffe/test/test_concat_layer.cpp +++ b/src/caffe/test/test_concat_layer.cpp @@ -3,7 +3,6 @@ #include <cstring> #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" @@ -15,8 +14,6 @@ namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class ConcatLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; diff --git a/src/caffe/test/test_convolution_layer.cpp b/src/caffe/test/test_convolution_layer.cpp index 6f3e3146..d0522b13 100644 --- a/src/caffe/test/test_convolution_layer.cpp +++ b/src/caffe/test/test_convolution_layer.cpp @@ -3,7 +3,6 @@ #include <cstring> #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" @@ -15,8 +14,6 @@ namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class ConvolutionLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; 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; diff --git a/src/caffe/test/test_dummy_data_layer.cpp b/src/caffe/test/test_dummy_data_layer.cpp index 3a83a797..5b5f2025 100644 --- a/src/caffe/test/test_dummy_data_layer.cpp +++ b/src/caffe/test/test_dummy_data_layer.cpp @@ -15,8 +15,6 @@ using std::stringstream; namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename Dtype> class DummyDataLayerTest : public ::testing::Test { protected: diff --git a/src/caffe/test/test_eltwise_layer.cpp b/src/caffe/test/test_eltwise_layer.cpp index 66490d2b..53bff96e 100644 --- a/src/caffe/test/test_eltwise_layer.cpp +++ b/src/caffe/test/test_eltwise_layer.cpp @@ -2,7 +2,6 @@ #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" @@ -14,8 +13,6 @@ namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class EltwiseLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; diff --git a/src/caffe/test/test_euclidean_loss_layer.cpp b/src/caffe/test/test_euclidean_loss_layer.cpp index 8c796945..dd27670d 100644 --- a/src/caffe/test/test_euclidean_loss_layer.cpp +++ b/src/caffe/test/test_euclidean_loss_layer.cpp @@ -5,7 +5,6 @@ #include <cstring> #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" @@ -17,8 +16,6 @@ namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class EuclideanLossLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; diff --git a/src/caffe/test/test_filler.cpp b/src/caffe/test/test_filler.cpp index 93eda7e8..1b145f24 100644 --- a/src/caffe/test/test_filler.cpp +++ b/src/caffe/test/test_filler.cpp @@ -2,7 +2,6 @@ #include <cstring> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/filler.hpp" diff --git a/src/caffe/test/test_flatten_layer.cpp b/src/caffe/test/test_flatten_layer.cpp index e6e777e6..bea099b1 100644 --- a/src/caffe/test/test_flatten_layer.cpp +++ b/src/caffe/test/test_flatten_layer.cpp @@ -3,7 +3,6 @@ #include <cstring> #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" @@ -15,8 +14,6 @@ namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class FlattenLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; diff --git a/src/caffe/test/test_hdf5_output_layer.cpp b/src/caffe/test/test_hdf5_output_layer.cpp index 6fd9a2fc..221d62aa 100644 --- a/src/caffe/test/test_hdf5_output_layer.cpp +++ b/src/caffe/test/test_hdf5_output_layer.cpp @@ -1,6 +1,5 @@ // Copyright 2014 BVLC and contributors. -#include <cuda_runtime.h> #include <string> #include <vector> @@ -17,8 +16,6 @@ using std::vector; namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template<typename TypeParam> class HDF5OutputLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; diff --git a/src/caffe/test/test_hdf5data_layer.cpp b/src/caffe/test/test_hdf5data_layer.cpp index 3eb24210..e606e209 100644 --- a/src/caffe/test/test_hdf5data_layer.cpp +++ b/src/caffe/test/test_hdf5data_layer.cpp @@ -3,7 +3,6 @@ #include <string> #include <vector> -#include "cuda_runtime.h" #include "leveldb/db.h" #include "gtest/gtest.h" @@ -18,8 +17,6 @@ using std::string; namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class HDF5DataLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; diff --git a/src/caffe/test/test_hinge_loss_layer.cpp b/src/caffe/test/test_hinge_loss_layer.cpp index df6d8e25..84374e95 100644 --- a/src/caffe/test/test_hinge_loss_layer.cpp +++ b/src/caffe/test/test_hinge_loss_layer.cpp @@ -5,7 +5,6 @@ #include <cstring> #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" @@ -17,8 +16,6 @@ namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class HingeLossLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; diff --git a/src/caffe/test/test_im2col_kernel.cu b/src/caffe/test/test_im2col_kernel.cu index bd4404a0..5671968b 100644 --- a/src/caffe/test/test_im2col_kernel.cu +++ b/src/caffe/test/test_im2col_kernel.cu @@ -3,7 +3,6 @@ #include <cstring> #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" diff --git a/src/caffe/test/test_im2col_layer.cpp b/src/caffe/test/test_im2col_layer.cpp index 5be19174..a40f59df 100644 --- a/src/caffe/test/test_im2col_layer.cpp +++ b/src/caffe/test/test_im2col_layer.cpp @@ -3,7 +3,6 @@ #include <cstring> #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" @@ -15,8 +14,6 @@ namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class Im2colLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; diff --git a/src/caffe/test/test_image_data_layer.cpp b/src/caffe/test/test_image_data_layer.cpp index fbd4a1ca..ae9a2dbc 100644 --- a/src/caffe/test/test_image_data_layer.cpp +++ b/src/caffe/test/test_image_data_layer.cpp @@ -1,7 +1,5 @@ // Copyright 2014 BVLC and contributors. -#include <cuda_runtime.h> - #include <iostream> // NOLINT(readability/streams) #include <fstream> // NOLINT(readability/streams) #include <map> @@ -21,8 +19,6 @@ using std::string; namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class ImageDataLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; diff --git a/src/caffe/test/test_inner_product_layer.cpp b/src/caffe/test/test_inner_product_layer.cpp index ad4783f9..de194f2d 100644 --- a/src/caffe/test/test_inner_product_layer.cpp +++ b/src/caffe/test/test_inner_product_layer.cpp @@ -3,7 +3,6 @@ #include <cstring> #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" @@ -15,7 +14,9 @@ namespace caffe { +#ifndef CPU_ONLY extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; +#endif template <typename TypeParam> class InnerProductLayerTest : public MultiDeviceTest<TypeParam> { @@ -57,8 +58,12 @@ TYPED_TEST(InnerProductLayerTest, TestSetUp) { TYPED_TEST(InnerProductLayerTest, TestForward) { typedef typename TypeParam::Dtype Dtype; + bool IS_VALID_CUDA = false; +#ifndef CPU_ONLY + IS_VALID_CUDA = CAFFE_TEST_CUDA_PROP.major >= 2; +#endif if (Caffe::mode() == Caffe::CPU || - sizeof(Dtype) == 4 || CAFFE_TEST_CUDA_PROP.major >= 2) { + sizeof(Dtype) == 4 || IS_VALID_CUDA) { LayerParameter layer_param; InnerProductParameter* inner_product_param = layer_param.mutable_inner_product_param(); @@ -83,8 +88,12 @@ TYPED_TEST(InnerProductLayerTest, TestForward) { TYPED_TEST(InnerProductLayerTest, TestGradient) { typedef typename TypeParam::Dtype Dtype; + bool IS_VALID_CUDA = false; +#ifndef CPU_ONLY + IS_VALID_CUDA = CAFFE_TEST_CUDA_PROP.major >= 2; +#endif if (Caffe::mode() == Caffe::CPU || - sizeof(Dtype) == 4 || CAFFE_TEST_CUDA_PROP.major >= 2) { + sizeof(Dtype) == 4 || IS_VALID_CUDA) { LayerParameter layer_param; InnerProductParameter* inner_product_param = layer_param.mutable_inner_product_param(); diff --git a/src/caffe/test/test_lrn_layer.cpp b/src/caffe/test/test_lrn_layer.cpp index a627c97f..5bd5533f 100644 --- a/src/caffe/test/test_lrn_layer.cpp +++ b/src/caffe/test/test_lrn_layer.cpp @@ -4,7 +4,6 @@ #include <cstring> #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" @@ -19,8 +18,6 @@ using std::max; namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class LRNLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; diff --git a/src/caffe/test/test_maxpool_dropout_layers.cpp b/src/caffe/test/test_maxpool_dropout_layers.cpp index eef375ac..733bbf4a 100644 --- a/src/caffe/test/test_maxpool_dropout_layers.cpp +++ b/src/caffe/test/test_maxpool_dropout_layers.cpp @@ -3,8 +3,6 @@ #include <cstring> #include <vector> -#include "cuda_runtime.h" - #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" diff --git a/src/caffe/test/test_multinomial_logistic_loss_layer.cpp b/src/caffe/test/test_multinomial_logistic_loss_layer.cpp index d73347e8..ec53d40e 100644 --- a/src/caffe/test/test_multinomial_logistic_loss_layer.cpp +++ b/src/caffe/test/test_multinomial_logistic_loss_layer.cpp @@ -5,7 +5,6 @@ #include <cstring> #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" @@ -17,8 +16,6 @@ namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename Dtype> class MultinomialLogisticLossLayerTest : public ::testing::Test { protected: diff --git a/src/caffe/test/test_neuron_layer.cpp b/src/caffe/test/test_neuron_layer.cpp index f4447184..246832d2 100644 --- a/src/caffe/test/test_neuron_layer.cpp +++ b/src/caffe/test/test_neuron_layer.cpp @@ -3,7 +3,6 @@ #include <cstring> #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" @@ -15,8 +14,6 @@ namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class NeuronLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; diff --git a/src/caffe/test/test_platform.cpp b/src/caffe/test/test_platform.cpp index 7cf8306e..e1c4dafc 100644 --- a/src/caffe/test/test_platform.cpp +++ b/src/caffe/test/test_platform.cpp @@ -1,9 +1,10 @@ // Copyright 2014 BVLC and contributors. +#ifndef CPU_ONLY + #include <cstdlib> #include <cstdio> -#include "cuda_runtime.h" #include "glog/logging.h" #include "gtest/gtest.h" #include "caffe/test/test_caffe_main.hpp" @@ -53,3 +54,5 @@ TEST_F(PlatformTest, TestInitialization) { } } // namespace caffe + +#endif // CPU_ONLY diff --git a/src/caffe/test/test_pooling_layer.cpp b/src/caffe/test/test_pooling_layer.cpp index b209d821..b9cec54a 100644 --- a/src/caffe/test/test_pooling_layer.cpp +++ b/src/caffe/test/test_pooling_layer.cpp @@ -3,7 +3,6 @@ #include <cstring> #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" @@ -15,8 +14,6 @@ namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class PoolingLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; diff --git a/src/caffe/test/test_power_layer.cpp b/src/caffe/test/test_power_layer.cpp index a1b716ad..c9992d57 100644 --- a/src/caffe/test/test_power_layer.cpp +++ b/src/caffe/test/test_power_layer.cpp @@ -3,7 +3,6 @@ #include <algorithm> #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" @@ -18,8 +17,6 @@ using std::isnan; namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class PowerLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; diff --git a/src/caffe/test/test_random_number_generator.cpp b/src/caffe/test/test_random_number_generator.cpp index 3cd77da9..abe21c25 100644 --- a/src/caffe/test/test_random_number_generator.cpp +++ b/src/caffe/test/test_random_number_generator.cpp @@ -1,6 +1,5 @@ // Copyright 2014 BVLC and contributors. -#include <cuda_runtime.h> #include <cmath> #include <cstring> diff --git a/src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp b/src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp index 76bbfb48..a5388db0 100644 --- a/src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp +++ b/src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp @@ -16,8 +16,6 @@ namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class SigmoidCrossEntropyLossLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; diff --git a/src/caffe/test/test_softmax_layer.cpp b/src/caffe/test/test_softmax_layer.cpp index f0be279b..fa899f92 100644 --- a/src/caffe/test/test_softmax_layer.cpp +++ b/src/caffe/test/test_softmax_layer.cpp @@ -4,7 +4,6 @@ #include <cstring> #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" @@ -16,8 +15,6 @@ namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class SoftmaxLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; diff --git a/src/caffe/test/test_softmax_with_loss_layer.cpp b/src/caffe/test/test_softmax_with_loss_layer.cpp index efd6e33c..6f45c388 100644 --- a/src/caffe/test/test_softmax_with_loss_layer.cpp +++ b/src/caffe/test/test_softmax_with_loss_layer.cpp @@ -5,7 +5,6 @@ #include <cstring> #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" @@ -17,8 +16,6 @@ namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class SoftmaxWithLossLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; diff --git a/src/caffe/test/test_split_layer.cpp b/src/caffe/test/test_split_layer.cpp index 455fb59d..bbee6d28 100644 --- a/src/caffe/test/test_split_layer.cpp +++ b/src/caffe/test/test_split_layer.cpp @@ -4,7 +4,6 @@ #include <string> #include <vector> -#include "cuda_runtime.h" #include "google/protobuf/text_format.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" @@ -18,8 +17,6 @@ namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class SplitLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; diff --git a/src/caffe/test/test_stochastic_pooling.cpp b/src/caffe/test/test_stochastic_pooling.cpp index 7a931d22..66e9b2d7 100644 --- a/src/caffe/test/test_stochastic_pooling.cpp +++ b/src/caffe/test/test_stochastic_pooling.cpp @@ -4,7 +4,6 @@ #include <cstring> #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" @@ -18,8 +17,6 @@ using std::min; namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename Dtype> class StochasticPoolingLayerTest : public ::testing::Test { protected: diff --git a/src/caffe/test/test_syncedmem.cpp b/src/caffe/test/test_syncedmem.cpp index 20bd8613..f07682a2 100644 --- a/src/caffe/test/test_syncedmem.cpp +++ b/src/caffe/test/test_syncedmem.cpp @@ -3,10 +3,10 @@ #include <cstring> #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/common.hpp" #include "caffe/syncedmem.hpp" +#include "caffe/util/device_alternate.hpp" #include "caffe/util/math_functions.hpp" #include "caffe/test/test_caffe_main.hpp" @@ -24,6 +24,8 @@ TEST_F(SyncedMemoryTest, TestInitialization) { delete p_mem; } +#ifndef CPU_ONLY // GPU test + TEST_F(SyncedMemoryTest, TestAllocationCPUGPU) { SyncedMemory mem(10); EXPECT_TRUE(mem.cpu_data()); @@ -32,18 +34,24 @@ TEST_F(SyncedMemoryTest, TestAllocationCPUGPU) { EXPECT_TRUE(mem.mutable_gpu_data()); } +#endif + TEST_F(SyncedMemoryTest, TestAllocationCPU) { SyncedMemory mem(10); EXPECT_TRUE(mem.cpu_data()); EXPECT_TRUE(mem.mutable_cpu_data()); } +#ifndef CPU_ONLY // GPU test + TEST_F(SyncedMemoryTest, TestAllocationGPU) { SyncedMemory mem(10); EXPECT_TRUE(mem.gpu_data()); EXPECT_TRUE(mem.mutable_gpu_data()); } +#endif + TEST_F(SyncedMemoryTest, TestCPUWrite) { SyncedMemory mem(10); void* cpu_data = mem.mutable_cpu_data(); @@ -61,6 +69,8 @@ TEST_F(SyncedMemoryTest, TestCPUWrite) { } } +#ifndef CPU_ONLY // GPU test + TEST_F(SyncedMemoryTest, TestGPURead) { SyncedMemory mem(10); void* cpu_data = mem.mutable_cpu_data(); @@ -112,4 +122,6 @@ TEST_F(SyncedMemoryTest, TestGPUWrite) { EXPECT_EQ(mem.head(), SyncedMemory::SYNCED); } +#endif + } // namespace caffe diff --git a/src/caffe/test/test_tanh_layer.cpp b/src/caffe/test/test_tanh_layer.cpp index 171eb4e4..7fc443f6 100644 --- a/src/caffe/test/test_tanh_layer.cpp +++ b/src/caffe/test/test_tanh_layer.cpp @@ -5,7 +5,6 @@ #include <cstring> #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" @@ -17,8 +16,6 @@ namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class TanHLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; diff --git a/src/caffe/test/test_threshold_layer.cpp b/src/caffe/test/test_threshold_layer.cpp index 46519ff2..7006dd11 100644 --- a/src/caffe/test/test_threshold_layer.cpp +++ b/src/caffe/test/test_threshold_layer.cpp @@ -2,7 +2,6 @@ #include <vector> -#include "cuda_runtime.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" @@ -14,8 +13,6 @@ namespace caffe { -extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; - template <typename TypeParam> class ThresholdLayerTest : public MultiDeviceTest<TypeParam> { typedef typename TypeParam::Dtype Dtype; diff --git a/src/caffe/test/test_upgrade_proto.cpp b/src/caffe/test/test_upgrade_proto.cpp index 9203f558..72ee8389 100644 --- a/src/caffe/test/test_upgrade_proto.cpp +++ b/src/caffe/test/test_upgrade_proto.cpp @@ -4,7 +4,6 @@ #include <string> #include <vector> -#include "cuda_runtime.h" #include "google/protobuf/text_format.h" #include "gtest/gtest.h" #include "caffe/blob.hpp" diff --git a/src/caffe/test/test_util_blas.cpp b/src/caffe/test/test_util_blas.cpp index 725d24e2..d74f9f01 100644 --- a/src/caffe/test/test_util_blas.cpp +++ b/src/caffe/test/test_util_blas.cpp @@ -1,12 +1,12 @@ // Copyright 2014 BVLC and contributors. -#include <cstring> +#ifndef CPU_ONLY // CPU-GPU test -#include "cuda_runtime.h" -#include "cublas_v2.h" +#include <cstring> #include "gtest/gtest.h" #include "caffe/blob.hpp" +#include "caffe/util/device_alternate.hpp" #include "caffe/util/math_functions.hpp" #include "caffe/test/test_caffe_main.hpp" @@ -131,3 +131,5 @@ TYPED_TEST(GemmTest, TestGemvCPUGPU) { } } // namespace caffe + +#endif // CPU_ONLY |