diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-10-11 15:33:11 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:55:45 +0000 |
commit | 9da19e9da660057785fb736aba5c61b1ae773f2f (patch) | |
tree | b51b30bed8266571178834367437bab0d8a7a517 /src/graph | |
parent | ffb57a05d624c2efe1b32cf6ece112ee28726058 (diff) | |
download | ComputeLibrary-9da19e9da660057785fb736aba5c61b1ae773f2f.tar.gz |
COMPMID-1605: API alignment for the MemoryManager with ARMNN
Change-Id: Iac6a95ba7f388e65b7f1c8865c3e9bf289b233ea
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/155490
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: bsgcomp <bsgcomp@arm.com>
Diffstat (limited to 'src/graph')
-rw-r--r-- | src/graph/GraphContext.cpp | 8 | ||||
-rw-r--r-- | src/graph/backends/CL/CLDeviceBackend.cpp | 3 | ||||
-rw-r--r-- | src/graph/backends/GLES/GCDeviceBackend.cpp | 3 | ||||
-rw-r--r-- | src/graph/backends/NEON/NEDeviceBackend.cpp | 3 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/graph/GraphContext.cpp b/src/graph/GraphContext.cpp index 5f33ed3537..037b40b68b 100644 --- a/src/graph/GraphContext.cpp +++ b/src/graph/GraphContext.cpp @@ -25,6 +25,7 @@ #include "arm_compute/graph.h" #include "arm_compute/graph/Utils.h" +#include "arm_compute/graph/backends/BackendRegistry.h" namespace arm_compute { @@ -75,17 +76,20 @@ std::map<Target, MemoryManagerContext> &GraphContext::memory_managers() void GraphContext::finalize() { + const size_t num_pools = 1; for(auto &mm_obj : _memory_managers) { + ARM_COMPUTE_ERROR_ON(!mm_obj.second.allocator); + // Finalize intra layer memory manager if(mm_obj.second.intra_mm != nullptr) { - mm_obj.second.intra_mm->finalize(); + mm_obj.second.intra_mm->populate(*mm_obj.second.allocator, num_pools); } // Finalize cross layer memory manager if(mm_obj.second.cross_mm != nullptr) { - mm_obj.second.cross_mm->finalize(); + mm_obj.second.cross_mm->populate(*mm_obj.second.allocator, num_pools); } } } diff --git a/src/graph/backends/CL/CLDeviceBackend.cpp b/src/graph/backends/CL/CLDeviceBackend.cpp index f35daf4ae5..ae7f0a50b3 100644 --- a/src/graph/backends/CL/CLDeviceBackend.cpp +++ b/src/graph/backends/CL/CLDeviceBackend.cpp @@ -127,6 +127,7 @@ void CLDeviceBackend::setup_backend_context(GraphContext &ctx) mm_ctx.intra_mm = create_memory_manager(MemoryManagerAffinity::Buffer); mm_ctx.cross_mm = create_memory_manager(MemoryManagerAffinity::Buffer); mm_ctx.cross_group = std::make_shared<CLMemoryGroup>(mm_ctx.cross_mm); + mm_ctx.allocator = _allocator.get(); ctx.insert_memory_management_ctx(std::move(mm_ctx)); } @@ -195,8 +196,6 @@ std::shared_ptr<arm_compute::IMemoryManager> CLDeviceBackend::create_memory_mana auto pool_mgr = std::make_shared<PoolManager>(); auto mm = std::make_shared<MemoryManagerOnDemand>(lifetime_mgr, pool_mgr); - mm->set_allocator(_allocator.get()); - return mm; } } // namespace backends diff --git a/src/graph/backends/GLES/GCDeviceBackend.cpp b/src/graph/backends/GLES/GCDeviceBackend.cpp index ec3cf4f21e..5f0bf3f263 100644 --- a/src/graph/backends/GLES/GCDeviceBackend.cpp +++ b/src/graph/backends/GLES/GCDeviceBackend.cpp @@ -86,6 +86,7 @@ void GCDeviceBackend::setup_backend_context(GraphContext &ctx) mm_ctx.intra_mm = create_memory_manager(MemoryManagerAffinity::Buffer); mm_ctx.cross_mm = create_memory_manager(MemoryManagerAffinity::Buffer); mm_ctx.cross_group = std::make_shared<GCMemoryGroup>(mm_ctx.cross_mm); + mm_ctx.allocator = &_allocator; ctx.insert_memory_management_ctx(std::move(mm_ctx)); } @@ -151,8 +152,6 @@ std::shared_ptr<arm_compute::IMemoryManager> GCDeviceBackend::create_memory_mana auto pool_mgr = std::make_shared<PoolManager>(); auto mm = std::make_shared<MemoryManagerOnDemand>(lifetime_mgr, pool_mgr); - mm->set_allocator(&_allocator); - return mm; } } // namespace backends diff --git a/src/graph/backends/NEON/NEDeviceBackend.cpp b/src/graph/backends/NEON/NEDeviceBackend.cpp index 5fc44d0c68..23ced2fef3 100644 --- a/src/graph/backends/NEON/NEDeviceBackend.cpp +++ b/src/graph/backends/NEON/NEDeviceBackend.cpp @@ -86,6 +86,7 @@ void NEDeviceBackend::setup_backend_context(GraphContext &ctx) mm_ctx.intra_mm = create_memory_manager(MemoryManagerAffinity::Offset); mm_ctx.cross_mm = create_memory_manager(MemoryManagerAffinity::Offset); mm_ctx.cross_group = std::make_shared<MemoryGroup>(mm_ctx.cross_mm); + mm_ctx.allocator = &_allocator; ctx.insert_memory_management_ctx(std::move(mm_ctx)); } @@ -156,8 +157,6 @@ std::shared_ptr<arm_compute::IMemoryManager> NEDeviceBackend::create_memory_mana auto pool_mgr = std::make_shared<PoolManager>(); auto mm = std::make_shared<MemoryManagerOnDemand>(lifetime_mgr, pool_mgr); - mm->set_allocator(&_allocator); - return mm; } } // namespace backends |