fixing upgrade_proto for BatchNorm layer: be more conservative leave "name" in param, only set lr_mult and decay_mult to zero

shai · shai · commit a19357a19066 · 2017-01-15T08:54:45.000Z
diff --git a/src/caffe/util/upgrade_proto.cpp b/src/caffe/util/upgrade_proto.cpp
@@ -1018,7 +1018,13 @@ void UpgradeNetBatchNorm(NetParameter* net_param) {
     // the previous BatchNorm layer definition.
     if (net_param->layer(i).type() == "BatchNorm"
         && net_param->layer(i).param_size() == 3) {
-      net_param->mutable_layer(i)->clear_param();
+      // set lr_mult and decay_mult to zero. leave all other param intact.
+      for (int ip = 0; ip < net_param->layer(i).param_size(); ip++) {
+        ParamSpec* fixed_param_spec =
+          net_param->mutable_layer(i)->mutable_param(ip);
+        fixed_param_spec->set_lr_mult(0.f);
+        fixed_param_spec->set_decay_mult(0.f);
+      }
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1018,7 +1018,13 @@ void UpgradeNetBatchNorm(NetParameter* net_param) {`
`1018`	`1018`	`// the previous BatchNorm layer definition.`
`1019`	`1019`	`if (net_param->layer(i).type() == "BatchNorm"`
`1020`	`1020`	`&& net_param->layer(i).param_size() == 3) {`
`1021`		`- net_param->mutable_layer(i)->clear_param();`
	`1021`	`+ // set lr_mult and decay_mult to zero. leave all other param intact.`
	`1022`	`+ for (int ip = 0; ip < net_param->layer(i).param_size(); ip++) {`
	`1023`	`+ ParamSpec* fixed_param_spec =`
	`1024`	`+ net_param->mutable_layer(i)->mutable_param(ip);`
	`1025`	`+ fixed_param_spec->set_lr_mult(0.f);`
	`1026`	`+ fixed_param_spec->set_decay_mult(0.f);`
	`1027`	`+ }`
`1022`	`1028`	`}`
`1023`	`1029`	`}`
`1024`	`1030`	`}`