提交 011ed380 编写于 作者: A Alexander Alekhin

Merge pull request #21323 from alalek:dnn_do_not_rebuilt_network_in_setInput

...@@ -1339,6 +1339,11 @@ struct Net::Impl : public detail::NetImplBase ...@@ -1339,6 +1339,11 @@ struct Net::Impl : public detail::NetImplBase
#endif #endif
clear(); clear();
if (hasDynamicShapes)
{
updateLayersShapes();
}
this->blobsToKeep = blobsToKeep_; this->blobsToKeep = blobsToKeep_;
allocateLayers(blobsToKeep_); allocateLayers(blobsToKeep_);
...@@ -3886,13 +3891,8 @@ void Net::setInput(InputArray blob, const String& name, double scalefactor, cons ...@@ -3886,13 +3891,8 @@ void Net::setInput(InputArray blob, const String& name, double scalefactor, cons
bool oldShape = prevShape == blobShape; bool oldShape = prevShape == blobShape;
blob_.copyTo(impl->netInputLayer->inputsData[pin.oid]); blob_.copyTo(impl->netInputLayer->inputsData[pin.oid]);
if (!oldShape) { if (!oldShape)
ld.outputBlobs[pin.oid] = impl->netInputLayer->inputsData[pin.oid]; ld.outputBlobs[pin.oid] = impl->netInputLayer->inputsData[pin.oid];
if (impl->hasDynamicShapes)
{
impl->updateLayersShapes();
}
}
if (!ld.outputBlobsWrappers[pin.oid].empty()) if (!ld.outputBlobsWrappers[pin.oid].empty())
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册