mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-10 19:24:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix comments

Browse Source
This commit is contained in:
Liubov Batanina 2020-01-22 14:57:54 +03:00
parent 35c24480ae
commit 7e5b5390ba
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/dnn/include/opencv2/dnn/all_layers.hpp
View File

@ -250,7 +250,7 @@ CV__DNN_EXPERIMENTAL_NS_BEGIN
std::vector<size_t> pads_begin, pads_end; std::vector<size_t> pads_begin, pads_end;
CV_DEPRECATED_EXTERNAL Size kernel, stride, pad; CV_DEPRECATED_EXTERNAL Size kernel, stride, pad;
CV_DEPRECATED_EXTERNAL int pad_l, pad_t, pad_r, pad_b; CV_DEPRECATED_EXTERNAL int pad_l, pad_t, pad_r, pad_b;
CV_DEPRECATED_EXTERNAL bool globalPooling; //!< Flag is true if at least one of the axes is global pooled. bool globalPooling; //!< Flag is true if at least one of the axes is global pooled.
std::vector<bool> isGlobalPooling; std::vector<bool> isGlobalPooling;
bool computeMaxIdx; bool computeMaxIdx;
String padMode; String padMode;

6
modules/dnn/src/tensorflow/tf_importer.cpp
View File

@ -2054,12 +2054,11 @@ void TFImporter::populateNet(Net dstNet)
int num = (int)getLayerAttr(layer, "N").i(); int num = (int)getLayerAttr(layer, "N").i();
CV_Assert(layer.input_size() == num); CV_Assert(layer.input_size() == num);
std::string base_name = name + "/reshape_"; std::string base_name = name + "/reshape_";
std::vector<std::string> reshape_names; std::vector<int> reshape_ids;
for (int i = 0; i < num; i++) { for (int i = 0; i < num; i++) {
std::ostringstream ss; std::ostringstream ss;
ss << i; ss << i;
std::string reshape_name = base_name + ss.str(); std::string reshape_name = base_name + ss.str();
reshape_names.push_back(reshape_name);
LayerParams reshapeLP; LayerParams reshapeLP;
reshapeLP.set("axis", dim); reshapeLP.set("axis", dim);
reshapeLP.set("num_axes", 1); reshapeLP.set("num_axes", 1);
@ -2067,6 +2066,7 @@ void TFImporter::populateNet(Net dstNet)
reshapeLP.set("dim", DictValue::arrayInt(&outShape[0], 2)); reshapeLP.set("dim", DictValue::arrayInt(&outShape[0], 2));
int id = dstNet.addLayer(reshape_name, "Reshape", reshapeLP); int id = dstNet.addLayer(reshape_name, "Reshape", reshapeLP);
layer_id[reshape_name] = id; layer_id[reshape_name] = id;
reshape_ids.push_back(id);
connect(layer_id, dstNet, parsePin(layer.input(i)), id, 0); connect(layer_id, dstNet, parsePin(layer.input(i)), id, 0);
} }
@ -2075,7 +2075,7 @@ void TFImporter::populateNet(Net dstNet)
layer_id[name] = id; layer_id[name] = id;
for (int li = 0; li < num; li++) for (int li = 0; li < num; li++)
connect(layer_id, dstNet, Pin(reshape_names[li]), id, li); dstNet.connect(reshape_ids[li], 0, id, li);
} }
else if (type == "ClipByValue") else if (type == "ClipByValue")
{ {