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 /include/armnn/Descriptors.hpp | |
| 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 'include/armnn/Descriptors.hpp')
| -rw-r--r-- | include/armnn/Descriptors.hpp | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp index 7c6942ce58..9ff894f1b0 100644 --- a/include/armnn/Descriptors.hpp +++ b/include/armnn/Descriptors.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2017-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #pragma once @@ -105,6 +105,26 @@ struct ComparisonDescriptor : BaseDescriptor ComparisonOperation m_Operation; }; +/// A ElementwiseBinaryDescriptor for the ElementwiseBinaryLayer +struct ElementwiseBinaryDescriptor : BaseDescriptor +{ + ElementwiseBinaryDescriptor() + : ElementwiseBinaryDescriptor(BinaryOperation::Add) + {} + + ElementwiseBinaryDescriptor(BinaryOperation operation) + : m_Operation(operation) + {} + + bool operator ==(const ElementwiseBinaryDescriptor &rhs) const + { + return m_Operation == rhs.m_Operation; + } + + /// Specifies the elementwiseBinary operation to execute + BinaryOperation m_Operation; +}; + /// A ElementwiseUnaryDescriptor for the ElementwiseUnaryLayer struct ElementwiseUnaryDescriptor : BaseDescriptor { |