add sigmoid cross ent layer unit tests

diff --git a/include/caffe/vision_layers.hpp b/include/caffe/vision_layers.hpp
index 9052604c12bdab3d22d8f71df13bde2313ff6613..b40f4c2958ba419c7acdd3131fba6f9eb3e65475 100644 (file)
--- a/include/caffe/vision_layers.hpp
+++ b/include/caffe/vision_layers.hpp
@@ -157,7 +157,7 @@ class SigmoidCrossEntropyLossLayer : public Layer<Dtype> {
   shared_ptr<SigmoidLayer<Dtype> > sigmoid_layer_;
   // sigmoid_output stores the output of the sigmoid layer.
   shared_ptr<Blob<Dtype> > sigmoid_output_;
-  // Vector holders to call the underlying softmax layer forward and backward.
+  // Vector holders to call the underlying sigmoid layer forward and backward.
   vector<Blob<Dtype>*> sigmoid_bottom_vec_;
   vector<Blob<Dtype>*> sigmoid_top_vec_;
 };

diff --git a/src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp b/src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp
new file mode 100644 (file)
index 0000000..fe899d4
--- /dev/null
+++ b/src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp
@@ -0,0 +1,76 @@
+// Copyright 2014 BVLC and contributors.
+
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+#include <vector>
+
+#include "gtest/gtest.h"
+#include "caffe/blob.hpp"
+#include "caffe/common.hpp"
+#include "caffe/filler.hpp"
+#include "caffe/vision_layers.hpp"
+#include "caffe/test/test_gradient_check_util.hpp"
+
+#include "caffe/test/test_caffe_main.hpp"
+
+namespace caffe {
+
+extern cudaDeviceProp CAFFE_TEST_CUDA_PROP;
+
+template <typename Dtype>
+class SigmoidCrossEntropyLossLayerTest : public ::testing::Test {
+ protected:
+  SigmoidCrossEntropyLossLayerTest()
+      : blob_bottom_data_(new Blob<Dtype>(10, 5, 1, 1)),
+        blob_bottom_targets_(new Blob<Dtype>(10, 5, 1, 1)) {
+    // Fill the data vector
+    FillerParameter data_filler_param;
+    data_filler_param.set_std(10);
+    GaussianFiller<Dtype> data_filler(data_filler_param);
+    data_filler.Fill(blob_bottom_data_);
+    blob_bottom_vec_.push_back(blob_bottom_data_);
+    // Fill the targets vector
+    FillerParameter targets_filler_param;
+    targets_filler_param.set_min(0.0);
+    targets_filler_param.set_max(1.0);
+    UniformFiller<Dtype> targets_filler(targets_filler_param);
+    targets_filler.Fill(blob_bottom_targets_);
+    blob_bottom_vec_.push_back(blob_bottom_targets_);
+  }
+  virtual ~SigmoidCrossEntropyLossLayerTest() {
+    delete blob_bottom_data_;
+    delete blob_bottom_targets_;
+  }
+  Blob<Dtype>* const blob_bottom_data_;
+  Blob<Dtype>* const blob_bottom_targets_;
+  vector<Blob<Dtype>*> blob_bottom_vec_;
+  vector<Blob<Dtype>*> blob_top_vec_;
+};
+
+typedef ::testing::Types<float, double> Dtypes;
+TYPED_TEST_CASE(SigmoidCrossEntropyLossLayerTest, Dtypes);
+
+
+TYPED_TEST(SigmoidCrossEntropyLossLayerTest, TestGradientCPU) {
+  LayerParameter layer_param;
+  Caffe::set_mode(Caffe::CPU);
+  SigmoidCrossEntropyLossLayer<TypeParam> layer(layer_param);
+  layer.SetUp(this->blob_bottom_vec_, &this->blob_top_vec_);
+  GradientChecker<TypeParam> checker(1e-2, 1e-2, 1701);
+  checker.CheckGradientSingle(&layer, &(this->blob_bottom_vec_),
+      &(this->blob_top_vec_), 0, -1, -1);
+}
+
+TYPED_TEST(SigmoidCrossEntropyLossLayerTest, TestGradientGPU) {
+  LayerParameter layer_param;
+  Caffe::set_mode(Caffe::GPU);
+  SigmoidCrossEntropyLossLayer<TypeParam> layer(layer_param);
+  layer.SetUp(this->blob_bottom_vec_, &this->blob_top_vec_);
+  GradientChecker<TypeParam> checker(1e-2, 1e-2, 1701);
+  checker.CheckGradientSingle(&layer, &(this->blob_bottom_vec_),
+      &(this->blob_top_vec_), 0, -1, -1);
+}
+
+
+}  // namespace caffe