diff options
| author | Felix Abecassis <fabecassis@nvidia.com> | 2015-05-26 11:21:41 -0700 |
|---|---|---|
| committer | Felix Abecassis <fabecassis@nvidia.com> | 2015-05-26 13:55:48 -0700 |
| commit | 8437c649a2701e34321dfa54860ecdefe3ea8815 (patch) | |
| tree | 5a6111ef70d25411258d1e33487451aacb2abbd6 /src/caffe/test/test_accuracy_layer.cpp | |
| parent | 8a5abbfcd4a51e92c3731ad03ce95786a7e395b9 (diff) | |
| download | caffeonacl-8437c649a2701e34321dfa54860ecdefe3ea8815.tar.gz caffeonacl-8437c649a2701e34321dfa54860ecdefe3ea8815.tar.bz2 caffeonacl-8437c649a2701e34321dfa54860ecdefe3ea8815.zip | |
Make class AccuracyLayerTest derive from CPUDeviceTest
Diffstat (limited to 'src/caffe/test/test_accuracy_layer.cpp')
| -rw-r--r-- | src/caffe/test/test_accuracy_layer.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/caffe/test/test_accuracy_layer.cpp b/src/caffe/test/test_accuracy_layer.cpp index 6cbf51df..c14b67cc 100644 --- a/src/caffe/test/test_accuracy_layer.cpp +++ b/src/caffe/test/test_accuracy_layer.cpp @@ -16,7 +16,7 @@ namespace caffe { template <typename Dtype> -class AccuracyLayerTest : public ::testing::Test { +class AccuracyLayerTest : public CPUDeviceTest<Dtype> { protected: AccuracyLayerTest() : blob_bottom_data_(new Blob<Dtype>()), @@ -92,7 +92,6 @@ TYPED_TEST(AccuracyLayerTest, TestSetupTopK) { TYPED_TEST(AccuracyLayerTest, TestForwardCPU) { LayerParameter layer_param; - Caffe::set_mode(Caffe::CPU); AccuracyLayer<TypeParam> layer(layer_param); layer.SetUp(this->blob_bottom_vec_, this->blob_top_vec_); layer.Forward(this->blob_bottom_vec_, this->blob_top_vec_); @@ -118,7 +117,6 @@ TYPED_TEST(AccuracyLayerTest, TestForwardCPU) { } TYPED_TEST(AccuracyLayerTest, TestForwardWithSpatialAxes) { - Caffe::set_mode(Caffe::CPU); this->blob_bottom_data_->Reshape(2, 10, 4, 5); vector<int> label_shape(3); label_shape[0] = 2; label_shape[1] = 4; label_shape[2] = 5; @@ -162,7 +160,6 @@ TYPED_TEST(AccuracyLayerTest, TestForwardWithSpatialAxes) { } TYPED_TEST(AccuracyLayerTest, TestForwardIgnoreLabel) { - Caffe::set_mode(Caffe::CPU); LayerParameter layer_param; const TypeParam kIgnoreLabelValue = -1; layer_param.mutable_accuracy_param()->set_ignore_label(kIgnoreLabelValue); |