commit 073d7a3e829dd52f47bcd4e2d0ab4b04cc811b32
author Jim Flynn <jim.flynn@arm.com> Mon May 13 13:52:56 2019 +0100
committer David Monahan <david.monahan@arm.com> Tue May 14 07:20:40 2019 +0000
tree cb4095c697f5786a67454bc9877c3bb3ec4cbeb1
parent a3e23ca280eaf119e559869fee19d58cc4497e8d

IVGCVSW-3076 Add ConcatLayer methods to public API

!armnn:1119

Change-Id: Ic187f49427e38345f279537ed10a9275980c1360
Signed-off-by: Jim Flynn <jim.flynn@arm.com>

1.0/HalPolicy.cpp

diff --git a/1.0/HalPolicy.cpp b/1.0/HalPolicy.cpp
index 158f0e3..fa29f86 100644
--- a/1.0/HalPolicy.cpp
+++ b/1.0/HalPolicy.cpp
@@ -292,7 +292,7 @@
     std::transform(inputHandles.begin(), inputHandles.end(), std::back_inserter(inputTensorInfos),
         [](const LayerInputHandle& h) -> const armnn::TensorInfo*{ return &h.GetTensorInfo(); });
     if (!IsLayerSupportedForAnyBackend(__func__,
-                                       armnn::IsMergerSupported,
+                                       armnn::IsConcatSupported,
                                        data.m_Backends,
                                        inputTensorInfos,
                                        outputInfo,
@@ -301,7 +301,7 @@
         return false;
     }
 
-    armnn::IConnectableLayer* layer = data.m_Network->AddMergerLayer(mergerDescriptor);
+    armnn::IConnectableLayer* layer = data.m_Network->AddConcatLayer(mergerDescriptor);
     assert(layer != nullptr);
     layer->GetOutputSlot(0).SetTensorInfo(outputInfo);