diff options
Diffstat (limited to 'src/graph')
-rw-r--r-- | src/graph/GraphContext.cpp | 29 | ||||
-rw-r--r-- | src/graph/backends/CL/CLDeviceBackend.cpp | 5 | ||||
-rw-r--r-- | src/graph/backends/GLES/GCDeviceBackend.cpp | 5 | ||||
-rw-r--r-- | src/graph/backends/NEON/NEDeviceBackend.cpp | 17 | ||||
-rw-r--r-- | src/graph/backends/NEON/NEFunctionFactory.cpp | 1 |
5 files changed, 55 insertions, 2 deletions
diff --git a/src/graph/GraphContext.cpp b/src/graph/GraphContext.cpp index 037b40b68b..c959d5e35c 100644 --- a/src/graph/GraphContext.cpp +++ b/src/graph/GraphContext.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -32,13 +32,14 @@ namespace arm_compute namespace graph { GraphContext::GraphContext() - : _config(), _memory_managers() + : _config(), _memory_managers(), _weights_managers() { } GraphContext::~GraphContext() { _memory_managers.clear(); + _weights_managers.clear(); release_default_graph_context(*this); } @@ -74,6 +75,30 @@ std::map<Target, MemoryManagerContext> &GraphContext::memory_managers() return _memory_managers; } +bool GraphContext::insert_weights_management_ctx(WeightsManagerContext &&weights_managers) +{ + Target target = weights_managers.target; + + if(target != Target::NEON || _weights_managers.find(target) != std::end(_weights_managers)) + { + return false; + } + + _weights_managers[target] = std::move(weights_managers); + + return true; +} + +WeightsManagerContext *GraphContext::weights_management_ctx(Target target) +{ + return (_weights_managers.find(target) != std::end(_weights_managers)) ? &_weights_managers[target] : nullptr; +} + +std::map<Target, WeightsManagerContext> &GraphContext::weights_managers() +{ + return _weights_managers; +} + void GraphContext::finalize() { const size_t num_pools = 1; diff --git a/src/graph/backends/CL/CLDeviceBackend.cpp b/src/graph/backends/CL/CLDeviceBackend.cpp index 9971e4fc9a..9b7c879b2a 100644 --- a/src/graph/backends/CL/CLDeviceBackend.cpp +++ b/src/graph/backends/CL/CLDeviceBackend.cpp @@ -204,6 +204,11 @@ std::shared_ptr<arm_compute::IMemoryManager> CLDeviceBackend::create_memory_mana return mm; } + +std::shared_ptr<arm_compute::IWeightsManager> CLDeviceBackend::create_weights_manager() +{ + return nullptr; +} } // namespace backends } // namespace graph } // namespace arm_compute diff --git a/src/graph/backends/GLES/GCDeviceBackend.cpp b/src/graph/backends/GLES/GCDeviceBackend.cpp index 058f7792e7..83e2436ddb 100644 --- a/src/graph/backends/GLES/GCDeviceBackend.cpp +++ b/src/graph/backends/GLES/GCDeviceBackend.cpp @@ -154,6 +154,11 @@ std::shared_ptr<arm_compute::IMemoryManager> GCDeviceBackend::create_memory_mana return mm; } + +std::shared_ptr<arm_compute::IWeightsManager> GCDeviceBackend::create_weights_manager() +{ + return nullptr; +} } // namespace backends } // namespace graph } // namespace arm_compute diff --git a/src/graph/backends/NEON/NEDeviceBackend.cpp b/src/graph/backends/NEON/NEDeviceBackend.cpp index f94cd97cd2..017b4f0f24 100644 --- a/src/graph/backends/NEON/NEDeviceBackend.cpp +++ b/src/graph/backends/NEON/NEDeviceBackend.cpp @@ -37,6 +37,7 @@ #include "arm_compute/core/TensorInfo.h" #include "arm_compute/runtime/Allocator.h" #include "arm_compute/runtime/BlobLifetimeManager.h" +#include "arm_compute/runtime/IWeightsManager.h" #include "arm_compute/runtime/MemoryGroup.h" #include "arm_compute/runtime/MemoryManagerOnDemand.h" #include "arm_compute/runtime/OffsetLifetimeManager.h" @@ -90,6 +91,16 @@ void NEDeviceBackend::setup_backend_context(GraphContext &ctx) ctx.insert_memory_management_ctx(std::move(mm_ctx)); } + + // Create function level weights manager + if(ctx.weights_management_ctx(Target::NEON) == nullptr) + { + WeightsManagerContext wm_ctx; + wm_ctx.target = Target::NEON; + wm_ctx.wm = create_weights_manager(); + + ctx.insert_weights_management_ctx(std::move(wm_ctx)); + } } bool NEDeviceBackend::is_backend_supported() @@ -159,6 +170,12 @@ std::shared_ptr<arm_compute::IMemoryManager> NEDeviceBackend::create_memory_mana return mm; } + +std::shared_ptr<arm_compute::IWeightsManager> NEDeviceBackend::create_weights_manager() +{ + auto weights_mgr = std::make_shared<IWeightsManager>(); + return weights_mgr; +} } // namespace backends } // namespace graph } // namespace arm_compute diff --git a/src/graph/backends/NEON/NEFunctionFactory.cpp b/src/graph/backends/NEON/NEFunctionFactory.cpp index 852de549fa..45e9727133 100644 --- a/src/graph/backends/NEON/NEFunctionFactory.cpp +++ b/src/graph/backends/NEON/NEFunctionFactory.cpp @@ -115,6 +115,7 @@ std::unique_ptr<IFunction> create_convolution_layer<NEConvolutionLayerFunctions, std::shared_ptr<IMemoryManager> mm = get_memory_manager(ctx, Target::NEON); std::unique_ptr<IFunction> func; std::string func_name; + if(conv_algorithm == ConvolutionMethod::Direct) { std::tie(func, func_name) = create_named_memory_managed_function<NEDirectConvolutionLayer>( |