Skip to content

Commit e2949c7

Browse files
committed
Align 3.4 branch with master
1 parent 0f968e3 commit e2949c7

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

modules/dnn/src/layers/convolution_layer.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,9 @@ class BaseConvolutionLayerImpl : public ConvolutionLayer
117117
{
118118
kernel_size.assign(1, kernel_size[0]);
119119
strides.assign(1, strides[0]);
120+
dilations.assign(1, dilations[0]);
121+
pads_begin.assign(1, pads_begin[0]);
122+
pads_end.assign(1, pads_end[0]);
120123
}
121124
CV_Assert(weightShape.dims() == kernel_size.size() + 2);
122125
for (int i = 0; i < kernel_size.size(); i++) {

modules/dnn/src/layers/pooling_layer.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,14 +167,13 @@ class PoolingLayerImpl CV_FINAL : public PoolingLayer
167167

168168
if (inputs[0].dims == 3)
169169
{
170-
//Pool1D
171-
kernel_size.erase(kernel_size.begin() + 1);
172-
strides.erase(strides.begin() + 1);
173-
pads_begin.erase(pads_begin.begin() + 1);
174-
pads_end.erase(pads_end.begin() + 1);
170+
// Pool1D
171+
kernel_size.assign(1, kernel_size[0]);
172+
strides.assign(1, strides[0]);
173+
pads_begin.assign(1, pads_begin[0]);
174+
pads_end.assign(1, pads_end[0]);
175175
}
176176

177-
178177
#ifdef HAVE_OPENCL
179178
poolOp.release();
180179
#endif

0 commit comments

Comments
 (0)