diff options
| author | Felix Abecassis <fabecassis@nvidia.com> | 2015-05-26 11:21:39 -0700 |
|---|---|---|
| committer | Felix Abecassis <fabecassis@nvidia.com> | 2015-05-26 13:55:48 -0700 |
| commit | 8a5abbfcd4a51e92c3731ad03ce95786a7e395b9 (patch) | |
| tree | dbbb5452844f088e625979cd98ba43a569c3c95f /src/caffe/test/test_im2col_kernel.cu | |
| parent | 8d2010489a2e291b4747d3b21b5cadc97d84cb00 (diff) | |
| download | caffeonacl-8a5abbfcd4a51e92c3731ad03ce95786a7e395b9.tar.gz caffeonacl-8a5abbfcd4a51e92c3731ad03ce95786a7e395b9.tar.bz2 caffeonacl-8a5abbfcd4a51e92c3731ad03ce95786a7e395b9.zip | |
Make class Im2colKernelTest derive from GPUDeviceTest
Diffstat (limited to 'src/caffe/test/test_im2col_kernel.cu')
| -rw-r--r-- | src/caffe/test/test_im2col_kernel.cu | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/caffe/test/test_im2col_kernel.cu b/src/caffe/test/test_im2col_kernel.cu index ee684c00..0017ac23 100644 --- a/src/caffe/test/test_im2col_kernel.cu +++ b/src/caffe/test/test_im2col_kernel.cu @@ -25,7 +25,7 @@ __global__ void im2col_gpu_kernel(const int n, const Dtype* data_im, extern cudaDeviceProp CAFFE_TEST_CUDA_PROP; template <typename Dtype> -class Im2colKernelTest : public ::testing::Test { +class Im2colKernelTest : public GPUDeviceTest<Dtype> { protected: Im2colKernelTest() // big so launches > 1024 threads @@ -68,8 +68,6 @@ class Im2colKernelTest : public ::testing::Test { TYPED_TEST_CASE(Im2colKernelTest, TestDtypes); TYPED_TEST(Im2colKernelTest, TestGPU) { - Caffe::set_mode(Caffe::GPU); - // Reshape the blobs to correct size for im2col output this->blob_top_->Reshape(this->blob_bottom_->num(), this->channels_ * this->kernel_size_ * this->kernel_size_, |