From 2e5fd637205770ec5e11096e6e19b8efc67d544e Mon Sep 17 00:00:00 2001 From: SiCongLi Date: Mon, 2 Mar 2020 15:39:15 +0000 Subject: COMPMID-3098 Fuse Relu and Bounded Relu with FullyConnected NEON Change-Id: Id28062445590d6c06b35f7d7434eb38393ae94a7 Signed-off-by: SiCongLi Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/2875 Comments-Addressed: Arm Jenkins Reviewed-by: Michele Di Giorgio Reviewed-by: Gian Marco Iodice Tested-by: Arm Jenkins --- src/runtime/NEON/functions/NEGEMM.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/runtime/NEON/functions/NEGEMM.cpp') diff --git a/src/runtime/NEON/functions/NEGEMM.cpp b/src/runtime/NEON/functions/NEGEMM.cpp index be964457fc..873145de12 100644 --- a/src/runtime/NEON/functions/NEGEMM.cpp +++ b/src/runtime/NEON/functions/NEGEMM.cpp @@ -336,25 +336,33 @@ void NEGEMM::prepare() { if(!_is_prepared) { + const bool original_b_managed_by_weights_manager = _weights_manager && _weights_manager->are_weights_managed(_original_b); if(_asm_glue.is_configured()) { - if(!_weights_manager || !_weights_manager->are_weights_managed(_original_b)) + if(!original_b_managed_by_weights_manager) { ARM_COMPUTE_ERROR_ON(!_original_b->is_used()); } _asm_glue.prepare(); + if(!original_b_managed_by_weights_manager) + { + _original_b->mark_as_unused(); + } } else if(_reshape_b_only_on_first_run && !_run_vector_matrix_multiplication && !_asm_glue.is_configured()) { - if(!_weights_manager || !_weights_manager->are_weights_managed(_original_b)) + if(!original_b_managed_by_weights_manager) { ARM_COMPUTE_ERROR_ON(!_original_b->is_used()); } _tmp_b.allocator()->allocate(); NEScheduler::get().schedule(&_transpose_kernel, Window::DimY); - _original_b->mark_as_unused(); + if(!original_b_managed_by_weights_manager) + { + _original_b->mark_as_unused(); + } } _is_prepared = true; -- cgit v1.2.1