IVGCVSW-3076 Add ConcatLayer methods to public API

!android-nn-driver:1120

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

1 files changed, 11 insertions, 0 deletions

diff --git a/include/armnn/INetwork.hpp b/include/armnn/INetwork.hpp
index 7141770298..bae6e94955 100644
--- a/include/armnn/INetwork.hpp
+++ b/include/armnn/INetwork.hpp
@@ -4,6 +4,7 @@
 //
 #pragma once
 
+#include <armnn/Deprecated.hpp>
 #include <armnn/DescriptorsFwd.hpp>
 #include <armnn/ILayerVisitor.hpp>
 #include <armnn/NetworkFwd.hpp>
@@ -100,6 +101,15 @@ public:
     /// @return - Interface for configuring the layer.
     virtual IConnectableLayer* AddInputLayer(LayerBindingId id, const char* name = nullptr) = 0;
 
+    /// Adds a concatenation layer to the network.
+    /// @param mergerDescriptor - WindowsDescriptor to configure the concatenation process. Number of Views must
+    ///                           be equal to the number of inputs, and their order must match - e.g. first view
+    ///                           corresponds to the first input, second view to the second input, etc....
+    /// @param name - Optional name for the layer.
+    /// @return - Interface for configuring the layer.
+    virtual IConnectableLayer* AddConcatLayer(const OriginsDescriptor& mergerDescriptor,
+                                              const char* name = nullptr) = 0;
+
     /// Adds a 2D convolution layer to the network.
     /// @param convolution2dDescriptor - Description of the 2D convolution layer.
     /// @param weights - Tensor for the weights data.
@@ -248,6 +258,7 @@ public:
     ///                           the first input, second view to the second input, etc....
     /// @param name - Optional name for the layer.
     /// @return - Interface for configuring the layer.
+    ARMNN_DEPRECATED_MSG("Use AddConcatLayer instead")
     virtual IConnectableLayer* AddMergerLayer(const OriginsDescriptor& mergerDescriptor,
         const char* name = nullptr) = 0;