Merge pull request #936 from jeffdonahue/not-stage

Add "not_stage" to NetStateRule to exclude NetStates with certain stages

Author: jeffdonahue

src/caffe/net.cpp

@@ -282,7 +282,7 @@ bool Net<Dtype>::StateMeetsRule(const NetState& state,
     if (state.level() < rule.min_level()) {
       LOG(INFO) << "The NetState level (" << state.level()
           << ") is above the min_level (" << rule.min_level()
-          << " specified by a rule in layer " << layer_name;
+          << ") specified by a rule in layer " << layer_name;
       return false;
     }
   }
@@ -291,24 +291,36 @@ bool Net<Dtype>::StateMeetsRule(const NetState& state,
     if (state.level() > rule.max_level()) {
       LOG(INFO) << "The NetState level (" << state.level()
           << ") is above the max_level (" << rule.max_level()
-          << " specified by a rule in layer " << layer_name;
+          << ") specified by a rule in layer " << layer_name;
       return false;
     }
   }
-  // Check whether the rule is broken due to stage. If stage is specified,
-  // the NetState must contain ALL of the rule's stages to meet it.
-  if (rule.stage_size()) {
-    for (int i = 0; i < rule.stage_size(); ++i) {
-      // Check that the NetState contains the rule's ith stage.
-      bool has_stage = false;
-      for (int j = 0; !has_stage && j < state.stage_size(); ++j) {
-        if (rule.stage(i) == state.stage(j)) { has_stage = true; }
-      }
-      if (!has_stage) {
-        LOG(INFO) << "The NetState did not contain stage '" << rule.stage(i)
-                  << "' specified by a rule in layer " << layer_name;
-        return false;
-      }
+  // Check whether the rule is broken due to stage. The NetState must
+  // contain ALL of the rule's stages to meet it.
+  for (int i = 0; i < rule.stage_size(); ++i) {
+    // Check that the NetState contains the rule's ith stage.
+    bool has_stage = false;
+    for (int j = 0; !has_stage && j < state.stage_size(); ++j) {
+      if (rule.stage(i) == state.stage(j)) { has_stage = true; }
+    }
+    if (!has_stage) {
+      LOG(INFO) << "The NetState did not contain stage '" << rule.stage(i)
+                << "' specified by a rule in layer " << layer_name;
+      return false;
+    }
+  }
+  // Check whether the rule is broken due to not_stage. The NetState must
+  // contain NONE of the rule's not_stages to meet it.
+  for (int i = 0; i < rule.not_stage_size(); ++i) {
+    // Check that the NetState contains the rule's ith not_stage.
+    bool has_stage = false;
+    for (int j = 0; !has_stage && j < state.stage_size(); ++j) {
+      if (rule.not_stage(i) == state.stage(j)) { has_stage = true; }
+    }
+    if (has_stage) {
+      LOG(INFO) << "The NetState contained a not_stage '" << rule.not_stage(i)
+                << "' specified by a rule in layer " << layer_name;
+      return false;
     }
   }
   return true;

src/caffe/proto/caffe.proto

@@ -171,10 +171,12 @@ message NetStateRule {
   optional int32 min_level = 2;
   optional int32 max_level = 3;
 
-  // A customizable set of stages.
-  // The net must have ALL of the specified stages to meet the rule.
+  // Customizable sets of stages to include or exclude.
+  // The net must have ALL of the specified stages and NONE of the specified
+  // "not_stage"s to meet the rule.
   // (Use multiple NetStateRules to specify conjunctions of stages.)
   repeated string stage = 4;
+  repeated string not_stage = 5;
 }
 
 // NOTE

src/caffe/test/test_net.cpp

@@ -1618,6 +1618,69 @@ TEST_F(FilterNetTest, TestFilterInByMultipleStage2) {
   this->RunFilterNetTest(input_proto, input_proto);
 }
 
+TEST_F(FilterNetTest, TestFilterInByNotStage) {
+  const string& input_proto =
+      "state: { stage: 'mystage' } "
+      "name: 'TestNetwork' "
+      "layers: { "
+      "  name: 'data' "
+      "  type: DATA "
+      "  top: 'data' "
+      "  top: 'label' "
+      "} "
+      "layers: { "
+      "  name: 'innerprod' "
+      "  type: INNER_PRODUCT "
+      "  bottom: 'data' "
+      "  top: 'innerprod' "
+      "  include: { not_stage: 'myotherstage' } "
+      "} "
+      "layers: { "
+      "  name: 'loss' "
+      "  type: SOFTMAX_LOSS "
+      "  bottom: 'innerprod' "
+      "  bottom: 'label' "
+      "  include: { not_stage: 'myotherstage' } "
+      "} ";
+  this->RunFilterNetTest(input_proto, input_proto);
+}
+
+TEST_F(FilterNetTest, TestFilterOutByNotStage) {
+  const string& input_proto =
+      "state: { stage: 'mystage' } "
+      "name: 'TestNetwork' "
+      "layers: { "
+      "  name: 'data' "
+      "  type: DATA "
+      "  top: 'data' "
+      "  top: 'label' "
+      "} "
+      "layers: { "
+      "  name: 'innerprod' "
+      "  type: INNER_PRODUCT "
+      "  bottom: 'data' "
+      "  top: 'innerprod' "
+      "  include: { not_stage: 'mystage' } "
+      "} "
+      "layers: { "
+      "  name: 'loss' "
+      "  type: SOFTMAX_LOSS "
+      "  bottom: 'innerprod' "
+      "  bottom: 'label' "
+      "  include: { not_stage: 'mystage' } "
+      "} ";
+  const string& output_proto =
+      "state: { stage: 'mystage' } "
+      "name: 'TestNetwork' "
+      "layers: { "
+      "  name: 'data' "
+      "  type: DATA "
+      "  top: 'data' "
+      "  top: 'label' "
+      "} ";
+  this->RunFilterNetTest(input_proto, output_proto);
+}
+
 TEST_F(FilterNetTest, TestFilterOutByMinLevel) {
   const string& input_proto =
       "name: 'TestNetwork' "