Commit 825c0ffd authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

Merge pull request #9874 from dkurt:fix_identity_permute_layer

parents 69f25903 a3a446c1
...@@ -117,7 +117,10 @@ public: ...@@ -117,7 +117,10 @@ public:
std::vector<MatShape> &internals) const std::vector<MatShape> &internals) const
{ {
if(!_needsPermute) if(!_needsPermute)
{
Layer::getMemoryShapes(inputs, requiredOutputs, outputs, internals);
return true; return true;
}
CV_Assert(inputs.size() > 0); CV_Assert(inputs.size() > 0);
CV_Assert((int)_numAxes == inputs[0].size()); CV_Assert((int)_numAxes == inputs[0].size());
...@@ -253,7 +256,11 @@ public: ...@@ -253,7 +256,11 @@ public:
if(!_needsPermute) if(!_needsPermute)
{ {
for (k = 0; k < ninputs; k++) for (k = 0; k < ninputs; k++)
outputs[k] = *inputs[k]; {
CV_Assert(outputs[k].total() == inputs[k]->total());
if (outputs[k].data != inputs[k]->data)
inputs[k]->copyTo(outputs[k]);
}
} }
else else
{ {
......
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