commit e242f2dc646f41e9162aaaf74e057ce39fcb92df
author Jim Flynn <jim.flynn@arm.com> Wed May 22 14:24:13 2019 +0100
committer Jim Flynn <jim.flynn@arm.com> Tue May 28 17:50:33 2019 +0100
tree d6c49b559c34d1d306b1e901501dded1c18f71c5
parent 2f2778f36e59537bbd47fb8b21e73c6c5a949584

IVGCVSW-3119 Rename MergerLayer to ConcatLayer

!android-nn-driver:1210

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

src/armnn/Network.cpp

diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp
index b80e0e7..6bd365b 100644
--- a/src/armnn/Network.cpp
+++ b/src/armnn/Network.cpp
@@ -603,12 +603,10 @@
     return AddFullyConnectedLayerImpl(fullyConnectedDescriptor, weights, optionalBiases, name);
 }
 
-IConnectableLayer* Network::AddConcatLayer(const OriginsDescriptor& mergerDescriptor,
+IConnectableLayer* Network::AddConcatLayer(const ConcatDescriptor& concatDescriptor,
                                            const char* name)
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
-    return AddMergerLayer(mergerDescriptor, name);
-    ARMNN_NO_DEPRECATE_WARN_END
+    return m_Graph->AddLayer<ConcatLayer>(concatDescriptor, name);
 }
 
 IConnectableLayer* Network::AddConvolution2dLayerImpl(const Convolution2dDescriptor& convolution2dDescriptor,
@@ -766,10 +764,10 @@
     return m_Graph->AddLayer<MinimumLayer>(name);
 }
 
-IConnectableLayer* Network::AddMergerLayer(const OriginsDescriptor& mergerDescriptor,
+IConnectableLayer* Network::AddMergerLayer(const MergerDescriptor& mergerDescriptor,
                                            const char* name)
 {
-    return m_Graph->AddLayer<MergerLayer>(mergerDescriptor, name);
+    return AddConcatLayer(mergerDescriptor, name);
 }
 
 IConnectableLayer* Network::AddAdditionLayer(const char* name)