diff options
| author | Michalis Spyrou <michalis.spyrou@arm.com> | 2019-09-10 17:20:34 +0100 |
|---|---|---|
| committer | Michalis Spyrou <michalis.spyrou@arm.com> | 2019-09-26 10:17:30 +0000 |
| commit | 1a569a30a2f456ff1a3e0a665201e1c3ab92df80 (patch) | |
| tree | 9d68934f461579edefbe65246f6ee435aaa18808 /src/runtime/NEON/functions/NEGEMM.cpp | |
| parent | f1cf394ae882e6e8fb2e0986f88d2548b82a85bb (diff) | |
| download | ComputeLibrary-1a569a30a2f456ff1a3e0a665201e1c3ab92df80.tar.gz | |
COMPMID-2161 [NEON] Create IWeightManager class
Change-Id: I1a9a46da2f98e896b825099151b56d1d8271dd31
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1915
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/runtime/NEON/functions/NEGEMM.cpp')
| -rw-r--r-- | src/runtime/NEON/functions/NEGEMM.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/runtime/NEON/functions/NEGEMM.cpp b/src/runtime/NEON/functions/NEGEMM.cpp index 37d0e09fc9..df92b7999c 100644 --- a/src/runtime/NEON/functions/NEGEMM.cpp +++ b/src/runtime/NEON/functions/NEGEMM.cpp @@ -42,9 +42,9 @@ using namespace arm_compute::misc::shape_calculator; namespace arm_compute { -NEGEMM::NEGEMM(std::shared_ptr<IMemoryManager> memory_manager) - : _memory_group(memory_manager), _interleave_kernel(), _transpose_kernel(), _mm_kernel(), _asm_glue(memory_manager), _ma_kernel(), _tmp_a(), _tmp_b(), _original_b(nullptr), - _run_vector_matrix_multiplication(false), _run_addition(false), _reshape_b_only_on_first_run(false), _is_prepared(false) +NEGEMM::NEGEMM(std::shared_ptr<IMemoryManager> memory_manager, IWeightsManager *weights_manager) + : _memory_group(memory_manager), _weights_manager(weights_manager), _interleave_kernel(), _transpose_kernel(), _mm_kernel(), _asm_glue(memory_manager, weights_manager), _ma_kernel(), _tmp_a(), + _tmp_b(), _original_b(nullptr), _run_vector_matrix_multiplication(false), _run_addition(false), _reshape_b_only_on_first_run(false), _is_prepared(false) { } @@ -276,13 +276,19 @@ void NEGEMM::prepare() { if(_asm_glue.is_configured()) { - ARM_COMPUTE_ERROR_ON(!_original_b->is_used()); + if(!_weights_manager || !_weights_manager->are_weights_managed(_original_b)) + { + ARM_COMPUTE_ERROR_ON(!_original_b->is_used()); + } _asm_glue.prepare(); } else if(_reshape_b_only_on_first_run && !_run_vector_matrix_multiplication && !_asm_glue.is_configured()) { - ARM_COMPUTE_ERROR_ON(!_original_b->is_used()); + if(!_weights_manager || !_weights_manager->are_weights_managed(_original_b)) + { + ARM_COMPUTE_ERROR_ON(!_original_b->is_used()); + } _tmp_b.allocator()->allocate(); NEScheduler::get().schedule(&_transpose_kernel, Window::DimY); |