From e242f2dc646f41e9162aaaf74e057ce39fcb92df Mon Sep 17 00:00:00 2001
From: Jim Flynn <jim.flynn@arm.com>
Date: Wed, 22 May 2019 14:24:13 +0100
Subject: IVGCVSW-3119 Rename MergerLayer to ConcatLayer

!android-nn-driver:1210

Change-Id: I940b3b9e421c92bfd55ae996f7bc54ac077f2604
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
---
 src/armnnSerializer/ArmnnSchema.fbs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/armnnSerializer/ArmnnSchema.fbs')

diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs
index 0419c4b883..5a001de545 100644
--- a/src/armnnSerializer/ArmnnSchema.fbs
+++ b/src/armnnSerializer/ArmnnSchema.fbs
@@ -120,7 +120,8 @@ enum LayerType : uint {
     Quantize = 35,
     Dequantize = 36,
     Merge = 37,
-    Switch = 38
+    Switch = 38,
+    Concat = 39
 }
 
 // Base layer table to be used as part of other layers
@@ -442,6 +443,11 @@ table StridedSliceDescriptor {
     dataLayout:DataLayout;
 }
 
+table ConcatLayer {
+    base:LayerBase;
+    descriptor:OriginsDescriptor;
+}
+
 table MergerLayer {
     base:LayerBase;
     descriptor:OriginsDescriptor;
@@ -577,7 +583,8 @@ union Layer {
     QuantizeLayer,
     DequantizeLayer,
     MergeLayer,
-    SwitchLayer
+    SwitchLayer,
+    ConcatLayer
 }
 
 table AnyLayer {
-- 
cgit v1.2.1