From 52c54f61b97bcedab309bfa761e193939e12e739 Mon Sep 17 00:00:00 2001 From: Usama Arif Date: Tue, 14 May 2019 10:22:36 +0100 Subject: COMPMID-2270: Implement POW operator for CL Change-Id: Id14ecdc62439d90eb247bb75990d6593637cb42e Signed-off-by: Usama Arif Reviewed-on: https://review.mlplatform.org/c/1129 Comments-Addressed: Arm Jenkins Reviewed-by: Gian Marco Iodice Tested-by: Arm Jenkins --- src/core/CL/kernels/CLElementwiseOperationKernel.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src/core/CL/kernels/CLElementwiseOperationKernel.cpp') diff --git a/src/core/CL/kernels/CLElementwiseOperationKernel.cpp b/src/core/CL/kernels/CLElementwiseOperationKernel.cpp index 63c9244961..ce0c51dac5 100644 --- a/src/core/CL/kernels/CLElementwiseOperationKernel.cpp +++ b/src/core/CL/kernels/CLElementwiseOperationKernel.cpp @@ -42,6 +42,7 @@ std::map supported_arithmetic_ops = { ArithmeticOperation::SQUARED_DIFF, "SQUARED_DIFF" }, { ArithmeticOperation::MIN, "MIN" }, { ArithmeticOperation::MAX, "MAX" }, + { ArithmeticOperation::POWER, "POWER" }, }; std::map supported_sat_arithmetic_ops = @@ -64,7 +65,7 @@ std::string generate_id_for_tuning_common(const std::string &kernel_name, const return config_id; } -Status validate_arguments_with_division_rules(const ITensorInfo &input1, const ITensorInfo &input2, const ITensorInfo &output) +Status validate_arguments_with_float_only_supported_rules(const ITensorInfo &input1, const ITensorInfo &input2, const ITensorInfo &output) { ARM_COMPUTE_RETURN_ERROR_ON_NULLPTR(&input1, &input2, &output); ARM_COMPUTE_RETURN_ERROR_ON_F16_UNSUPPORTED(&input1); @@ -344,10 +345,10 @@ void CLArithmeticOperationKernel::configure(ArithmeticOperation op, const ICLTen Status CLArithmeticOperationKernel::validate(ArithmeticOperation op, const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output) { ARM_COMPUTE_RETURN_ERROR_ON_NULLPTR(input1, input2, output); - if(op == ArithmeticOperation::DIV) + if(op == ArithmeticOperation::DIV || op == ArithmeticOperation::POWER) { - // Division doesn't support integer arithmetic - ARM_COMPUTE_RETURN_ON_ERROR(validate_arguments_with_division_rules(*input1, *input2, *output)); + // Division and Power operators don't support integer arithmetic + ARM_COMPUTE_RETURN_ON_ERROR(validate_arguments_with_float_only_supported_rules(*input1, *input2, *output)); ARM_COMPUTE_RETURN_ON_ERROR(validate_and_configure_window_for_division(*input1->clone(), *input2->clone(), *output->clone()).first); } else @@ -360,9 +361,9 @@ Status CLArithmeticOperationKernel::validate(ArithmeticOperation op, const ITens } std::pair CLArithmeticOperationKernel::validate_and_configure_window(ITensorInfo &input1, ITensorInfo &input2, ITensorInfo &output) { - if(_op == ArithmeticOperation::DIV) + if(_op == ArithmeticOperation::DIV || _op == ArithmeticOperation::POWER) { - // Division doesn't support integer arithmetic + // Division and Power operators don't support integer arithmetic return validate_and_configure_window_for_division(input1, input2, output); } else @@ -372,10 +373,10 @@ std::pair CLArithmeticOperationKernel::validate_and_configure_wi } Status CLArithmeticOperationKernel::validate_arguments(const ITensorInfo &input1, const ITensorInfo &input2, const ITensorInfo &output) { - if(_op == ArithmeticOperation::DIV) + if(_op == ArithmeticOperation::DIV || _op == ArithmeticOperation::POWER) { - // Division doesn't support integer arithmetic - return validate_arguments_with_division_rules(input1, input2, output); + // Division and Power operators don't support integer arithmetic + return validate_arguments_with_float_only_supported_rules(input1, input2, output); } else { -- cgit v1.2.1