diff options
author | David Beck <david.beck@arm.com> | 2018-11-12 14:59:37 +0000 |
---|---|---|
committer | Aron Virginas-Tar <aron.virginas-tar@arm.com> | 2018-11-12 16:02:51 +0000 |
commit | 111b5d94d7e854c21377f8d2c0b4234317a903f6 (patch) | |
tree | 68111e5d89b605c898b2327cb59b915e3ff64ce9 /src/backends/cl | |
parent | 4e1e136cce3fca73ba49b570cfcb620f4ec574da (diff) | |
download | armnn-111b5d94d7e854c21377f8d2c0b4234317a903f6.tar.gz |
IVGCVSW-2125 : Consolidate backend registries into one
Change-Id: I56da4780f8f5fcef7ff01d232d5d61bf299364bf
Diffstat (limited to 'src/backends/cl')
-rw-r--r-- | src/backends/cl/ClBackend.cpp | 9 | ||||
-rw-r--r-- | src/backends/cl/ClBackend.hpp | 1 | ||||
-rw-r--r-- | src/backends/cl/ClLayerSupport.cpp | 17 |
3 files changed, 10 insertions, 17 deletions
diff --git a/src/backends/cl/ClBackend.cpp b/src/backends/cl/ClBackend.cpp index 8209a109a4..4ef8d90dfc 100644 --- a/src/backends/cl/ClBackend.cpp +++ b/src/backends/cl/ClBackend.cpp @@ -7,6 +7,7 @@ #include "ClBackendId.hpp" #include "ClWorkloadFactory.hpp" #include "ClBackendContext.hpp" +#include "ClLayerSupport.hpp" #include <backendsCommon/IBackendContext.hpp> #include <backendsCommon/BackendRegistry.hpp> @@ -18,7 +19,7 @@ namespace armnn namespace { -static StaticRegistryInitializer<BackendRegistry> g_RegisterHelper +static BackendRegistry::StaticRegistryInitializer g_RegisterHelper { BackendRegistryInstance(), ClBackend::GetIdStatic(), @@ -52,4 +53,10 @@ IBackendInternal::Optimizations ClBackend::GetOptimizations() const return Optimizations{}; } +IBackendInternal::ILayerSupportSharedPtr ClBackend::GetLayerSupport() const +{ + static ILayerSupportSharedPtr layerSupport{new ClLayerSupport}; + return layerSupport; +} + } // namespace armnn diff --git a/src/backends/cl/ClBackend.hpp b/src/backends/cl/ClBackend.hpp index ad84e8a159..7ee85980a3 100644 --- a/src/backends/cl/ClBackend.hpp +++ b/src/backends/cl/ClBackend.hpp @@ -21,6 +21,7 @@ public: IBackendInternal::IWorkloadFactoryPtr CreateWorkloadFactory() const override; IBackendInternal::IBackendContextPtr CreateBackendContext(const IRuntime::CreationOptions&) const override; IBackendInternal::Optimizations GetOptimizations() const override; + IBackendInternal::ILayerSupportSharedPtr GetLayerSupport() const override; }; } // namespace armnn
\ No newline at end of file diff --git a/src/backends/cl/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp index f4e14c24d0..039f1c24f0 100644 --- a/src/backends/cl/ClLayerSupport.cpp +++ b/src/backends/cl/ClLayerSupport.cpp @@ -10,7 +10,7 @@ #include <InternalTypes.hpp> #include <LayerSupportCommon.hpp> -#include <backendsCommon/LayerSupportRegistry.hpp> +#include <backendsCommon/BackendRegistry.hpp> #include <boost/core/ignore_unused.hpp> @@ -44,21 +44,6 @@ namespace armnn namespace { -ILayerSupportSharedPtr GetLayerSupportPointer() -{ - static ILayerSupportSharedPtr instance{new ClLayerSupport}; - return instance; -} - -static StaticRegistryInitializer<LayerSupportRegistry> g_RegisterHelper{ - LayerSupportRegistryInstance(), - ClBackendId(), - []() - { - return GetLayerSupportPointer(); - } -}; - template<unsigned int FilterSize> bool IsMatchingSize2d(const TensorInfo& weightInfo) { |