From 0ec008761ab26110dcb108d544be4040a14fd403 Mon Sep 17 00:00:00 2001 From: John Mcloughlin Date: Mon, 15 May 2023 17:03:49 +0100 Subject: IVGCVSW-7400 POW IVGCVSW-7278 SQUARED_DIFFERENCE. * Added 2 new operators as ElementWiseBinary ops * Ref End to End and unit tests * Serialize and Deserialize tests * Delegate and Opaque Delegate tests * TfLite Parser tests Signed-off-by: John Mcloughlin Change-Id: I537158127f602f0c41ca0402aa31655cd3bd4281 --- src/armnnSerializer/ArmnnSchema.fbs | 4 +++- src/armnnSerializer/SerializerUtils.cpp | 4 ++++ src/armnnSerializer/test/SerializerTests.cpp | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'src/armnnSerializer') diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs index a8b5d72da8..84149bd60d 100644 --- a/src/armnnSerializer/ArmnnSchema.fbs +++ b/src/armnnSerializer/ArmnnSchema.fbs @@ -331,7 +331,9 @@ enum BinaryOperation : byte { Maximum = 2, Minimum = 3, Mul = 4, - Sub = 5 + Sub = 5, + SqDiff = 6, + Power = 7 } table ElementwiseBinaryDescriptor { diff --git a/src/armnnSerializer/SerializerUtils.cpp b/src/armnnSerializer/SerializerUtils.cpp index 2188fdccda..970c415117 100644 --- a/src/armnnSerializer/SerializerUtils.cpp +++ b/src/armnnSerializer/SerializerUtils.cpp @@ -123,6 +123,10 @@ armnnSerializer::BinaryOperation GetFlatBufferBinaryOperation(armnn::BinaryOpera return armnnSerializer::BinaryOperation::BinaryOperation_Mul; case armnn::BinaryOperation::Sub: return armnnSerializer::BinaryOperation::BinaryOperation_Sub; + case armnn::BinaryOperation::SqDiff: + return armnnSerializer::BinaryOperation::BinaryOperation_SqDiff; + case armnn::BinaryOperation::Power: + return armnnSerializer::BinaryOperation::BinaryOperation_Power; default: throw armnn::InvalidArgumentException("Elementwise Binary operation unknown"); } diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index 6b9b5df1e6..bd8a76a103 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -1012,7 +1012,8 @@ void SerializeElementwiseBinaryTest(armnn::BinaryOperation binaryOperation) TEST_CASE("SerializeElementwiseBinary") { using op = armnn::BinaryOperation; - std::initializer_list allBinaryOperations = {op::Add, op::Div, op::Maximum, op::Minimum, op::Mul, op::Sub}; + std::initializer_list allBinaryOperations = + {op::Add, op::Div, op::Maximum, op::Minimum, op::Mul, op::Power, op::SqDiff, op::Sub}; for (auto binaryOperation : allBinaryOperations) { -- cgit v1.2.1