aboutsummaryrefslogtreecommitdiff
path: root/src/armnnSerializer
diff options
context:
space:
mode:
authorJohn Mcloughlin <john.mcloughlin@arm.com>2023-05-15 17:03:49 +0100
committerJohn Mcloughlin <john.mcloughlin@arm.com>2023-05-17 12:29:54 +0100
commit0ec008761ab26110dcb108d544be4040a14fd403 (patch)
tree87bbc145ff2a4ea3221440b0fbd7c91a5b8a7c91 /src/armnnSerializer
parent499ebd917d8399f0a9d4d7e6e40a0ec321a4bab4 (diff)
downloadarmnn-0ec008761ab26110dcb108d544be4040a14fd403.tar.gz
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 <john.mcloughlin@arm.com> Change-Id: I537158127f602f0c41ca0402aa31655cd3bd4281
Diffstat (limited to 'src/armnnSerializer')
-rw-r--r--src/armnnSerializer/ArmnnSchema.fbs4
-rw-r--r--src/armnnSerializer/SerializerUtils.cpp4
-rw-r--r--src/armnnSerializer/test/SerializerTests.cpp3
3 files changed, 9 insertions, 2 deletions
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<op> allBinaryOperations = {op::Add, op::Div, op::Maximum, op::Minimum, op::Mul, op::Sub};
+ std::initializer_list<op> allBinaryOperations =
+ {op::Add, op::Div, op::Maximum, op::Minimum, op::Mul, op::Power, op::SqDiff, op::Sub};
for (auto binaryOperation : allBinaryOperations)
{