3 files changed, 24 insertions, 14 deletions
diff --git a/src/backends/neon/NeonBackend.cpp b/src/backends/neon/NeonBackend.cpp
index f86509cbe6..5df231b5e3 100644
--- a/src/backends/neon/NeonBackend.cpp
+++ b/src/backends/neon/NeonBackend.cpp
@@ -97,7 +97,7 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph
 
 std::vector<ITensorHandleFactory::FactoryId> NeonBackend::GetHandleFactoryPreferences() const
 {
-    return std::vector<ITensorHandleFactory::FactoryId>() = {"Arm/Neon/TensorHandleFactory"};
+    return std::vector<ITensorHandleFactory::FactoryId>() = {NeonTensorHandleFactory::GetIdStatic()};
 }
 
 void NeonBackend::RegisterTensorHandleFactories(class TensorHandleFactoryRegistry& registry)
@@ -106,7 +106,7 @@ void NeonBackend::RegisterTensorHandleFactories(class TensorHandleFactoryRegistr
                                                              BaseMemoryManager::MemoryAffinity::Offset);
 
     registry.RegisterMemoryManager(memoryManager);
-    registry.RegisterFactory(std::make_unique<NeonTensorHandleFactory>(memoryManager, "Arm/Neon/TensorHandleFactory"));
+    registry.RegisterFactory(std::make_unique<NeonTensorHandleFactory>(memoryManager));
 }
 
 } // namespace armnn
diff --git a/src/backends/neon/NeonTensorHandleFactory.cpp b/src/backends/neon/NeonTensorHandleFactory.cpp
index ef342347d3..aff594c9d9 100644
--- a/src/backends/neon/NeonTensorHandleFactory.cpp
+++ b/src/backends/neon/NeonTensorHandleFactory.cpp
@@ -11,18 +11,18 @@
 namespace armnn
 {
 
-using FactoryId = std::string;
+using FactoryId = ITensorHandleFactory::FactoryId;
 
 std::unique_ptr<ITensorHandle> NeonTensorHandleFactory::CreateSubTensorHandle(ITensorHandle& parent,
-                                                                              TensorShape const& subTensorShape,
-                                                                              unsigned int const* subTensorOrigin)
+                                                                              const TensorShape& subTensorShape,
+                                                                              const unsigned int* subTensorOrigin)
                                                                               const
 {
     const arm_compute::TensorShape shape = armcomputetensorutils::BuildArmComputeTensorShape(subTensorShape);
 
     arm_compute::Coordinates coords;
     coords.set_num_dimensions(subTensorShape.GetNumDimensions());
-    for (unsigned int i = 0; i < subTensorShape.GetNumDimensions(); i++)
+    for (unsigned int i = 0; i < subTensorShape.GetNumDimensions(); ++i)
     {
         // Arm compute indexes tensor coords in reverse order.
         unsigned int revertedIndex = subTensorShape.GetNumDimensions() - i - 1;
@@ -56,9 +56,15 @@ std::unique_ptr<ITensorHandle> NeonTensorHandleFactory::CreateTensorHandle(const
     return tensorHandle;
 }
 
+const FactoryId& NeonTensorHandleFactory::GetIdStatic()
+{
+    static const FactoryId s_Id(NeonTensorHandleFactoryId());
+    return s_Id;
+}
+
 const FactoryId NeonTensorHandleFactory::GetId() const
 {
-    return m_Id;
+    return GetIdStatic();
 }
 
 bool NeonTensorHandleFactory::SupportsSubTensors() const
diff --git a/src/backends/neon/NeonTensorHandleFactory.hpp b/src/backends/neon/NeonTensorHandleFactory.hpp
index a2e46e22e9..c401e0ee81 100644
--- a/src/backends/neon/NeonTensorHandleFactory.hpp
+++ b/src/backends/neon/NeonTensorHandleFactory.hpp
@@ -11,23 +11,28 @@
 namespace armnn
 {
 
+constexpr const char* NeonTensorHandleFactoryId() { return "Arm/Neon/TensorHandleFactory"; }
+
 class NeonTensorHandleFactory : public ITensorHandleFactory
 {
 public:
-    NeonTensorHandleFactory(std::weak_ptr<NeonMemoryManager> mgr, ITensorHandleFactory::FactoryId id)
-        : m_Id(id)
-        , m_MemoryManager(mgr)
+    NeonTensorHandleFactory(std::weak_ptr<NeonMemoryManager> mgr)
+                            : m_MemoryManager(mgr),
+                              m_ImportFlags(static_cast<MemorySourceFlags>(MemorySource::Undefined)),
+                              m_ExportFlags(static_cast<MemorySourceFlags>(MemorySource::Undefined))
     {}
 
     std::unique_ptr<ITensorHandle> CreateSubTensorHandle(ITensorHandle& parent,
-                                                         TensorShape const& subTensorShape,
-                                                         unsigned int const* subTensorOrigin) const override;
+                                                         const TensorShape& subTensorShape,
+                                                         const unsigned int* subTensorOrigin) const override;
 
     std::unique_ptr<ITensorHandle> CreateTensorHandle(const TensorInfo& tensorInfo) const override;
 
     std::unique_ptr<ITensorHandle> CreateTensorHandle(const TensorInfo& tensorInfo,
                                                       DataLayout dataLayout) const override;
 
+    static const FactoryId& GetIdStatic();
+
     const FactoryId GetId() const override;
 
     bool SupportsSubTensors() const override;
@@ -37,10 +42,9 @@ public:
     MemorySourceFlags GetImportFlags() const override;
 
 private:
-    FactoryId m_Id = "Arm/Neon/TensorHandleFactory";
+    mutable std::shared_ptr<NeonMemoryManager> m_MemoryManager;
     MemorySourceFlags m_ImportFlags;
     MemorySourceFlags m_ExportFlags;
-    mutable std::shared_ptr<NeonMemoryManager> m_MemoryManager;
 };
 
 } // namespace armnn