Skip to content
Snippets Groups Projects
Commit 911170b5 authored by Olivier BICHLER's avatar Olivier BICHLER
Browse files

Fixed concat block size for NCHW

parent 664ca093
No related branches found
No related tags found
2 merge requests!318[Upd] release verision 0.5.0,!290[Add] support for auto-concatenation and Fix multiple adaptToBackend() issues
Pipeline #62638 canceled
......@@ -707,6 +707,7 @@ Aidge::MemoryManager Aidge::Scheduler::generateMemoryAutoConcat(bool incProducer
}
}
size_t concatSize = size;
size_t concatOffset = 0;
if (concat) {
......@@ -730,6 +731,9 @@ Aidge::MemoryManager Aidge::Scheduler::generateMemoryAutoConcat(bool incProducer
if (parentOutputFormat == DataFormat::NHWC) {
parentSize = parentOutputDims.end()[-3];
}
else {
concatSize = parentSize;
}
concatOffset += parentSize;
}
......@@ -747,16 +751,27 @@ Aidge::MemoryManager Aidge::Scheduler::generateMemoryAutoConcat(bool incProducer
if (wrapAroundBuffer && wrapAroundSize > 0) {
memManager.reallocate(memPlane,
node, concatOffset,
size, true, wrapAroundExtra, childs, stride, length, count);
concatSize, true, wrapAroundExtra, childs, stride, length, count);
}
else {
memManager.reallocate(memPlane.memSpace,
node, memPlane.offset + concatOffset,
size, false, 0, childs, stride, length, count);
concatSize, false, 0, childs, stride, length, count);
}
if (concat && itConcat == concatMemPlane.end()) {
concatMemPlane.emplace(concat, memPlane);
if (wrapAroundBuffer && wrapAroundSize > 0) {
memManager.reallocate(memPlane,
concat, 0,
size, true, wrapAroundExtra, childs, stride, length, count);
}
else {
memManager.reallocate(memPlane.memSpace,
concat, memPlane.offset,
size, false, 0, childs, stride, length, count);
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment