From 93f0ad0016a6450670fbf650568f5724c7bbb63e Mon Sep 17 00:00:00 2001 From: Teresa Charlin Date: Thu, 23 Mar 2023 15:28:02 +0000 Subject: GitHub #640 Add support for CEIL operator * Reference workload * TfLite Delegate * TfLite Parser * Serializer and Deserializer * Changed fallback tests in delegate to use COS instead of CEIL Signed-off-by: Teresa Charlin Signed-off-by: Mike Kelly Change-Id: I36e0dbff33694182d1dba0c95d463506428e2f04 --- src/armnnDeserializer/Deserializer.cpp | 2 ++ .../test/DeserializeElementwiseUnary.cpp | 19 +++++++++++++++- src/armnnSerializer/ArmnnSchema.fbs | 3 ++- src/armnnSerializer/SerializerUtils.cpp | 2 ++ src/armnnSerializer/test/SerializerTests.cpp | 2 +- src/armnnTfLiteParser/TfLiteParser.cpp | 6 ++++++ src/armnnTfLiteParser/TfLiteParser.hpp | 1 + src/armnnTfLiteParser/test/ElementWiseUnary.cpp | 13 ++++++++++- src/backends/reference/workloads/Ceil.hpp | 25 ++++++++++++++++++++++ .../reference/workloads/ElementwiseFunction.cpp | 5 +++-- .../workloads/RefElementwiseUnaryWorkload.cpp | 9 +++++++- 11 files changed, 80 insertions(+), 7 deletions(-) create mode 100644 src/backends/reference/workloads/Ceil.hpp (limited to 'src') diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index ed921880e0..3bd24bd9dd 100644 --- a/src/armnnDeserializer/Deserializer.cpp +++ b/src/armnnDeserializer/Deserializer.cpp @@ -592,6 +592,8 @@ armnn::UnaryOperation ToElementwiseUnaryOperation(armnnSerializer::UnaryOperatio { case armnnSerializer::UnaryOperation::UnaryOperation_Abs: return armnn::UnaryOperation::Abs; + case armnnSerializer::UnaryOperation::UnaryOperation_Ceil: + return armnn::UnaryOperation::Ceil; case armnnSerializer::UnaryOperation::UnaryOperation_Rsqrt: return armnn::UnaryOperation::Rsqrt; case armnnSerializer::UnaryOperation::UnaryOperation_Sqrt: diff --git a/src/armnnDeserializer/test/DeserializeElementwiseUnary.cpp b/src/armnnDeserializer/test/DeserializeElementwiseUnary.cpp index 0a89f48f18..b62fb07ca4 100644 --- a/src/armnnDeserializer/test/DeserializeElementwiseUnary.cpp +++ b/src/armnnDeserializer/test/DeserializeElementwiseUnary.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2021 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2021,2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -170,4 +170,21 @@ FIXTURE_TEST_CASE(SimpleSinTest, SimpleSinFixture) {{"OutputLayer", {0.50636564111f, -0.23237376165f, -0.76249375473f, -0.4794255386f, 0.0f, 0.99988301347f, 0.35905835402f, -0.50636564111f}}}); } + +struct SimpleCeilFixture : ElementwiseUnaryFixture +{ + SimpleCeilFixture() : ElementwiseUnaryFixture("[ 1, 2, 2, 2 ]", // inputShape + "[ 1, 2, 2, 2 ]", // outputShape + "Float32", // dataType + "Ceil") // unaryOperation + {} +}; + +FIXTURE_TEST_CASE(SimpleCeilTest, SimpleCeilFixture) +{ + RunTest<4, armnn::DataType::Float32>( + 0, + {{"InputLayer", {-100.0f, -50.5f, -25.9999f, -0.5f, 0.0f, 1.5555f, 25.5f, 100.0f}}}, + {{"OutputLayer", {-100.0f, -50.0f, -25.0f, 0.0f, 0.0f, 2.0f, 26.0f, 100.0f}}}); +} } \ No newline at end of file diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs index fb3bc018bb..a8b5d72da8 100644 --- a/src/armnnSerializer/ArmnnSchema.fbs +++ b/src/armnnSerializer/ArmnnSchema.fbs @@ -351,7 +351,8 @@ enum UnaryOperation : byte { Neg = 4, LogicalNot = 5, Log = 6, - Sin = 7 + Sin = 7, + Ceil = 8 } table ElementwiseUnaryDescriptor { diff --git a/src/armnnSerializer/SerializerUtils.cpp b/src/armnnSerializer/SerializerUtils.cpp index 703f56ff5c..2188fdccda 100644 --- a/src/armnnSerializer/SerializerUtils.cpp +++ b/src/armnnSerializer/SerializerUtils.cpp @@ -134,6 +134,8 @@ armnnSerializer::UnaryOperation GetFlatBufferUnaryOperation(armnn::UnaryOperatio { case armnn::UnaryOperation::Abs: return armnnSerializer::UnaryOperation::UnaryOperation_Abs; + case armnn::UnaryOperation::Ceil: + return armnnSerializer::UnaryOperation::UnaryOperation_Ceil; case armnn::UnaryOperation::Rsqrt: return armnnSerializer::UnaryOperation::UnaryOperation_Rsqrt; case armnn::UnaryOperation::Sqrt: diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index 90d778991b..6b9b5df1e6 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -1056,7 +1056,7 @@ void SerializeElementwiseUnaryTest(armnn::UnaryOperation unaryOperation) TEST_CASE("SerializeElementwiseUnary") { using op = armnn::UnaryOperation; - std::initializer_list allUnaryOperations = {op::Abs, op::Exp, op::Sqrt, op::Rsqrt, op::Neg, + std::initializer_list allUnaryOperations = {op::Abs, op::Ceil, op::Exp, op::Sqrt, op::Rsqrt, op::Neg, op::LogicalNot, op::Log, op::Sin}; for (auto unaryOperation : allUnaryOperations) diff --git a/src/armnnTfLiteParser/TfLiteParser.cpp b/src/armnnTfLiteParser/TfLiteParser.cpp index ee4cadd216..2a7f049470 100644 --- a/src/armnnTfLiteParser/TfLiteParser.cpp +++ b/src/armnnTfLiteParser/TfLiteParser.cpp @@ -729,6 +729,7 @@ TfLiteParserImpl::TfLiteParserImpl(const Optional(0, {{ "inputTensor", { -50.5f, -25.9999f, -0.5f, 0.0f, 1.5555f, 25.5f } }}, + {{ "outputTensor",{ -50.0f, -25.0f, 0.0f, 0.0f, 2.0f, 26.0f} }}); +} + } diff --git a/src/backends/reference/workloads/Ceil.hpp b/src/backends/reference/workloads/Ceil.hpp new file mode 100644 index 0000000000..2e415b9c0a --- /dev/null +++ b/src/backends/reference/workloads/Ceil.hpp @@ -0,0 +1,25 @@ +// +// Copyright © 2023 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include + +namespace armnn +{ +template +struct ceil + { + typedef T result_type; + typedef T argument_type; + + T + operator () (const T& inputData) const + { + return std::ceil(inputData); + } + }; + +} //namespace armnn diff --git a/src/backends/reference/workloads/ElementwiseFunction.cpp b/src/backends/reference/workloads/ElementwiseFunction.cpp index 82bcf99287..c5b0ad1f24 100644 --- a/src/backends/reference/workloads/ElementwiseFunction.cpp +++ b/src/backends/reference/workloads/ElementwiseFunction.cpp @@ -1,14 +1,14 @@ // -// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2017-2021,2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #include "ElementwiseFunction.hpp" #include "Broadcast.hpp" -#include #include "Minimum.hpp" #include "Maximum.hpp" #include "Abs.hpp" +#include "Ceil.hpp" #include "Exp.hpp" #include "Log.hpp" #include "Rsqrt.hpp" @@ -85,6 +85,7 @@ template struct armnn::ElementwiseBinaryFunction>; // Unary template struct armnn::ElementwiseUnaryFunction>; +template struct armnn::ElementwiseUnaryFunction>; template struct armnn::ElementwiseUnaryFunction>; template struct armnn::ElementwiseUnaryFunction>; template struct armnn::ElementwiseUnaryFunction>; diff --git a/src/backends/reference/workloads/RefElementwiseUnaryWorkload.cpp b/src/backends/reference/workloads/RefElementwiseUnaryWorkload.cpp index 4bd5a51a52..f4775e0c19 100644 --- a/src/backends/reference/workloads/RefElementwiseUnaryWorkload.cpp +++ b/src/backends/reference/workloads/RefElementwiseUnaryWorkload.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2020-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -10,6 +10,7 @@ #include "Encoders.hpp" #include "RefWorkloadUtils.hpp" #include "Abs.hpp" +#include "Ceil.hpp" #include "Exp.hpp" #include "Log.hpp" #include "Rsqrt.hpp" @@ -56,6 +57,7 @@ void RefElementwiseUnaryWorkload::Execute(std::vector inputs, st std::unique_ptr> output= MakeEncoder(outputInfo, outputs[0]->Map()); using AbsFunction = ElementwiseUnaryFunction>; + using CeilFunction = ElementwiseUnaryFunction>; using ExpFunction = ElementwiseUnaryFunction>; using LogFunction = ElementwiseUnaryFunction>; using NegFunction = ElementwiseUnaryFunction>; @@ -70,6 +72,11 @@ void RefElementwiseUnaryWorkload::Execute(std::vector inputs, st AbsFunction(inShape, outShape, *input, *output); break; } + case UnaryOperation::Ceil: + { + CeilFunction(inShape, outShape, *input, *output); + break; + } case UnaryOperation::Exp: { ExpFunction(inShape, outShape, *input, *output); -- cgit v1.2.1