Commit cf477f7e authored by Liubov Batanina's avatar Liubov Batanina

Fix global axis

parent 543e0302
...@@ -95,8 +95,6 @@ public: ...@@ -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: ...@@ -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);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment