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/Serializer.cpp | |
| 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/Serializer.cpp')
| -rw-r--r-- | src/armnnSerializer/Serializer.cpp | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index c9a3022b8d..5a095d9887 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -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 // #include "Serializer.hpp" @@ -533,6 +533,21 @@ void SerializerStrategy::SerializeDivisionLayer(const armnn::IConnectableLayer* CreateAnyLayer(fbDivisionLayer.o, serializer::Layer::Layer_DivisionLayer); } +void SerializerStrategy::SerializeElementwiseBinaryLayer(const armnn::IConnectableLayer* layer, + const armnn::ElementwiseBinaryDescriptor& descriptor, + const char* name) +{ + IgnoreUnused(name); + + auto fbBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_ElementwiseBinary); + auto fbDescriptor = serializer::CreateElementwiseBinaryDescriptor( + m_flatBufferBuilder, + GetFlatBufferBinaryOperation(descriptor.m_Operation)); + + auto fbLayer = serializer::CreateElementwiseBinaryLayer(m_flatBufferBuilder, fbBaseLayer, fbDescriptor); + CreateAnyLayer(fbLayer.o, serializer::Layer::Layer_ElementwiseBinaryLayer); +} + void SerializerStrategy::SerializeElementwiseUnaryLayer(const armnn::IConnectableLayer* layer, const armnn::ElementwiseUnaryDescriptor& descriptor, const char* name) @@ -2119,6 +2134,13 @@ void SerializerStrategy::ExecuteStrategy(const armnn::IConnectableLayer* layer, SerializeDivisionLayer(layer, name); break; } + case armnn::LayerType::ElementwiseBinary : + { + const armnn::ElementwiseBinaryDescriptor& layerDescriptor = + static_cast<const armnn::ElementwiseBinaryDescriptor&>(descriptor); + SerializeElementwiseBinaryLayer(layer, layerDescriptor, name); + break; + } case armnn::LayerType::ElementwiseUnary : { const armnn::ElementwiseUnaryDescriptor& layerDescriptor = |