commit 906f94631aa7ef590b9d8ff45507e818a0d1ac2c
author Jim Flynn <jim.flynn@arm.com> Fri May 10 13:55:21 2019 +0100
committer Matteo Martincigh <matteo.martincigh@arm.com> Tue May 14 10:35:28 2019 +0000
tree bbb9d805b9424f92fe4f6a7030878e101873b03f
parent 305620201159eb47e005a46d60f80c6a2c763d51

IVGCVSW-3076 Add ConcatLayer methods to public API

!android-nn-driver:1120

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

src/armnnCaffeParser/CaffeParser.cpp

diff --git a/src/armnnCaffeParser/CaffeParser.cpp b/src/armnnCaffeParser/CaffeParser.cpp
index 3cc0fb9..90579e6 100644
--- a/src/armnnCaffeParser/CaffeParser.cpp
+++ b/src/armnnCaffeParser/CaffeParser.cpp
@@ -589,7 +589,7 @@
     outputShape.set_dim(1, mergeDimSizes[1]);
 
     // Finally add the merge layer
-    IConnectableLayer* mergerLayer = m_Network->AddMergerLayer(mergeDesc, layerParam.name().c_str());
+    IConnectableLayer* mergerLayer = m_Network->AddConcatLayer(mergeDesc, layerParam.name().c_str());
 
     if (!mergerLayer)
     {
@@ -1325,7 +1325,7 @@
     }
     mergeDimSizes[concatDim] = mergeDim;
 
-    armnn::IConnectableLayer* concatlayer = m_Network->AddMergerLayer(concatDescriptor, layerParam.name().c_str());
+    armnn::IConnectableLayer* concatlayer = m_Network->AddConcatLayer(concatDescriptor, layerParam.name().c_str());
     for (unsigned int i = 0; i < numInputs; ++i)
     {
         armnn::IOutputSlot& outputSlot = GetArmnnOutputSlotForCaffeTop(layerParam.bottom(boost::numeric_cast<int>(i)));