COMPMID-1248 Enabled memory manager in NEWinogradConvolutionLayer
Change-Id: I7bbab53f18a42f0879d80122a52bb6bdca4b8631
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/142413
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
diff --git a/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp b/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp
index 8ba620f..39fee1b 100644
--- a/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp
+++ b/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp
@@ -159,7 +159,7 @@
* @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<arm_gemm::GemmCommon<TypeInput, TypeOutput>> _gemm_kernel_asm{ nullptr };
@@ -204,8 +204,7 @@
{
// 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 @@
}
template <typename TypeInput, typename TypeOutput>
-void Fallback<TypeInput, TypeOutput>::allocate_workspace(size_t workspace_size, MemoryGroup *memory_group, size_t alignment)
+void Fallback<TypeInput, TypeOutput>::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();
}