Browse Source

fix(dnn): forbid pooling window size smaller than padding

GitOrigin-RevId: 9ad61c409d
release-1.2
Megvii Engine Team 4 years ago
parent
commit
eb826422c4
2 changed files with 15 additions and 0 deletions
  1. +4
    -0
      dnn/src/common/pooling.cpp
  2. +11
    -0
      src/opr/test/dnn/pooling.cpp

+ 4
- 0
dnn/src/common/pooling.cpp View File

@@ -92,6 +92,10 @@ void PoolingBase::deduce_layout_fwd(const TensorLayout& src,
size_t sw = this->param().stride_w;
size_t ph = this->param().pad_h;
size_t pw = this->param().pad_w;
megdnn_assert(ph < fh && pw < fw,
"pooling padding size (%zu %zu) should not be bigger than "
"window size (%zu %zu)",
pw, ph, fw, fh);
infer_conv_shape2d(ih, iw, fh, fw, sh, sw, ph, pw, oh, ow);
if (param().format == Param::Format::NCHW) {
dst = TensorLayout(TensorShape({n, c, oh, ow}), src.dtype);


+ 11
- 0
src/opr/test/dnn/pooling.cpp View File

@@ -104,6 +104,17 @@ TEST(TestOprDNN, PoolingBackward)
}
}

TEST(TestOprDNN, PoolingForwardPadding) {
auto graph = ComputingGraph::make();
Param param(Param::Mode::MAX, 2, 2, 2, 2, 2, 2);
SymbolVarArray symbol_inputs;
HostTensorGenerator<> gen;
auto host_tensor = gen({2, 3, 23, 24});
symbol_inputs.push_back(
mgb::opr::Host2DeviceCopy::make(*graph, host_tensor));
ASSERT_THROW(opr::Pooling::make(symbol_inputs[0], param), MegDNNError);
}

} // anonymous namespace

// vim: syntax=cpp.doxygen foldmethod=marker foldmarker=f{{{,f}}}

Loading…
Cancel
Save