From: Felix Abecassis <fabecassis@nvidia.com>
Date: Tue, 26 May 2015 18:21:39 +0000 (-0700)
Subject: Make class Im2colKernelTest derive from GPUDeviceTest
X-Git-Tag: submit/tizen/20180823.020014~476^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8a5abbfcd4a51e92c3731ad03ce95786a7e395b9;p=platform%2Fupstream%2Fcaffeonacl.git

Make class Im2colKernelTest derive from GPUDeviceTest
---

diff --git a/src/caffe/test/test_im2col_kernel.cu b/src/caffe/test/test_im2col_kernel.cu
index ee684c0..0017ac2 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_,