diff options
| author | Giorgio Arena <giorgio.arena@arm.com> | 2021-08-16 12:29:27 +0100 |
|---|---|---|
| committer | Giorgio Arena <giorgio.arena@arm.com> | 2021-08-19 10:46:51 +0000 |
| commit | 73df9310f4e94e43597f283307e3cde0653d8bae (patch) | |
| tree | b0a286dc00496cde6b98c1f96119ae5c830b1815 /src | |
| parent | df5bcb67e895610c0a7360753817fea13faabd4e (diff) | |
| download | ComputeLibrary-73df9310f4e94e43597f283307e3cde0653d8bae.tar.gz | |
Address comments on avoiding releasing weights if used by multiple functions
Signed-off-by: Giorgio Arena <giorgio.arena@arm.com>
Change-Id: I0b59c5326f5fcbc322fbeb864197ea999de6bd56
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/6112
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Reviewed-by: SiCong Li <sicong.li@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/runtime/CL/functions/CLFullyConnectedLayer.cpp | 8 | ||||
| -rw-r--r-- | src/runtime/IWeightsManager.cpp | 2 | ||||
| -rw-r--r-- | src/runtime/NEON/functions/NEFullyConnectedLayer.cpp | 8 |
3 files changed, 11 insertions, 7 deletions
diff --git a/src/runtime/CL/functions/CLFullyConnectedLayer.cpp b/src/runtime/CL/functions/CLFullyConnectedLayer.cpp index 6836c12022..4f9759c590 100644 --- a/src/runtime/CL/functions/CLFullyConnectedLayer.cpp +++ b/src/runtime/CL/functions/CLFullyConnectedLayer.cpp @@ -82,7 +82,7 @@ void CLFullyConnectedLayer::configure(const CLCompileContext &compile_context, c if(_impl->weights_manager != nullptr) { - _impl->weights_manager->manage(weights); + _impl->weights_manager->manage(_impl->original_weights); } if(!_impl->is_prepared) @@ -125,11 +125,13 @@ void CLFullyConnectedLayer::prepare() // Handle weights managed infrastructure if(_impl->weights_manager != nullptr && _impl->weights_manager->are_weights_managed(_impl->original_weights)) { - // If function marks b as unused ensure that all prepare stages are done before releasing + // Ensure that b gets marked as unused (memory released) only after the last function which uses b also finishes its prepare + // This is for cases where multiple functions share the same b (weights) + // Therefore when a function marks original b as unused, we pre-mark it in weights manager, and mark it back to used so that it doesn't get released before its last reference const ITensor *original_b = _impl->original_weights; if(!original_b->is_used()) { - _impl->weights_manager->mark_as_unused(original_b); + _impl->weights_manager->pre_mark_as_unused(original_b); } _impl->original_weights->mark_as_used(); _impl->weights_manager->release(_impl->original_weights); diff --git a/src/runtime/IWeightsManager.cpp b/src/runtime/IWeightsManager.cpp index 8f27795285..373c50c73d 100644 --- a/src/runtime/IWeightsManager.cpp +++ b/src/runtime/IWeightsManager.cpp @@ -166,7 +166,7 @@ void IWeightsManager::release(const ITensor *weights) } } -void IWeightsManager::mark_as_unused(const ITensor *weights) +void IWeightsManager::pre_mark_as_unused(const ITensor *weights) { if(weights == nullptr || !are_weights_managed(weights)) { diff --git a/src/runtime/NEON/functions/NEFullyConnectedLayer.cpp b/src/runtime/NEON/functions/NEFullyConnectedLayer.cpp index 84bc004ec4..cb7e2dc7ec 100644 --- a/src/runtime/NEON/functions/NEFullyConnectedLayer.cpp +++ b/src/runtime/NEON/functions/NEFullyConnectedLayer.cpp @@ -78,7 +78,7 @@ void NEFullyConnectedLayer::configure(const ITensor *input, const ITensor *weigh if(_impl->weights_manager != nullptr) { - _impl->weights_manager->manage(weights); + _impl->weights_manager->manage(_impl->original_weights); } _impl->aux_mem_req = _impl->op->workspace(); @@ -113,11 +113,13 @@ void NEFullyConnectedLayer::prepare() // Handle weights managed infrastructure if(_impl->weights_manager != nullptr && _impl->weights_manager->are_weights_managed(_impl->original_weights)) { - // If function marks b as unused ensure that all prepare stages are done before releasing + // Ensure that b gets marked as unused (memory released) only after the last function which uses b also finishes its prepare + // This is for cases where multiple functions share the same b (weights) + // Therefore when a function marks original b as unused, we pre-mark it in weights manager, and mark it back to used so that it doesn't get released before its last reference const ITensor *original_b = _impl->original_weights; if(!original_b->is_used()) { - _impl->weights_manager->mark_as_unused(original_b); + _impl->weights_manager->pre_mark_as_unused(original_b); } _impl->original_weights->mark_as_used(); _impl->weights_manager->release(_impl->original_weights); |