summaryrefslogtreecommitdiff
path: root/src/caffe/test/test_softmax_layer.cpp
diff options
context:
space:
mode:
authorFelix Abecassis <fabecassis@nvidia.com>2015-05-26 11:21:56 -0700
committerFelix Abecassis <fabecassis@nvidia.com>2015-05-26 13:55:49 -0700
commit89bf3c3d99aee902c49de56c25a32d5837f8962f (patch)
tree374ef2e3a2984568f5b18c0d282c46f2aad7bfd5 /src/caffe/test/test_softmax_layer.cpp
parent58f9ea37a9c5c6a0253be5235504b8399aae54ec (diff)
downloadcaffeonacl-89bf3c3d99aee902c49de56c25a32d5837f8962f.tar.gz
caffeonacl-89bf3c3d99aee902c49de56c25a32d5837f8962f.tar.bz2
caffeonacl-89bf3c3d99aee902c49de56c25a32d5837f8962f.zip
Make class CuDNNSoftmaxLayerTest derive from GPUDeviceTest
Diffstat (limited to 'src/caffe/test/test_softmax_layer.cpp')
-rw-r--r--src/caffe/test/test_softmax_layer.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/caffe/test/test_softmax_layer.cpp b/src/caffe/test/test_softmax_layer.cpp
index f6674422..996da4b8 100644
--- a/src/caffe/test/test_softmax_layer.cpp
+++ b/src/caffe/test/test_softmax_layer.cpp
@@ -82,7 +82,7 @@ TYPED_TEST(SoftmaxLayerTest, TestGradient) {
#ifdef USE_CUDNN
template <typename Dtype>
-class CuDNNSoftmaxLayerTest : public ::testing::Test {
+class CuDNNSoftmaxLayerTest : public GPUDeviceTest<Dtype> {
protected:
CuDNNSoftmaxLayerTest()
: blob_bottom_(new Blob<Dtype>(2, 10, 2, 3)),
@@ -104,7 +104,6 @@ class CuDNNSoftmaxLayerTest : public ::testing::Test {
TYPED_TEST_CASE(CuDNNSoftmaxLayerTest, TestDtypes);
TYPED_TEST(CuDNNSoftmaxLayerTest, TestForwardCuDNN) {
- Caffe::set_mode(Caffe::GPU);
LayerParameter layer_param;
CuDNNSoftmaxLayer<TypeParam> layer(layer_param);
layer.SetUp(this->blob_bottom_vec_, this->blob_top_vec_);
@@ -138,7 +137,6 @@ TYPED_TEST(CuDNNSoftmaxLayerTest, TestForwardCuDNN) {
}
TYPED_TEST(CuDNNSoftmaxLayerTest, TestGradientCuDNN) {
- Caffe::set_mode(Caffe::GPU);
LayerParameter layer_param;
CuDNNSoftmaxLayer<TypeParam> layer(layer_param);
GradientChecker<TypeParam> checker(1e-2, 1e-3);