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/armnnSerializer/test/SerializerTests.cpp

diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp
index b022668..4b3a09e 100644
--- a/src/armnnSerializer/test/SerializerTests.cpp
+++ b/src/armnnSerializer/test/SerializerTests.cpp
@@ -1276,7 +1276,9 @@
     armnn::INetworkPtr network = armnn::INetwork::Create();
     armnn::IConnectableLayer* const inputLayerOne = network->AddInputLayer(0);
     armnn::IConnectableLayer* const inputLayerTwo = network->AddInputLayer(1);
+    ARMNN_NO_DEPRECATE_WARN_BEGIN
     armnn::IConnectableLayer* const mergerLayer = network->AddMergerLayer(descriptor, layerName.c_str());
+    ARMNN_NO_DEPRECATE_WARN_END
     armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0);
 
     inputLayerOne->GetOutputSlot(0).Connect(mergerLayer->GetInputSlot(0));