mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-25 22:57:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add global_pooling_dim flags

Browse Source
This commit is contained in:
Liubov Batanina 2020-01-10 09:01:57 +03:00
parent 7eba3a7c96
commit a33d50084d
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/dnn/src/layers/layers_common.cpp
View File

@ -150,18 +150,12 @@ void getPoolingKernelParams(const LayerParams &params, std::vector<size_t>& kern
{ {
bool is_global = params.get<bool>("global_pooling", false); bool is_global = params.get<bool>("global_pooling", false);
globalPooling = std::vector<bool>(3, is_global); globalPooling = std::vector<bool>(3, is_global);
if (params.has("global_d")) if (params.has("global_pooling_d"))
{ globalPooling[0] = params.get<bool>("global_pooling_d");
globalPooling[0] = params.get<bool>("global_d"); else if (params.has("global_pooling_h"))
} globalPooling[1] = params.get<bool>("global_pooling_h");
else if (params.has("global_h")) else if (params.has("global_pooling_w"))
{ globalPooling[2] = params.get<bool>("global_pooling_w");
globalPooling[1] = params.get<bool>("global_h");
}
else if (params.has("global_w"))
{
globalPooling[2] = params.get<bool>("global_w");
}
if (is_global) if (is_global)
{ {

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

@ -1961,7 +1961,7 @@ void TFImporter::populateNet(Net dstNet)
CV_Assert(layer_id.find(avgName) == layer_id.end()); CV_Assert(layer_id.find(avgName) == layer_id.end());
avgLp.set("pool", "ave"); avgLp.set("pool", "ave");
// pooling kernel H x 1 // pooling kernel H x 1
avgLp.set("global_h", true); avgLp.set("global_pooling_h", true);
avgLp.set("kernel_size", 1); avgLp.set("kernel_size", 1);
int avgId = dstNet.addLayer(avgName, "Pooling", avgLp); int avgId = dstNet.addLayer(avgName, "Pooling", avgLp);
layer_id[avgName] = avgId; layer_id[avgName] = avgId;