check all net upgrade conditions

check all conditions all the time; V0 -> V1 and V1 -> V2 do not suffice.
zouxiaochuan · Oct 24, 2016 · 93446c2 · 93446c2
1 parent b6e86ae
commit 93446c2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/caffe/util/upgrade_proto.cpp b/src/caffe/util/upgrade_proto.cpp
@@ -13,7 +13,8 @@
 namespace caffe {
 
 bool NetNeedsUpgrade(const NetParameter& net_param) {
-  return NetNeedsV0ToV1Upgrade(net_param) || NetNeedsV1ToV2Upgrade(net_param);
+  return NetNeedsV0ToV1Upgrade(net_param) || NetNeedsV1ToV2Upgrade(net_param)
+      || NetNeedsDataUpgrade(net_param) || NetNeedsInputUpgrade(net_param);
 }
 
 bool UpgradeNetAsNeeded(const string& param_file, NetParameter* param) {