IVGCVSW-3623 Implement NeonTensorHandle::Import

Signed-off-by: David Monahan <david.monahan@arm.com>
Change-Id: I7213788725fd4e4cf1176998604e999d0b7ed6cc

5 files changed, 16 insertions, 6 deletions

diff --git a/src/armnn/layers/ConcatLayer.cpp b/src/armnn/layers/ConcatLayer.cpp
index 24051a24d2..9b1785850a 100644
--- a/src/armnn/layers/ConcatLayer.cpp
+++ b/src/armnn/layers/ConcatLayer.cpp
@@ -119,8 +119,10 @@ void ConcatLayer::CreateTensors(const FactoryType& factory)
 }
 
 void ConcatLayer::CreateTensorHandles(const TensorHandleFactoryRegistry& registry,
-                                      const IWorkloadFactory& workloadFactory)
+                                      const IWorkloadFactory& workloadFactory,
+                                      const bool IsMemoryManaged)
 {
+    boost::ignore_unused(IsMemoryManaged);
     OutputSlot& slot = GetOutputSlot(0);
     ITensorHandleFactory::FactoryId factoryId = slot.GetTensorHandleFactoryId();
 
diff --git a/src/armnn/layers/ConcatLayer.hpp b/src/armnn/layers/ConcatLayer.hpp
index e8ff2e452b..10a7fd8e74 100644
--- a/src/armnn/layers/ConcatLayer.hpp
+++ b/src/armnn/layers/ConcatLayer.hpp
@@ -24,8 +24,10 @@ public:
     /// otherwise creates tensor handlers.
     /// @param [in] registry Contains all the registered tensor handle factories available for use.
     /// @param [in] factory The workload factory which will create the workload.
+    /// @param [in] IsMemoryManaged Determine whether or not to assign a memory manager during creation
     virtual void CreateTensorHandles(const TensorHandleFactoryRegistry& registry,
-                                     const IWorkloadFactory& factory) override;
+                                     const IWorkloadFactory& factory,
+                                     const bool IsMemoryManaged = true) override;
 
     /// Creates a dynamically-allocated copy of this layer.
     /// @param [in] graph The graph into which this layer is being cloned.
diff --git a/src/armnn/layers/OutputLayer.hpp b/src/armnn/layers/OutputLayer.hpp
index 2aa2dbd6c9..c9615cca66 100644
--- a/src/armnn/layers/OutputLayer.hpp
+++ b/src/armnn/layers/OutputLayer.hpp
@@ -24,10 +24,12 @@ public:
     /// otherwise creates tensor handlers by default. Ignores parameters for Output type.
     /// @param [in] registry Contains all the registered tensor handle factories available for use.
     /// @param [in] factory The workload factory which will create the workload.
+    /// @param [in] IsMemoryManaged Determine whether or not to assign a memory manager during creation
     virtual void CreateTensorHandles(const TensorHandleFactoryRegistry& registry,
-                                     const IWorkloadFactory& factory) override
+                                     const IWorkloadFactory& factory,
+                                     const bool IsMemoryManaged = true) override
     {
-        boost::ignore_unused(registry, factory);
+        boost::ignore_unused(registry, factory, IsMemoryManaged);
     }
 
     /// Creates a dynamically-allocated copy of this layer.
diff --git a/src/armnn/layers/SplitterLayer.cpp b/src/armnn/layers/SplitterLayer.cpp
index dc04b3fd15..e8452462f3 100644
--- a/src/armnn/layers/SplitterLayer.cpp
+++ b/src/armnn/layers/SplitterLayer.cpp
@@ -101,8 +101,10 @@ void SplitterLayer::CreateTensors(const FactoryType& factory)
 }
 
 void SplitterLayer::CreateTensorHandles(const TensorHandleFactoryRegistry& registry,
-                                        const IWorkloadFactory& workloadFactory)
+                                        const IWorkloadFactory& workloadFactory,
+                                        const bool IsMemoryManaged)
 {
+    boost::ignore_unused(IsMemoryManaged);
     OutputSlot& slot = GetOutputSlot(0);
     ITensorHandleFactory::FactoryId factoryId = slot.GetTensorHandleFactoryId();
 
diff --git a/src/armnn/layers/SplitterLayer.hpp b/src/armnn/layers/SplitterLayer.hpp
index 9c684d479f..26d5b76a2d 100644
--- a/src/armnn/layers/SplitterLayer.hpp
+++ b/src/armnn/layers/SplitterLayer.hpp
@@ -24,9 +24,11 @@ public:
     /// otherwise creates tensor handlers.
     /// @param [in] registry Contains all the registered tensor handle factories available for use.
     /// @param [in] factory The workload factory which will create the workload.
+    /// @param [in] IsMemoryManaged Determine whether or not to assign a memory manager during creation
     //virtual void CreateTensorHandles(Graph& graph, const IWorkloadFactory& factory) override;
     virtual void CreateTensorHandles(const TensorHandleFactoryRegistry& registry,
-                                     const IWorkloadFactory& factory) override;
+                                     const IWorkloadFactory& factory,
+                                     const bool IsMemoryManaged = true) override;
 
     /// Creates a dynamically-allocated copy of this layer.
     /// @param [in] graph The graph into which this layer is being cloned.