diff options
author | Mike Kelly <mike.kelly@arm.com> | 2023-03-08 13:47:17 +0000 |
---|---|---|
committer | Francis Murtagh <francis.murtagh@arm.com> | 2023-03-14 16:40:09 +0000 |
commit | 3ec3077b4eaedcc0c20ab5774bdbe365da541445 (patch) | |
tree | d601d2000897dec8691bf64cbddc9036f26b8034 /src/armnnSerializer/ArmnnSchema.fbs | |
parent | a088cd00b3cce672d26cdcb4965fc2a86b48f339 (diff) | |
download | armnn-3ec3077b4eaedcc0c20ab5774bdbe365da541445.tar.gz |
IVGCVSW-3808 Add ElementwiseBinaryLayer
!android-nn-driver:9329
* Added ElementwiseBinaryLayer that can represent all ElementwiseBinary
operations including Add, Div, Sub, Maximum, Mul and Minimum.
* Updated Delegate to use ElementwiseBinaryLayer instead of the Add,
Div, Sub, Maximum, Mul and Minimum layers.
* Updated Deserializer to use ElementwiseBinaryLayer instead of the Add,
Div, Sub, Maximum, Mul and Minimum layers.
* Updated OnnxParser to use ElementwiseBinaryLayer instead of the Add
layer.
* Updated TfLiteParser to use ElementwiseBinaryLayer instead of the Add,
Div, Sub, Maximum, Mul and Minimum layers.
* Updated CL and Neon tests to use ElementwiseBinaryLayer.
* Updated CL and Neon Backend Specific Optimizations to accept
ElementBinaryLayers as well as Add, Div, Mul, Sub, Maximum and Minimum
layers.
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I7cbb96b60eb01f0e2b57b0541016d48a08b86c75
Diffstat (limited to 'src/armnnSerializer/ArmnnSchema.fbs')
-rw-r--r-- | src/armnnSerializer/ArmnnSchema.fbs | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs index 2dbfd85b23..fb3bc018bb 100644 --- a/src/armnnSerializer/ArmnnSchema.fbs +++ b/src/armnnSerializer/ArmnnSchema.fbs @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2017,2019-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -183,6 +183,7 @@ enum LayerType : uint { Pooling3d = 66, GatherNd = 67, BatchMatMul = 68, + ElementwiseBinary = 69, } // Base layer table to be used as part of other layers @@ -324,6 +325,24 @@ table DivisionLayer { base:LayerBase; } +enum BinaryOperation : byte { + Add = 0, + Div = 1, + Maximum = 2, + Minimum = 3, + Mul = 4, + Sub = 5 +} + +table ElementwiseBinaryDescriptor { + operation:BinaryOperation; +} + +table ElementwiseBinaryLayer { + base:LayerBase; + descriptor:ElementwiseBinaryDescriptor; +} + enum UnaryOperation : byte { Abs = 0, Rsqrt = 1, @@ -1094,6 +1113,7 @@ union Layer { Pooling3dLayer, GatherNdLayer, BatchMatMulLayer, + ElementwiseBinaryLayer, } table AnyLayer { |