From 8ae3cdadbc96910171d35abaab633be03b07d6f4 Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Mon, 7 Jun 2021 15:30:26 +0100 Subject: Revert "Implement memory injection in CpuDirectGemmConv2d" This reverts commit b3be45759bdd0749ae3a16fe470820f0d9830ea9. Resolves: COMPMID-4548 Change-Id: I46e0d8c67ddf988af3ce38f83177cda412db916c Signed-off-by: Michele Di Giorgio Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5775 Tested-by: Arm Jenkins Reviewed-by: Sheri Zhang --- src/core/helpers/MemoryHelpers.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/core') diff --git a/src/core/helpers/MemoryHelpers.h b/src/core/helpers/MemoryHelpers.h index dfa8e60758..6756a90c25 100644 --- a/src/core/helpers/MemoryHelpers.h +++ b/src/core/helpers/MemoryHelpers.h @@ -56,13 +56,12 @@ WorkspaceData manage_workspace(const experimental::MemoryRequirement continue; } - const auto alignment = req.alignment; - const auto aux_info = TensorInfo{ TensorShape(req.size + alignment), 1, DataType::U8 }; + const auto aux_info = TensorInfo{ TensorShape(req.size), 1, DataType::U8 }; workspace_memory.emplace_back(req.slot, std::make_unique()); auto aux_tensor = workspace_memory.back().second.get(); ARM_COMPUTE_ERROR_ON_NULLPTR(aux_tensor); - aux_tensor->allocator()->init(aux_info, alignment); + aux_tensor->allocator()->init(aux_info); if(req.lifetime == experimental::MemoryLifetime::Temporary) { @@ -83,14 +82,5 @@ WorkspaceData manage_workspace(const experimental::MemoryRequirement return workspace_memory; } - -template -WorkspaceData manage_workspace(const experimental::MemoryRequirements &mem_reqs, - MemoryGroup &mgroup, - ITensorPack &run_pack) -{ - ITensorPack dummy_prep_pack{}; - return manage_workspace(mem_reqs, mgroup, run_pack, dummy_prep_pack); -} } // namespace arm_compute #endif /* SRC_COMMON_MEMORY_HELPERS_H */ -- cgit v1.2.1