From 81e671ef4f2a8fb3128fba402610b9de28b57891 Mon Sep 17 00:00:00 2001 From: Usama Arif Date: Mon, 13 May 2019 13:33:14 +0100 Subject: COMPMID-2269: Implement POW operator for NEON Change-Id: I7135f665d89da3c24c9bbe00e991a64713a41d0e Signed-off-by: Usama Arif Reviewed-on: https://review.mlplatform.org/c/1128 Reviewed-by: Michalis Spyrou Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- .../NEON/kernels/NEElementwiseOperationKernel.cpp | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'src/core/NEON/kernels') diff --git a/src/core/NEON/kernels/NEElementwiseOperationKernel.cpp b/src/core/NEON/kernels/NEElementwiseOperationKernel.cpp index 6b87ea017b..33457e1fca 100644 --- a/src/core/NEON/kernels/NEElementwiseOperationKernel.cpp +++ b/src/core/NEON/kernels/NEElementwiseOperationKernel.cpp @@ -130,6 +130,11 @@ inline ScalarType elementwise_arithm_op_scalar(const ScalarType &a, const Scalar res = a / b; break; } + case ArithmeticOperation::POWER: + { + res = std::pow(a, b); + break; + } default: ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); } @@ -174,12 +179,24 @@ inline float32x4_t elementwise_arithm_op( return wrapper::vdiv(a, b); } +template <> +inline float32x4_t elementwise_arithm_op(const float32x4_t &a, const float32x4_t &b) +{ + return wrapper::vpow(a, b); +} + #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC template <> inline float16x8_t elementwise_arithm_op(const float16x8_t &a, const float16x8_t &b) { return wrapper::vdiv(a, b); } + +template <> +inline float16x8_t elementwise_arithm_op(const float16x8_t &a, const float16x8_t &b) +{ + return wrapper::vpow(a, b); +} #endif // __ARM_FEATURE_FP16_VECTOR_ARITHMETIC template @@ -879,6 +896,27 @@ Status NEDivisionOperationKernel::validate(const ITensorInfo *input1, const ITen return Status{}; } +/** The power operator */ +void NEPowerOperationKernel::configure(const ITensor *input1, const ITensor *input2, ITensor *output) +{ + ARM_COMPUTE_ERROR_THROW_ON(validate_arguments(*input1->info(), *input2->info(), *output->info())); + configure_common(input1, input2, output); + _function = configure_arithm_func(input1, input2, output); +} + +Status NEPowerOperationKernel::validate_arguments(const ITensorInfo &input1, const ITensorInfo &input2, const ITensorInfo &output) +{ + ARM_COMPUTE_RETURN_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(&input1, 1, DataType::F16, DataType::F32); + return NEArithmeticOperationKernel::validate_arguments(input1, input2, output); +} + +Status NEPowerOperationKernel::validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output) +{ + ARM_COMPUTE_RETURN_ERROR_ON_NULLPTR(input1, input2, output); + ARM_COMPUTE_RETURN_ON_ERROR(validate_arguments(*input1, *input2, *output)); + return Status{}; +} + /** Comparison operators (equal, not equal, less than, greater than, less than or equal, greater than or equal) */ void NEComparisonOperationKernel::configure(ComparisonOperation op, const ITensor *input1, const ITensor *input2, ITensor *output) -- cgit v1.2.1