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

Fix comment

Browse Source
This commit is contained in:
Liubov Batanina 2020-01-21 10:28:50 +03:00
parent d825caf18e
commit fada959b4b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,12 +155,7 @@ void getPoolingKernelParams(const LayerParams &params, std::vector<size_t>& kern
globalPooling[2] = params.get<bool>("global_pooling_w", is_global); globalPooling[2] = params.get<bool>("global_pooling_w", is_global);
is_global = globalPooling[0] || globalPooling[1] || globalPooling[2]; is_global = globalPooling[0] || globalPooling[1] || globalPooling[2];
if (!is_global) if (is_global)
{
util::getKernelSize(params, kernel);
util::getStrideAndPadding(params, pads_begin, pads_end, strides, padMode, kernel.size());
}
else
{ {
util::getStrideAndPadding(params, pads_begin, pads_end, strides, padMode); util::getStrideAndPadding(params, pads_begin, pads_end, strides, padMode);
if ((globalPooling[0] && params.has("kernel_d")) || if ((globalPooling[0] && params.has("kernel_d")) ||
@ -184,6 +179,11 @@ void getPoolingKernelParams(const LayerParams &params, std::vector<size_t>& kern
CV_Error(cv::Error::StsBadArg, "In global_pooling mode, strides must be = 1"); CV_Error(cv::Error::StsBadArg, "In global_pooling mode, strides must be = 1");
} }
} }
else
{
util::getKernelSize(params, kernel);
util::getStrideAndPadding(params, pads_begin, pads_end, strides, padMode, kernel.size());
}
} }
void getConvolutionKernelParams(const LayerParams &params, std::vector<size_t>& kernel, std::vector<size_t>& pads_begin, void getConvolutionKernelParams(const LayerParams &params, std::vector<size_t>& kernel, std::vector<size_t>& pads_begin,