potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Liubov Batanina
2020-01-22 10:52:40 +03:00
parent fada959b4b
commit 832ca0734d
3 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/include/opencv2/dnn/all_layers.hpp
+1 -1
View File
@@ -250,7 +250,7 @@ CV__DNN_EXPERIMENTAL_NS_BEGIN
std::vector<size_t> pads_begin, pads_end;
CV_DEPRECATED_EXTERNAL Size kernel, stride, pad;
CV_DEPRECATED_EXTERNAL int pad_l, pad_t, pad_r, pad_b;
CV_DEPRECATED_EXTERNAL bool globalPooling;
CV_DEPRECATED_EXTERNAL bool globalPooling; //!< Flag is true if at least one of the axes is global pooled.
std::vector<bool> isGlobalPooling;
bool computeMaxIdx;
String padMode;
modules/dnn/src/layers/pooling_layer.cpp
+10 -12
View File
@@ -97,7 +97,7 @@ public:
CV_Error(Error::StsBadArg, "Unknown pooling type \"" + pool + "\"");
getPoolingKernelParams(params, kernel_size, isGlobalPooling, pads_begin, pads_end, strides, padMode);
globalPooling = std::accumulate(isGlobalPooling.begin(), isGlobalPooling.end(), 0) == 3;
globalPooling = isGlobalPooling[0] || isGlobalPooling[1] || isGlobalPooling[2];
if (kernel_size.size() == 2) {
kernel = Size(kernel_size[1], kernel_size[0]);
stride = Size(strides[1], strides[0]);
@@ -149,18 +149,16 @@ public:
out.push_back(outputs[0].size[i]);
}
if (kernel_size.size() > inp.size()) {
kernel_size.erase(kernel_size.begin());
}
kernel_size.resize(out.size());
if (globalPooling) {
std::vector<size_t> finalKernel;
for (int i = 0; i < inp.size(); i++) {
int idx = isGlobalPooling.size() - inp.size() + i;
finalKernel.push_back(isGlobalPooling[idx] ? inp[i] : kernel_size[idx]);
}
kernel_size = finalKernel;
kernel = Size(kernel_size[1], kernel_size[0]);
}
for (int i = 0; i < inp.size(); i++)
{
int idx = isGlobalPooling.size() - inp.size() + i;
if (isGlobalPooling[idx])
kernel_size[i] = inp[i];
}
kernel = Size(kernel_size.back(), kernel_size[kernel_size.size() - 2]);
getConvPoolPaddings(inp, kernel_size, strides, padMode, pads_begin, pads_end);
if (pads_begin.size() == 2) {