IVGCVSW-5855 Refactor the reporting of capabilities from backends

Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: I05fc331a8e91bdcb6b8a2f32cfb555060fc5d797

2 files changed, 10 insertions, 14 deletions

diff --git a/src/backends/cl/ClBackend.cpp b/src/backends/cl/ClBackend.cpp
index a9ab237325..f1e52c1998 100644
--- a/src/backends/cl/ClBackend.cpp
+++ b/src/backends/cl/ClBackend.cpp
@@ -177,16 +177,6 @@ IBackendInternal::ILayerSupportSharedPtr ClBackend::GetLayerSupport(const ModelO
     return layerSupport;
 }
 
-bool ClBackend::HasCapability(BackendCapability capabilityClass) const
-{
-    auto search = gpuAccCapabilities.find(capabilityClass);
-    if (search != gpuAccCapabilities.end())
-    {
-        return true;
-    }
-    return false;
-}
-
 OptimizationViews ClBackend::OptimizeSubgraphView(const SubgraphView& subgraph,
                                                   const ModelOptions& modelOptions) const
 {
diff --git a/src/backends/cl/ClBackend.hpp b/src/backends/cl/ClBackend.hpp
index 252d87edea..db03cfeff0 100644
--- a/src/backends/cl/ClBackend.hpp
+++ b/src/backends/cl/ClBackend.hpp
@@ -9,9 +9,12 @@
 namespace armnn
 {
 
-const std::set<armnn::BackendCapability> gpuAccCapabilities {
-    // add new capabilities here..
-};
+// add new capabilities here..
+const BackendCapabilities gpuAccCapabilities("GpuAcc",
+                                             {
+                                                     {"NonConstWeights", false},
+                                                     {"AsyncExecution", false}
+                                             });
 
 class ClBackend : public IBackendInternal
 {
@@ -63,7 +66,10 @@ public:
     IBackendInternal::IBackendSpecificModelContextPtr CreateBackendSpecificModelContext(
         const ModelOptions& modelOptions) const override;
 
-    bool HasCapability(BackendCapability capabilityClass) const override;
+    BackendCapabilities GetCapabilities() const override
+    {
+        return gpuAccCapabilities;
+    };
 };
 
 } // namespace armnn