mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 05:29:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix global axis

Browse Source
This commit is contained in:
Liubov Batanina 2019-12-24 16:42:00 +03:00
parent 543e0302d3
commit cf477f7e9f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,8 +95,6 @@ public:
else else
CV_Error(Error::StsBadArg, "Unknown pooling type \"" + pool + "\""); CV_Error(Error::StsBadArg, "Unknown pooling type \"" + pool + "\"");
global_axis = params.has("global_axis") ? params.get<int>("global_axis") : -1;
getPoolingKernelParams(params, kernel_size, globalPooling, pads_begin, pads_end, strides, padMode); getPoolingKernelParams(params, kernel_size, globalPooling, pads_begin, pads_end, strides, padMode);
if (kernel_size.size() == 2) { if (kernel_size.size() == 2) {
kernel = Size(kernel_size[1], kernel_size[0]); kernel = Size(kernel_size[1], kernel_size[0]);
@ -126,6 +124,7 @@ public:
CV_Error(Error::StsBadArg, "Cannot determine pooling type"); CV_Error(Error::StsBadArg, "Cannot determine pooling type");
setParamsFrom(params); setParamsFrom(params);
ceilMode = params.get<bool>("ceil_mode", true); ceilMode = params.get<bool>("ceil_mode", true);
global_axis = params.get<int>("global_axis", -1);
spatialScale = params.get<float>("spatial_scale", 1); spatialScale = params.get<float>("spatial_scale", 1);
avePoolPaddedArea = params.get<bool>("ave_pool_padded_area", true); avePoolPaddedArea = params.get<bool>("ave_pool_padded_area", true);
} }