diff options
Diffstat (limited to 'src/backends/neon')
-rw-r--r-- | src/backends/neon/NeonBackend.cpp | 9 | ||||
-rw-r--r-- | src/backends/neon/NeonBackend.hpp | 1 | ||||
-rw-r--r-- | src/backends/neon/NeonLayerSupport.cpp | 17 |
3 files changed, 10 insertions, 17 deletions
diff --git a/src/backends/neon/NeonBackend.cpp b/src/backends/neon/NeonBackend.cpp index 9e079f38ce..4d57eda877 100644 --- a/src/backends/neon/NeonBackend.cpp +++ b/src/backends/neon/NeonBackend.cpp @@ -6,6 +6,7 @@ #include "NeonBackend.hpp" #include "NeonBackendId.hpp" #include "NeonWorkloadFactory.hpp" +#include "NeonLayerSupport.hpp" #include <backendsCommon/IBackendContext.hpp> #include <backendsCommon/BackendRegistry.hpp> @@ -19,7 +20,7 @@ namespace armnn namespace { -static StaticRegistryInitializer<BackendRegistry> g_RegisterHelper +static BackendRegistry::StaticRegistryInitializer g_RegisterHelper { BackendRegistryInstance(), NeonBackend::GetIdStatic(), @@ -52,4 +53,10 @@ IBackendInternal::Optimizations NeonBackend::GetOptimizations() const return Optimizations{}; } +IBackendInternal::ILayerSupportSharedPtr NeonBackend::GetLayerSupport() const +{ + static ILayerSupportSharedPtr layerSupport{new NeonLayerSupport}; + return layerSupport; +} + } // namespace armnn
\ No newline at end of file diff --git a/src/backends/neon/NeonBackend.hpp b/src/backends/neon/NeonBackend.hpp index e0017d92c8..d83710d22c 100644 --- a/src/backends/neon/NeonBackend.hpp +++ b/src/backends/neon/NeonBackend.hpp @@ -21,6 +21,7 @@ public: 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/neon/NeonLayerSupport.cpp b/src/backends/neon/NeonLayerSupport.cpp index a4a6b67c0b..165e0677b7 100644 --- a/src/backends/neon/NeonLayerSupport.cpp +++ b/src/backends/neon/NeonLayerSupport.cpp @@ -12,7 +12,7 @@ #include <armnn/Tensor.hpp> #include <armnn/Types.hpp> -#include <backendsCommon/LayerSupportRegistry.hpp> +#include <backendsCommon/BackendRegistry.hpp> #include <boost/core/ignore_unused.hpp> @@ -40,21 +40,6 @@ namespace armnn namespace { -ILayerSupportSharedPtr GetLayerSupportPointer() -{ - static ILayerSupportSharedPtr instance{new NeonLayerSupport}; - return instance; -} - -static StaticRegistryInitializer<LayerSupportRegistry> g_RegisterHelper{ - LayerSupportRegistryInstance(), - NeonBackendId(), - []() - { - return GetLayerSupportPointer(); - } -}; - bool IsNeonBackendSupported(Optional<std::string&> reasonIfUnsupported) { #if ARMCOMPUTENEON_ENABLED |