diff options
author | Jim Flynn <jim.flynn@arm.com> | 2019-05-22 14:24:13 +0100 |
---|---|---|
committer | Jim Flynn <jim.flynn@arm.com> | 2019-05-28 17:50:33 +0100 |
commit | e242f2dc646f41e9162aaaf74e057ce39fcb92df (patch) | |
tree | d6c49b559c34d1d306b1e901501dded1c18f71c5 /src/armnnSerializer/ArmnnSchema.fbs | |
parent | 2f2778f36e59537bbd47fb8b21e73c6c5a949584 (diff) | |
download | armnn-e242f2dc646f41e9162aaaf74e057ce39fcb92df.tar.gz |
IVGCVSW-3119 Rename MergerLayer to ConcatLayer
!android-nn-driver:1210
Change-Id: I940b3b9e421c92bfd55ae996f7bc54ac077f2604
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src/armnnSerializer/ArmnnSchema.fbs')
-rw-r--r-- | src/armnnSerializer/ArmnnSchema.fbs | 11 |
1 files changed, 9 insertions, 2 deletions
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 { |