From effa9411ca270f32730400861c08dd2aa3f03ffa Mon Sep 17 00:00:00 2001 From: Evan Shelhamer Date: Mon, 29 Feb 2016 21:15:56 -0800 Subject: [PATCH] check all net upgrade conditions check all conditions all the time; V0 -> V1 and V1 -> V2 do not suffice. --- src/caffe/util/upgrade_proto.cpp | 3 ++- tools/upgrade_net_proto_text.cpp | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/caffe/util/upgrade_proto.cpp b/src/caffe/util/upgrade_proto.cpp index 449975b..775285f 100644 --- 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) { diff --git a/tools/upgrade_net_proto_text.cpp b/tools/upgrade_net_proto_text.cpp index d8e84d6..617b48d 100644 --- a/tools/upgrade_net_proto_text.cpp +++ b/tools/upgrade_net_proto_text.cpp @@ -32,7 +32,6 @@ int main(int argc, char** argv) { return 2; } bool need_upgrade = NetNeedsUpgrade(net_param); - bool need_data_upgrade = NetNeedsDataUpgrade(net_param); bool success = true; if (need_upgrade) { success = UpgradeNetAsNeeded(input_filename, &net_param); @@ -44,10 +43,6 @@ int main(int argc, char** argv) { LOG(ERROR) << "File already in latest proto format: " << input_filename; } - if (need_data_upgrade) { - UpgradeNetDataTransformation(&net_param); - } - // Save new format prototxt. WriteProtoToTextFile(net_param, argv[2]); -- 2.7.4