IVGCVSW-2709 Serialize / de-serialize the Splitter layer

* fixed typo in Ref Merger Workload comment
* fixed typo in ViewsDescriptor comment
* made the origins descriptor accessable in the ViewsDescriptor
  (needed for serialization)
* based the unit test on the use of the splitter in the CaffeParser

Change-Id: I3e716839adb4eee5a695633377b49e7e18ec2aa9
Signed-off-by: Ferran Balaguer <ferran.balaguer@arm.com>
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Signed-off-by: Jim Flynn <jim.flynn@arm.com>

1 files changed, 14 insertions, 2 deletions

diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs
index 36389b780b..40ee7a5e45 100644
--- a/src/armnnSerializer/ArmnnSchema.fbs
+++ b/src/armnnSerializer/ArmnnSchema.fbs
@@ -112,7 +112,8 @@ enum LayerType : uint {
     Gather = 28,
     Mean = 29,
     Merger = 30,
-    L2Normalization = 31
+    L2Normalization = 31,
+    Splitter = 32
 }
 
 // Base layer table to be used as part of other layers
@@ -442,6 +443,16 @@ table OriginsDescriptor {
    viewOrigins:[UintVector];
 }
 
+table ViewsDescriptor {
+   origins:OriginsDescriptor;
+   viewSizes:[UintVector];
+}
+
+table SplitterLayer {
+   base:LayerBase;
+   descriptor:ViewsDescriptor;
+}
+
 union Layer {
     ActivationLayer,
     AdditionLayer,
@@ -474,7 +485,8 @@ union Layer {
     GatherLayer,
     MeanLayer,
     MergerLayer,
-    L2NormalizationLayer
+    L2NormalizationLayer,
+    SplitterLayer
 }
 
 table AnyLayer {