mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-27 04:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15611 from dkurt:fix_dnn_inp_size_autodetect

Browse Source
This commit is contained in:
Alexander Alekhin 2019-09-30 18:38:14 +00:00
commit 6aa689f87c
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/dnn/src/dnn.cpp
View File

@ -2506,17 +2506,25 @@ struct Net::Impl
{
std::vector<LayerPin>& inputLayerIds = layers[id].inputBlobsId;
if (inOutShapes[0].in[0].empty() && !layers[0].outputBlobs.empty())
if (id == 0 && inOutShapes[id].in[0].empty())
{
ShapesVec shapes;
for (int i = 0; i < layers[0].outputBlobs.size(); i++)
if (!layers[0].outputBlobs.empty())
{
Mat& inp = layers[0].outputBlobs[i];
CV_Assert(inp.total());
shapes.push_back(shape(inp));
ShapesVec shapes;
for (int i = 0; i < layers[0].outputBlobs.size(); i++)
{
Mat& inp = layers[0].outputBlobs[i];
CV_Assert(inp.total());
shapes.push_back(shape(inp));
}
inOutShapes[0].in = shapes;
}
inOutShapes[0].in = shapes;
}
else
{
inOutShapes[0].out.clear();
return;
}
}
if (inOutShapes[id].in.empty())
{

3
modules/dnn/test/test_model.cpp
View File

@ -105,8 +105,7 @@ TEST_P(Test_Model, Classify)
}
// disabled: https://github.com/opencv/opencv/pull/15593
TEST_P(Test_Model, DISABLED_DetectRegion)
TEST_P(Test_Model, DetectRegion)
{
applyTestTag(CV_TEST_TAG_LONG, CV_TEST_TAG_MEMORY_1GB);