diff options
| author | Felix Abecassis <fabecassis@nvidia.com> | 2015-05-26 11:21:48 -0700 |
|---|---|---|
| committer | Felix Abecassis <fabecassis@nvidia.com> | 2015-05-26 13:55:49 -0700 |
| commit | 4feaa0e2ecae38f7a68540507d9fef53c36a2dee (patch) | |
| tree | 6fd959f04f5a258733c98f3704c24a34f26ca54b /src | |
| parent | 5ca280a3df52fd8693dce00711b39b1cd9391ae3 (diff) | |
| download | caffeonacl-4feaa0e2ecae38f7a68540507d9fef53c36a2dee.tar.gz caffeonacl-4feaa0e2ecae38f7a68540507d9fef53c36a2dee.tar.bz2 caffeonacl-4feaa0e2ecae38f7a68540507d9fef53c36a2dee.zip | |
Make class CuDNNConvolutionLayerTest derive from GPUDeviceTest
Diffstat (limited to 'src')
| -rw-r--r-- | src/caffe/test/test_convolution_layer.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/caffe/test/test_convolution_layer.cpp b/src/caffe/test/test_convolution_layer.cpp index c1fe3b58..67d41fff 100644 --- a/src/caffe/test/test_convolution_layer.cpp +++ b/src/caffe/test/test_convolution_layer.cpp @@ -424,7 +424,7 @@ TYPED_TEST(ConvolutionLayerTest, TestGradientGroup) { #ifdef USE_CUDNN template <typename Dtype> -class CuDNNConvolutionLayerTest : public ::testing::Test { +class CuDNNConvolutionLayerTest : public GPUDeviceTest<Dtype> { protected: CuDNNConvolutionLayerTest() : blob_bottom_(new Blob<Dtype>(2, 3, 6, 4)), @@ -467,7 +467,6 @@ class CuDNNConvolutionLayerTest : public ::testing::Test { TYPED_TEST_CASE(CuDNNConvolutionLayerTest, TestDtypes); TYPED_TEST(CuDNNConvolutionLayerTest, TestSetupCuDNN) { - Caffe::set_mode(Caffe::GPU); this->blob_bottom_vec_.push_back(this->blob_bottom_2_); this->blob_top_vec_.push_back(this->blob_top_2_); LayerParameter layer_param; @@ -505,7 +504,6 @@ TYPED_TEST(CuDNNConvolutionLayerTest, TestSetupCuDNN) { } TYPED_TEST(CuDNNConvolutionLayerTest, TestSimpleConvolutionCuDNN) { - Caffe::set_mode(Caffe::GPU); this->blob_bottom_vec_.push_back(this->blob_bottom_2_); this->blob_top_vec_.push_back(this->blob_top_2_); LayerParameter layer_param; @@ -541,7 +539,6 @@ TYPED_TEST(CuDNNConvolutionLayerTest, TestSimpleConvolutionCuDNN) { } TYPED_TEST(CuDNNConvolutionLayerTest, TestSimpleConvolutionGroupCuDNN) { - Caffe::set_mode(Caffe::GPU); LayerParameter layer_param; ConvolutionParameter* convolution_param = layer_param.mutable_convolution_param(); @@ -572,7 +569,7 @@ TYPED_TEST(CuDNNConvolutionLayerTest, TestSobelConvolutionCuDNN) { // Test separable convolution by computing the Sobel operator // as a single filter then comparing the result // as the convolution of two rectangular filters. - Caffe::set_mode(Caffe::GPU); + // Fill bottoms with identical Gaussian noise. shared_ptr<GaussianFiller<TypeParam> > filler; FillerParameter filler_param; @@ -665,7 +662,6 @@ TYPED_TEST(CuDNNConvolutionLayerTest, TestSobelConvolutionCuDNN) { } TYPED_TEST(CuDNNConvolutionLayerTest, TestGradientCuDNN) { - Caffe::set_mode(Caffe::GPU); LayerParameter layer_param; ConvolutionParameter* convolution_param = layer_param.mutable_convolution_param(); @@ -683,7 +679,6 @@ TYPED_TEST(CuDNNConvolutionLayerTest, TestGradientCuDNN) { } TYPED_TEST(CuDNNConvolutionLayerTest, TestGradientGroupCuDNN) { - Caffe::set_mode(Caffe::GPU); LayerParameter layer_param; ConvolutionParameter* convolution_param = layer_param.mutable_convolution_param(); |