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

Merge pull request #10337 from dkurt:fix_pooling_layer

Browse Source
This commit is contained in:
Vadim Pisarevsky 2017-12-18 09:11:54 +00:00
commit 86cc4f3aa4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/dnn/src/layers/pooling_layer.cpp
View File

@ -67,13 +67,14 @@ class PoolingLayerImpl : public PoolingLayer
public:
PoolingLayerImpl(const LayerParams& params)
{
type = MAX;
computeMaxIdx = true;
globalPooling = false;
stride = Size(1, 1);
if (params.has("pool"))
if (params.has("pool") || params.has("kernel_size") ||
params.has("kernel_w") || params.has("kernel_h"))
{
String pool = params.get<String>("pool").toLowerCase();
String pool = params.get<String>("pool", "max").toLowerCase();
if (pool == "max")
type = MAX;
else if (pool == "ave")
@ -90,6 +91,8 @@ public:
type = ROI;
computeMaxIdx = false;
}
else
CV_Error(Error::StsBadArg, "Cannot determine pooling type");
setParamsFrom(params);
ceilMode = params.get<bool>("ceil_mode", true);
pooledSize.width = params.get<uint32_t>("pooled_w", 1);