Commit fba9fdfd authored by Dmitry Kurtaev's avatar Dmitry Kurtaev

Fix autodetection of input size for dnn networks

parent 507ca291
...@@ -2506,7 +2506,9 @@ struct Net::Impl ...@@ -2506,7 +2506,9 @@ struct Net::Impl
{ {
std::vector<LayerPin>& inputLayerIds = layers[id].inputBlobsId; 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())
{
if (!layers[0].outputBlobs.empty())
{ {
ShapesVec shapes; ShapesVec shapes;
for (int i = 0; i < layers[0].outputBlobs.size(); i++) for (int i = 0; i < layers[0].outputBlobs.size(); i++)
...@@ -2517,6 +2519,12 @@ struct Net::Impl ...@@ -2517,6 +2519,12 @@ struct Net::Impl
} }
inOutShapes[0].in = shapes; inOutShapes[0].in = shapes;
} }
else
{
inOutShapes[0].out.clear();
return;
}
}
if (inOutShapes[id].in.empty()) if (inOutShapes[id].in.empty())
{ {
......
...@@ -105,8 +105,7 @@ TEST_P(Test_Model, Classify) ...@@ -105,8 +105,7 @@ TEST_P(Test_Model, Classify)
} }
// disabled: https://github.com/opencv/opencv/pull/15593 TEST_P(Test_Model, DetectRegion)
TEST_P(Test_Model, DISABLED_DetectRegion)
{ {
applyTestTag(CV_TEST_TAG_LONG, CV_TEST_TAG_MEMORY_1GB); applyTestTag(CV_TEST_TAG_LONG, CV_TEST_TAG_MEMORY_1GB);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment