diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2017-09-15 16:30:50 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
commit | 658039bc4e06be34272eccf559a516a6b52f75f5 (patch) | |
tree | 7ab17a9cb5dad7b18f7e3a67b731f2c462b1ac24 /src/runtime/NEON/functions/NELocallyConnectedLayer.cpp | |
parent | 9e40cf7c21ed0136150101d6c930417d475ecff1 (diff) | |
download | ComputeLibrary-658039bc4e06be34272eccf559a516a6b52f75f5.tar.gz |
COMPMID-534: Add MemoryManager support in NEON functions
Adds support for:
-NECannyEdge
-NEConvolution
-NEDirectConvolution
-NEGEMM
-NEGEMMLowp
-NEGaussian5x5
-NEHOGDescriptor
-NEHOGGradient
-NEL2Normalize
-NELocallyConnectedLayer
-NENormalizationLayer
-NEScale
-NESobel5x5
-NESobel7x7
Change-Id: I68e05aa6054372fa873a882633a15fb97882c00d
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/87926
Reviewed-by: Pablo Tello <pablo.tello@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Diffstat (limited to 'src/runtime/NEON/functions/NELocallyConnectedLayer.cpp')
-rw-r--r-- | src/runtime/NEON/functions/NELocallyConnectedLayer.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/runtime/NEON/functions/NELocallyConnectedLayer.cpp b/src/runtime/NEON/functions/NELocallyConnectedLayer.cpp index e7c71e04d1..cb48598921 100644 --- a/src/runtime/NEON/functions/NELocallyConnectedLayer.cpp +++ b/src/runtime/NEON/functions/NELocallyConnectedLayer.cpp @@ -33,8 +33,9 @@ using namespace arm_compute; -NELocallyConnectedLayer::NELocallyConnectedLayer() - : _input_im2col_kernel(), _weights_reshape_kernel(), _mm_kernel(), _output_col2im_kernel(), _input_im2col_reshaped(), _weights_reshaped(), _gemm_output(), _is_first_run(false) +NELocallyConnectedLayer::NELocallyConnectedLayer(std::shared_ptr<IMemoryManager> memory_manager) + : _memory_group(std::move(memory_manager)), _input_im2col_kernel(), _weights_reshape_kernel(), _mm_kernel(), _output_col2im_kernel(), _input_im2col_reshaped(), _weights_reshaped(), _gemm_output(), + _is_first_run(false) { } @@ -102,6 +103,10 @@ void NELocallyConnectedLayer::configure(const ITensor *input, const ITensor *wei shape_gemm.set(1, mat_input_rows); _gemm_output.allocator()->init(TensorInfo(shape_gemm, 1, input->info()->data_type())); + // Manage intermediate buffers + _memory_group.manage(&_input_im2col_reshaped); + _memory_group.manage(&_gemm_output); + // Configure kernels _input_im2col_kernel.configure(input, &_input_im2col_reshaped, Size2D(kernel_width, kernel_height), conv_info, _has_bias); _weights_reshape_kernel.configure(weights, biases, &_weights_reshaped); @@ -123,6 +128,8 @@ void NELocallyConnectedLayer::run() NEScheduler::get().schedule(&_weights_reshape_kernel, 3); } + _memory_group.acquire(); + // Run input reshaping NEScheduler::get().schedule(&_input_im2col_kernel, Window::DimY); @@ -131,4 +138,6 @@ void NELocallyConnectedLayer::run() // Reshape output matrix NEScheduler::get().schedule(&_output_col2im_kernel, Window::DimY); + + _memory_group.release(); } |