From b9af86ea42568ade799ee5529137e4756977b6c6 Mon Sep 17 00:00:00 2001 From: Finn Williams Date: Wed, 26 May 2021 18:38:12 +0100 Subject: IVGCVSW-5855 Refactor the reporting of capabilities from backends Signed-off-by: Finn Williams Change-Id: I05fc331a8e91bdcb6b8a2f32cfb555060fc5d797 --- src/backends/neon/NeonBackend.cpp | 10 ---------- src/backends/neon/NeonBackend.hpp | 15 +++++++++++---- 2 files changed, 11 insertions(+), 14 deletions(-) (limited to 'src/backends/neon') diff --git a/src/backends/neon/NeonBackend.cpp b/src/backends/neon/NeonBackend.cpp index b496238cf3..17876753fb 100644 --- a/src/backends/neon/NeonBackend.cpp +++ b/src/backends/neon/NeonBackend.cpp @@ -132,16 +132,6 @@ IBackendInternal::ILayerSupportSharedPtr NeonBackend::GetLayerSupport(const Mode return layerSupport; } -bool NeonBackend::HasCapability(BackendCapability capabilityClass) const -{ - auto search = cpuAccCapabilities.find(capabilityClass); - if (search != cpuAccCapabilities.end()) - { - return true; - } - return false; -} - OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph) const { OptimizationViews optimizationViews; diff --git a/src/backends/neon/NeonBackend.hpp b/src/backends/neon/NeonBackend.hpp index 34606f992c..eae57320cc 100644 --- a/src/backends/neon/NeonBackend.hpp +++ b/src/backends/neon/NeonBackend.hpp @@ -9,9 +9,13 @@ namespace armnn { -const std::set cpuAccCapabilities { - // add new capabilities here.. -}; +// add new capabilities here.. +const BackendCapabilities cpuAccCapabilities("GpuAcc", + { + {"NonConstWeights", false}, + {"AsyncExecution", false} + }); + class NeonBackend : public IBackendInternal { @@ -52,7 +56,10 @@ public: IBackendInternal::IBackendSpecificModelContextPtr CreateBackendSpecificModelContext( const ModelOptions& modelOptions) const override; - bool HasCapability(BackendCapability capabilityClass) const override; + BackendCapabilities GetCapabilities() const override + { + return cpuAccCapabilities; + }; }; } // namespace armnn -- cgit v1.2.1