From 20394d526820ca97df4c0db91ec2571b98280d6d Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Thu, 2 Aug 2018 11:29:09 +0100 Subject: COMPMID-1248 Enabled memory manager in NEWinogradConvolutionLayer Change-Id: I7bbab53f18a42f0879d80122a52bb6bdca4b8631 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/142413 Tested-by: Jenkins Reviewed-by: Gian Marco Iodice --- src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp') diff --git a/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp b/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp index 8ba620fe51..39fee1bfa5 100644 --- a/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp +++ b/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp @@ -159,7 +159,7 @@ private: * @param[in] memory_group Tensor memory group. * @param[in] alignment Workspace memory alignment. */ - void allocate_workspace(size_t workspace_size, MemoryGroup *memory_group, size_t alignment); + void allocate_workspace(size_t workspace_size, MemoryGroup &memory_group, size_t alignment); /** Assembly Gemm kernel */ std::unique_ptr> _gemm_kernel_asm{ nullptr }; @@ -204,8 +204,7 @@ void Fallback::configure(const ITensor *a, const ITensor { // Allocate workspace const unsigned int alignment = 4096; - //FIXME: is memory_group ever null ? - allocate_workspace(workspace_size, &memory_group, alignment); + allocate_workspace(workspace_size, memory_group, alignment); } //if we disable this code below in brackets then ConvLayer deadlocks when threads > 1 and @@ -256,14 +255,11 @@ void Fallback::prepare() } template -void Fallback::allocate_workspace(size_t workspace_size, MemoryGroup *memory_group, size_t alignment) +void Fallback::allocate_workspace(size_t workspace_size, MemoryGroup &memory_group, size_t alignment) { ARM_COMPUTE_ERROR_ON_MSG(workspace_size == 0, "size cannot be 0"); _workspace.allocator()->init(TensorInfo(TensorShape{ (workspace_size + alignment /* FIXME: remove alignment after COMPMID-1088 */) }, 1, DataType::S8), alignment); - if(memory_group != nullptr) - { - memory_group->manage(&_workspace); - } + memory_group.manage(&_workspace); _workspace.allocator()->allocate(); } -- cgit v1.2.1