tests and comments fixed

Author: mtamburrano

src/caffe/net.cpp

@@ -82,8 +82,8 @@ void Net<Dtype>::Init(const NetParameter& in_param) {
     if (layer_param.propagate_down_size() > 0) {
       CHECK_EQ(layer_param.propagate_down_size(),
           layer_param.bottom_size())
-      << "propagate_down param must be specified"
-        << "either 0 or bottom_size times ";
+          << "propagate_down param must be specified "
+          << "either 0 or bottom_size times ";
     }
     layers_.push_back(LayerRegistry<Dtype>::CreateLayer(layer_param));
     layer_names_.push_back(layer_param.name());
@@ -415,7 +415,7 @@ int Net<Dtype>::AppendBottom(const NetParameter& param, const int layer_id,
   // Check if the backpropagation on bottom_id should be skipped
   if (layer_param.propagate_down_size() > 0)
     propagate_down = layer_param.propagate_down(bottom_id);
-  const bool need_backward = blob_need_backward_[blob_id] &
+  const bool need_backward = blob_need_backward_[blob_id] &&
                           propagate_down;
   bottom_need_backward_[layer_id].push_back(need_backward);
   return blob_id;

src/caffe/proto/caffe.proto

@@ -282,7 +282,7 @@ message LayerParameter {
   repeated BlobProto blobs = 7;
 
   // Specifies on which bottoms the backpropagation should be skipped.
-  // The size must be either 0 or equals to the number of bottoms.
+  // The size must be either 0 or equal to the number of bottoms.
   repeated bool propagate_down = 11;
 
   // Rules controlling whether and when a layer is included in the network,

src/caffe/test/test_net.cpp

@@ -2326,46 +2326,46 @@ TYPED_TEST(NetTest, TestSkipPropagateDown) {
   this->InitSkipPropNet(false);
   vector<bool> vec_layer_need_backward = this->net_->layer_need_backward();
   for (int layer_id = 0; layer_id < this->net_->layers().size(); ++layer_id) {
-    if (this->net_->layer_names()[layer_id] == "loss") {
+    string layer_name = this->net_->layer_names()[layer_id];
+    if (layer_name == "loss") {
       // access to bottom_need_backward coresponding to label's blob
       bool need_back = this->net_->bottom_need_backward()[layer_id][1];
       // if propagate_down is true, the loss layer will try to
       // backpropagate on labels
-      CHECK_EQ(need_back, true)
-        << "bottom_need_backward should be True";
+      EXPECT_TRUE(need_back) << "bottom_need_backward should be True";
+    }
+    // layer_need_backward should be True except for data and silence layers
+    if (layer_name.find("data") != std::string::npos ||
+          layer_name == "silence") {
+      EXPECT_FALSE(vec_layer_need_backward[layer_id])
+          << "layer_need_backward for " << layer_name << " should be False";
+    } else {
+      EXPECT_TRUE(vec_layer_need_backward[layer_id])
+          << "layer_need_backward for " << layer_name << " should be True";
     }
-    if (this->net_->layer_names()[layer_id] == "ip_fake_labels")
-      CHECK_EQ(vec_layer_need_backward[layer_id], true)
-        << "layer_need_backward for ip_fake_labels should be True";
-    if (this->net_->layer_names()[layer_id] == "argmax")
-      CHECK_EQ(vec_layer_need_backward[layer_id], true)
-        << "layer_need_backward for argmax should be True";
-    if (this->net_->layer_names()[layer_id] == "innerproduct")
-      CHECK_EQ(vec_layer_need_backward[layer_id], true)
-        << "layer_need_backward for innerproduct should be True";
   }
   // check bottom_need_backward if propagat_down is false
   this->InitSkipPropNet(true);
   vec_layer_need_backward.clear();
   vec_layer_need_backward = this->net_->layer_need_backward();
   for (int layer_id = 0; layer_id < this->net_->layers().size(); ++layer_id) {
-    if (this->net_->layer_names()[layer_id] == "loss") {
+    string layer_name = this->net_->layer_names()[layer_id];
+    if (layer_name == "loss") {
       // access to bottom_need_backward coresponding to label's blob
       bool need_back = this->net_->bottom_need_backward()[layer_id][1];
       // if propagate_down is false, the loss layer will not try to
       // backpropagate on labels
-      CHECK_EQ(need_back, false)
-        << "bottom_need_backward should be False";
+      EXPECT_FALSE(need_back) << "bottom_need_backward should be False";
+    }
+    // layer_need_backward should be False except for innerproduct and
+    // loss layers
+    if (layer_name == "innerproduct" || layer_name == "loss") {
+      EXPECT_TRUE(vec_layer_need_backward[layer_id])
+          << "layer_need_backward for " << layer_name << " should be True";
+    } else {
+      EXPECT_FALSE(vec_layer_need_backward[layer_id])
+          << "layer_need_backward for " << layer_name << " should be False";
     }
-    if (this->net_->layer_names()[layer_id] == "ip_fake_labels")
-      CHECK_EQ(vec_layer_need_backward[layer_id], false)
-        << "layer_need_backward for ip_fake_labels should be False";
-    if (this->net_->layer_names()[layer_id] == "argmax")
-      CHECK_EQ(vec_layer_need_backward[layer_id], false)
-        << "layer_need_backward for argmax should be False";
-    if (this->net_->layer_names()[layer_id] == "innerproduct")
-      CHECK_EQ(vec_layer_need_backward[layer_id], true)
-        << "layer_need_backward for innerproduct should be True";
   }
 }