aboutsummaryrefslogtreecommitdiff
path: root/src/armnn/layers/ConcatLayer.cpp
diff options
context:
space:
mode:
authorNarumol Prangnawarat <narumol.prangnawarat@arm.com>2020-08-17 17:02:12 +0100
committerNarumol Prangnawarat <narumol.prangnawarat@arm.com>2020-08-17 18:46:28 +0000
commitef6f300928e54cbe6bbfb9dfeb26c2db56ee5dc9 (patch)
tree7f9be0980ff5cede5ff8b25fced44f3c5cc0bd70 /src/armnn/layers/ConcatLayer.cpp
parent35c31c04a9805082be32474211dcd62b7629ed2b (diff)
downloadarmnn-ef6f300928e54cbe6bbfb9dfeb26c2db56ee5dc9.tar.gz
IVGCVSW-5114 Enable memory import in TfLiteYoloV3Big App
* Enable memory import in TfLiteYoloV3Big App * Add isMemoryManaged flag to Concat and Splitter layers Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com> Change-Id: I7e00f5da2a016c09d480b744fb17ea5611af8365
Diffstat (limited to 'src/armnn/layers/ConcatLayer.cpp')
-rw-r--r--src/armnn/layers/ConcatLayer.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/armnn/layers/ConcatLayer.cpp b/src/armnn/layers/ConcatLayer.cpp
index 5b6d25256b..0118426954 100644
--- a/src/armnn/layers/ConcatLayer.cpp
+++ b/src/armnn/layers/ConcatLayer.cpp
@@ -36,12 +36,14 @@ std::unique_ptr<IWorkload> ConcatLayer::CreateWorkload(const IWorkloadFactory& f
}
template<typename FactoryType>
-void ConcatLayer::CreateTensors(const TensorHandleFactoryRegistry& registry, const FactoryType& factory)
+void ConcatLayer::CreateTensors(const TensorHandleFactoryRegistry& registry,
+ const FactoryType& factory,
+ bool isMemoryManaged)
{
//If sub tensors are supported then the concat
//just needs to make sure that the outputs of the prev layer
//are made subtensors of the output of the concat layer.
- m_OutputHandlers[0].CreateTensorHandles(factory);
+ m_OutputHandlers[0].CreateTensorHandles(factory, isMemoryManaged);
if (factory.SupportsSubTensors())
{
@@ -168,21 +170,20 @@ void ConcatLayer::CreateTensors(const TensorHandleFactoryRegistry& registry, con
void ConcatLayer::CreateTensorHandles(const TensorHandleFactoryRegistry& registry,
const IWorkloadFactory& workloadFactory,
- const bool IsMemoryManaged)
+ const bool isMemoryManaged)
{
- IgnoreUnused(IsMemoryManaged);
OutputSlot& slot = GetOutputSlot(0);
ITensorHandleFactory::FactoryId factoryId = slot.GetTensorHandleFactoryId();
if (factoryId == ITensorHandleFactory::LegacyFactoryId)
{
- CreateTensors(registry, workloadFactory);
+ CreateTensors(registry, workloadFactory, isMemoryManaged);
}
else
{
ITensorHandleFactory* handleFactory = registry.GetFactory(factoryId);
ARMNN_ASSERT(handleFactory);
- CreateTensors(registry, *handleFactory);
+ CreateTensors(registry, *handleFactory, isMemoryManaged);
}
}