Fix bug in RemoveBNScale

jinge90 · jinge90 · commit 97cd241872c8 · 2017-07-04T14:45:56.000-04:00
Signed-off-by: Jin, Ge &lt;ge.jin@intel.com&gt;
diff --git a/src/caffe/net.cpp b/src/caffe/net.cpp
@@ -1280,8 +1280,8 @@ void Net<Dtype>::ShareTrainedLayersWith(const Net* other) {
     }
     //temp_net_param.mutable_compile_net_state()->set_bn_top_rename(other->bn_top_rename_);
     complete_net_param.CopyFrom(temp_net_param);
-    complete_net_param.clear_layer();
     if (other->bn_scale_merge_) {
+      complete_net_param.clear_layer();
       RecoverBNScaleMergedNet<Dtype>(&temp_net_param, &complete_net_param);
     }
     CopyTrainedLayersFrom(complete_net_param);

Original file line number	Diff line number	Diff line change
`@@ -1280,8 +1280,8 @@ void Net<Dtype>::ShareTrainedLayersWith(const Net* other) {`
`1280`	`1280`	`}`
`1281`	`1281`	`//temp_net_param.mutable_compile_net_state()->set_bn_top_rename(other->bn_top_rename_);`
`1282`	`1282`	`complete_net_param.CopyFrom(temp_net_param);`
`1283`		`- complete_net_param.clear_layer();`
`1284`	`1283`	`if (other->bn_scale_merge_) {`
	`1284`	`+ complete_net_param.clear_layer();`
`1285`	`1285`	`RecoverBNScaleMergedNet<Dtype>(&temp_net_param, &complete_net_param);`
`1286`	`1286`	`}`
`1287`	`1287`	`CopyTrainedLayersFrom(complete_net_param);`