diff options
author | Jim Flynn <jim.flynn@arm.com> | 2019-02-28 10:40:49 +0000 |
---|---|---|
committer | Jim Flynn <jim.flynn@arm.com> | 2019-03-07 15:43:47 +0000 |
commit | ac25a1beda8da71a82c0cf2795e2a6eaaeaa26b1 (patch) | |
tree | 2f186eac90aa72f224bd0eccaee3cffa83dea164 /src/armnnSerializer/ArmnnSchema.fbs | |
parent | d469faf863f4ecd3ba56f27e51884ef0dfeac7bf (diff) | |
download | armnn-ac25a1beda8da71a82c0cf2795e2a6eaaeaa26b1.tar.gz |
IVGCVSW-2697 Add Serialize/Deserialize for the Merger Layer
* Force generation of schema header in every build
* Also fixed typo in OriginsDescriptor comment (Descriptors.hpp)
* Added Serialize/Deserialize check on Addition Layer
* Added Serialize/Deserialize check on Floor Layer
* Added Serialize/Deserialize check on Minimum Layer
* Added Serialize/Deserialize check on Maximum Layer
* Added Serialize/Deserialize check on Multiplication Layer
* Added Serialize/Deserialize check on Division Layer
Change-Id: I1358ea4db7ca506d8bcec2ee64e1fbad6005e723
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src/armnnSerializer/ArmnnSchema.fbs')
-rw-r--r-- | src/armnnSerializer/ArmnnSchema.fbs | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs index 01142ff391..a5fb4b6697 100644 --- a/src/armnnSerializer/ArmnnSchema.fbs +++ b/src/armnnSerializer/ArmnnSchema.fbs @@ -110,7 +110,8 @@ enum LayerType : uint { Subtraction = 26, StridedSlice = 27, Gather = 28, - Mean = 29 + Mean = 29, + Merger = 30 } // Base layer table to be used as part of other layers @@ -415,6 +416,22 @@ table StridedSliceDescriptor { dataLayout:DataLayout; } +table MergerLayer { + base:LayerBase; + descriptor:OriginsDescriptor; +} + +table UintVector { + data:[uint]; +} + +table OriginsDescriptor { + concatAxis:uint; + numViews:uint; + numDimensions:uint; + viewOrigins:[UintVector]; +} + union Layer { ActivationLayer, AdditionLayer, @@ -445,7 +462,8 @@ union Layer { SubtractionLayer, StridedSliceLayer, GatherLayer, - MeanLayer + MeanLayer, + MergerLayer } table AnyLayer { |