From 3ec3077b4eaedcc0c20ab5774bdbe365da541445 Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Wed, 8 Mar 2023 13:47:17 +0000 Subject: 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 Signed-off-by: Mike Kelly Change-Id: I7cbb96b60eb01f0e2b57b0541016d48a08b86c75 --- include/armnn/TypesUtils.hpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'include/armnn/TypesUtils.hpp') diff --git a/include/armnn/TypesUtils.hpp b/include/armnn/TypesUtils.hpp index 4dd5360591..fbe9e8f670 100644 --- a/include/armnn/TypesUtils.hpp +++ b/include/armnn/TypesUtils.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2018-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #pragma once @@ -72,6 +72,20 @@ constexpr char const* GetComparisonOperationAsCString(ComparisonOperation operat } } +constexpr char const* GetBinaryOperationAsCString(BinaryOperation operation) +{ + switch (operation) + { + case BinaryOperation::Add: return "Add"; + case BinaryOperation::Div: return "Div"; + case BinaryOperation::Maximum: return "Maximum"; + case BinaryOperation::Minimum: return "Minimum"; + case BinaryOperation::Mul: return "Mul"; + case BinaryOperation::Sub: return "Sub"; + default: return "Unknown"; + } +} + constexpr char const* GetUnaryOperationAsCString(UnaryOperation operation) { switch (operation) -- cgit v1.2.1