diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2021-08-13 12:07:59 +0100 |
---|---|---|
committer | Giorgio Arena <giorgio.arena@arm.com> | 2021-08-13 16:15:07 +0000 |
commit | 45fbf9fd00cc8fa564229bd6e2c20f84bc7cafd1 (patch) | |
tree | 91dec2dc311cb0508abf788a5a8d6be99fb466f2 /src | |
parent | 37a4611dcbefc9ad19af803216d9e2cd5ec64697 (diff) | |
download | ComputeLibrary-45fbf9fd00cc8fa564229bd6e2c20f84bc7cafd1.tar.gz |
Avoid releasing weights if they are used by multiple functions
Resolves: COMPMID-4769
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: Iccadcbd68b0fd84ed3bf212e358a4ea944084a40
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/c/VisualCompute/ComputeLibrary/+/349845
Tested-by: bsgcomp <bsgcomp@arm.com>
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Comments-Addressed: bsgcomp <bsgcomp@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/6107
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Reviewed-by: SiCong Li <sicong.li@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/ITensor.cpp | 7 | ||||
-rw-r--r-- | src/runtime/CL/functions/CLFullyConnectedLayer.cpp | 18 | ||||
-rw-r--r-- | src/runtime/IWeightsManager.cpp | 33 | ||||
-rw-r--r-- | src/runtime/NEON/functions/NEFullyConnectedLayer.cpp | 18 |
4 files changed, 73 insertions, 3 deletions
diff --git a/src/core/ITensor.cpp b/src/core/ITensor.cpp index e263596333..9ed9b3f2e9 100644 --- a/src/core/ITensor.cpp +++ b/src/core/ITensor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Arm Limited. + * Copyright (c) 2016-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -169,4 +169,9 @@ void ITensor::mark_as_unused() const { _is_used = false; } + +void ITensor::mark_as_used() const +{ + _is_used = true; +} } // namespace arm_compute
\ No newline at end of file diff --git a/src/runtime/CL/functions/CLFullyConnectedLayer.cpp b/src/runtime/CL/functions/CLFullyConnectedLayer.cpp index ae10cd23b1..c719a667a7 100644 --- a/src/runtime/CL/functions/CLFullyConnectedLayer.cpp +++ b/src/runtime/CL/functions/CLFullyConnectedLayer.cpp @@ -80,6 +80,11 @@ void CLFullyConnectedLayer::configure(const CLCompileContext &compile_context, c _impl->op->configure(compile_context, input->info(), weights->info(), (biases != nullptr) ? biases->info() : nullptr, output->info(), fc_info); + if(_impl->weights_manager != nullptr) + { + _impl->weights_manager->manage(weights); + } + _impl->aux_mem_req = _impl->op->workspace(); _impl->run_pack = { { ACL_SRC_0, input }, { ACL_SRC_1, weights }, { ACL_SRC_2, biases }, { ACL_DST, output } }; _impl->workspace = manage_workspace<CLTensor>(_impl->aux_mem_req, _impl->memory_group, _impl->run_pack, _impl->run_pack); @@ -108,6 +113,19 @@ void CLFullyConnectedLayer::prepare() // Release temporary tensors that are only used in prepare stage release_temporaries<CLTensor>(_impl->aux_mem_req, _impl->workspace); _impl->is_prepared = true; + + // 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 + const ITensor *original_b = _impl->original_weights; + if(!original_b->is_used()) + { + _impl->weights_manager->mark_as_unused(original_b); + } + _impl->original_weights->mark_as_used(); + _impl->weights_manager->release(_impl->original_weights); + } } } } // namespace arm_compute diff --git a/src/runtime/IWeightsManager.cpp b/src/runtime/IWeightsManager.cpp index 081cd990f3..8f27795285 100644 --- a/src/runtime/IWeightsManager.cpp +++ b/src/runtime/IWeightsManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Arm Limited. + * Copyright (c) 2019, 2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -26,7 +26,7 @@ namespace arm_compute { IWeightsManager::IWeightsManager() - : _managed_weights(), _managed_weights_parents() + : _managed_weights(), _managed_counter(), _managed_weights_parents() { } @@ -35,6 +35,11 @@ void IWeightsManager::manage(const ITensor *weights, ITransformWeights *parent) if(!are_weights_managed(weights)) { _managed_weights[weights]; + _managed_counter[weights]; + } + else + { + _managed_counter[weights].counter++; } // In case the weights are an output of a previous reshape function @@ -146,4 +151,28 @@ ITensor *IWeightsManager::acquire(const ITensor *weights, ITransformWeights *wei return transformed_weights; } + +void IWeightsManager::release(const ITensor *weights) +{ + if(weights == nullptr || !are_weights_managed(weights)) + { + return; + } + + _managed_counter[weights].counter--; + if(_managed_counter[weights].counter == 0 && _managed_counter[weights].is_unused) + { + weights->mark_as_unused(); + } +} + +void IWeightsManager::mark_as_unused(const ITensor *weights) +{ + if(weights == nullptr || !are_weights_managed(weights)) + { + return; + } + + _managed_counter[weights].is_unused = true; +} } // namespace arm_compute diff --git a/src/runtime/NEON/functions/NEFullyConnectedLayer.cpp b/src/runtime/NEON/functions/NEFullyConnectedLayer.cpp index 504200e9ce..84bc004ec4 100644 --- a/src/runtime/NEON/functions/NEFullyConnectedLayer.cpp +++ b/src/runtime/NEON/functions/NEFullyConnectedLayer.cpp @@ -76,6 +76,11 @@ void NEFullyConnectedLayer::configure(const ITensor *input, const ITensor *weigh _impl->op->configure(input->info(), weights->info(), (biases != nullptr) ? biases->info() : nullptr, output->info(), fc_info); + if(_impl->weights_manager != nullptr) + { + _impl->weights_manager->manage(weights); + } + _impl->aux_mem_req = _impl->op->workspace(); _impl->run_pack = { { ACL_SRC_0, input }, { ACL_SRC_1, weights }, { ACL_SRC_2, biases }, { ACL_DST, output } }; _impl->workspace = manage_workspace<Tensor>(_impl->aux_mem_req, _impl->memory_group, _impl->run_pack, _impl->run_pack); @@ -104,6 +109,19 @@ void NEFullyConnectedLayer::prepare() // Release temporary tensors that are only used in prepare stage release_temporaries<Tensor>(_impl->aux_mem_req, _impl->workspace); _impl->is_prepared = true; + + // 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 + const ITensor *original_b = _impl->original_weights; + if(!original_b->is_used()) + { + _impl->weights_manager->mark_as_unused(original_b); + } + _impl->original_weights->mark_as_used(); + _impl->weights_manager->release(_impl->original_weights); + } } } } // namespace arm_compute |