aboutsummaryrefslogtreecommitdiff
path: root/src/armnn/Network.cpp
diff options
context:
space:
mode:
authorJim Flynn <jim.flynn@arm.com>2019-05-10 13:55:21 +0100
committerMatteo Martincigh <matteo.martincigh@arm.com>2019-05-14 10:35:28 +0000
commit906f94631aa7ef590b9d8ff45507e818a0d1ac2c (patch)
treebbb9d805b9424f92fe4f6a7030878e101873b03f /src/armnn/Network.cpp
parent305620201159eb47e005a46d60f80c6a2c763d51 (diff)
downloadarmnn-906f94631aa7ef590b9d8ff45507e818a0d1ac2c.tar.gz
IVGCVSW-3076 Add ConcatLayer methods to public API
!android-nn-driver:1120 Change-Id: I5192fa3deb4ea9766d38ad0bf4dfbfa0b4924c41 Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src/armnn/Network.cpp')
-rw-r--r--src/armnn/Network.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp
index c3f29d4f3b..087ec0f8e9 100644
--- a/src/armnn/Network.cpp
+++ b/src/armnn/Network.cpp
@@ -602,6 +602,14 @@ IConnectableLayer* Network::AddFullyConnectedLayer(const FullyConnectedDescripto
return AddFullyConnectedLayerImpl(fullyConnectedDescriptor, weights, optionalBiases, name);
}
+IConnectableLayer* Network::AddConcatLayer(const OriginsDescriptor& mergerDescriptor,
+ const char* name)
+{
+ ARMNN_NO_DEPRECATE_WARN_BEGIN
+ return AddMergerLayer(mergerDescriptor, name);
+ ARMNN_NO_DEPRECATE_WARN_END
+}
+
IConnectableLayer* Network::AddConvolution2dLayerImpl(const Convolution2dDescriptor& convolution2dDescriptor,
const ConstTensor& weights,
const Optional<ConstTensor>& biases,
@@ -762,7 +770,7 @@ IConnectableLayer* Network::AddMinimumLayer(const char* name)
}
IConnectableLayer* Network::AddMergerLayer(const OriginsDescriptor& mergerDescriptor,
- const char* name)
+ const char* name)
{
return m_Graph->AddLayer<MergerLayer>(mergerDescriptor, name);
}