From d3126f2f061c7a36461e58df8eed550877a1ecc4 Mon Sep 17 00:00:00 2001 From: Evan Shelhamer Date: Sun, 21 Sep 2014 09:52:51 -0700 Subject: [PATCH] include WindowDataLayer in data param upgrade --- src/caffe/util/upgrade_proto.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/caffe/util/upgrade_proto.cpp b/src/caffe/util/upgrade_proto.cpp index c3d854c..c69c58e 100644 --- a/src/caffe/util/upgrade_proto.cpp +++ b/src/caffe/util/upgrade_proto.cpp @@ -522,6 +522,13 @@ bool NetNeedsDataUpgrade(const NetParameter& net_param) { if (layer_param.has_crop_size()) { return true; } if (layer_param.has_mirror()) { return true; } } + if (net_param.layers(i).type() == LayerParameter_LayerType_WINDOW_DATA) { + WindowDataParameter layer_param = net_param.layers(i).window_data_param(); + if (layer_param.has_scale()) { return true; } + if (layer_param.has_mean_file()) { return true; } + if (layer_param.has_crop_size()) { return true; } + if (layer_param.has_mirror()) { return true; } + } } return false; } @@ -556,6 +563,7 @@ void UpgradeNetDataTransformation(NetParameter* net_param) { for (int i = 0; i < net_param->layers_size(); ++i) { CONVERT_LAYER_TRANSFORM_PARAM(DATA, Data, data); CONVERT_LAYER_TRANSFORM_PARAM(IMAGE_DATA, ImageData, image_data); + CONVERT_LAYER_TRANSFORM_PARAM(WINDOW_DATA, WindowData, window_data); } } -- 2.7.4