From f24411ffc842970609a1fb6ba2f9527cfb681dbd Mon Sep 17 00:00:00 2001 From: giuros01 Date: Thu, 16 May 2019 11:47:13 +0100 Subject: COMPMID-2255: Implement ABS operator for CL Change-Id: I8867953f8ae84a77f126aedd32b2f98c062905b1 Signed-off-by: giuros01 Reviewed-on: https://review.mlplatform.org/c/1151 Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins Reviewed-by: Georgios Pinitas --- .../runtime/CL/functions/CLElementWiseUnaryLayer.h | 20 +++++ src/core/CL/cl_kernels/elementwise_unary.cl | 12 +-- .../CL/kernels/CLElementWiseUnaryLayerKernel.cpp | 11 ++- .../CL/functions/CLElementWiseUnaryLayer.cpp | 11 +++ tests/validation/CL/AbsLayer.cpp | 85 ++++++++++++++++++++++ 5 files changed, 130 insertions(+), 9 deletions(-) create mode 100644 tests/validation/CL/AbsLayer.cpp diff --git a/arm_compute/runtime/CL/functions/CLElementWiseUnaryLayer.h b/arm_compute/runtime/CL/functions/CLElementWiseUnaryLayer.h index 7b5a0c155a..b8a6fa8a81 100644 --- a/arm_compute/runtime/CL/functions/CLElementWiseUnaryLayer.h +++ b/arm_compute/runtime/CL/functions/CLElementWiseUnaryLayer.h @@ -109,5 +109,25 @@ public: */ static Status validate(const ITensorInfo *input, const ITensorInfo *output); }; + +/** Basic function to get the absolute value of an input tensor. */ +class CLAbsLayer : public ICLSimpleFunction +{ +public: + /** Initialize the function + * + * @param[in] input Input tensor. Data types supported: F16/F32. + * @param[out] output Output tensor. Data types supported: same as @p input. + */ + void configure(const ICLTensor *input, ICLTensor *output); + /** Static function to check if given info will lead to a valid configuration of @ref CLAbsLayer + * + * @param[in] input First tensor input info. Data types supported: F16/F32. + * @param[in] output Output tensor info. Data types supported: Same as @p input. + * + * @return a status + */ + static Status validate(const ITensorInfo *input, const ITensorInfo *output); +}; } // namespace arm_compute #endif /* __ARM_COMPUTE_CLELEMENTWISEUNARYLAYER_H__ */ diff --git a/src/core/CL/cl_kernels/elementwise_unary.cl b/src/core/CL/cl_kernels/elementwise_unary.cl index 14d6f5dbe1..89bffed16d 100644 --- a/src/core/CL/cl_kernels/elementwise_unary.cl +++ b/src/core/CL/cl_kernels/elementwise_unary.cl @@ -26,14 +26,16 @@ #if defined(DATA_TYPE) && defined(OPERATION) -// Calculate Exponential -#define exponential(input) exp(input) +// Calculate exponential +#define exp_op(input) exp(input) // Calculate reverse square root -#define inverse_sqrt(input) rsqrt(input) +#define rsqrt_op(input) rsqrt(input) // Calculate negative -#define neg(input) (-input) +#define neg_op(input) (-input) // Calculate sine -#define sine(input) sin(input) +#define sin_op(input) sin(input) +// Calculate abs for floating point values +#define fabs_op(input) fabs(input) /** Applies element wise unary operator in a tensor. * diff --git a/src/core/CL/kernels/CLElementWiseUnaryLayerKernel.cpp b/src/core/CL/kernels/CLElementWiseUnaryLayerKernel.cpp index b6484ec737..15823b06ce 100644 --- a/src/core/CL/kernels/CLElementWiseUnaryLayerKernel.cpp +++ b/src/core/CL/kernels/CLElementWiseUnaryLayerKernel.cpp @@ -79,16 +79,19 @@ void CLElementWiseUnaryLayerKernel::configure(const ICLTensor *input, ICLTensor switch(op) { case ElementWiseUnary::RSQRT: - build_opts.add_option("-DOPERATION=inverse_sqrt"); + build_opts.add_option("-DOPERATION=rsqrt_op"); break; case ElementWiseUnary::EXP: - build_opts.add_option("-DOPERATION=exponential"); + build_opts.add_option("-DOPERATION=exp_op"); break; case ElementWiseUnary::NEG: - build_opts.add_option("-DOPERATION=neg"); + build_opts.add_option("-DOPERATION=neg_op"); break; case ElementWiseUnary::SIN: - build_opts.add_option("-DOPERATION=sine"); + build_opts.add_option("-DOPERATION=sin_op"); + break; + case ElementWiseUnary::ABS: + build_opts.add_option("-DOPERATION=fabs_op"); break; default: ARM_COMPUTE_ERROR("Not implemented"); diff --git a/src/runtime/CL/functions/CLElementWiseUnaryLayer.cpp b/src/runtime/CL/functions/CLElementWiseUnaryLayer.cpp index c3e472d11b..14e77eadce 100644 --- a/src/runtime/CL/functions/CLElementWiseUnaryLayer.cpp +++ b/src/runtime/CL/functions/CLElementWiseUnaryLayer.cpp @@ -74,4 +74,15 @@ Status CLSinLayer::validate(const ITensorInfo *input, const ITensorInfo *output) return CLElementWiseUnaryLayerKernel::validate(input, output, ElementWiseUnary::SIN); } +void CLAbsLayer::configure(const ICLTensor *input, ICLTensor *output) +{ + auto k = arm_compute::support::cpp14::make_unique(); + k->configure(input, output, ElementWiseUnary::ABS); + _kernel = std::move(k); +} +Status CLAbsLayer::validate(const ITensorInfo *input, const ITensorInfo *output) +{ + return CLElementWiseUnaryLayerKernel::validate(input, output, ElementWiseUnary::ABS); +} + } // namespace arm_compute diff --git a/tests/validation/CL/AbsLayer.cpp b/tests/validation/CL/AbsLayer.cpp new file mode 100644 index 0000000000..43fefadc2f --- /dev/null +++ b/tests/validation/CL/AbsLayer.cpp @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2019 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#include "arm_compute/core/Types.h" +#include "arm_compute/runtime/CL/functions/CLElementWiseUnaryLayer.h" +#include "arm_compute/runtime/Tensor.h" +#include "arm_compute/runtime/TensorAllocator.h" +#include "tests/CL/CLAccessor.h" +#include "tests/PaddingCalculator.h" +#include "tests/datasets/ShapeDatasets.h" +#include "tests/framework/Asserts.h" +#include "tests/framework/Macros.h" +#include "tests/framework/datasets/Datasets.h" +#include "tests/validation/Validation.h" +#include "tests/validation/fixtures/ElementWiseUnaryFixture.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +TEST_SUITE(CL) +TEST_SUITE(AbsLayer) +template +using CLAbsLayerFixture = AbsValidationFixture; + +TEST_SUITE(Float) +TEST_SUITE(FP16) +FIXTURE_DATA_TEST_CASE(RunSmall, CLAbsLayerFixture, framework::DatasetMode::PRECOMMIT, combine(datasets::SmallShapes(), framework::dataset::make("DataType", + DataType::F16))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +FIXTURE_DATA_TEST_CASE(RunLarge, CLAbsLayerFixture, framework::DatasetMode::NIGHTLY, combine(datasets::LargeShapes(), framework::dataset::make("DataType", + DataType::F16))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} + +TEST_SUITE_END() // FP16 +TEST_SUITE(FP32) +FIXTURE_DATA_TEST_CASE(RunSmall, CLAbsLayerFixture, framework::DatasetMode::PRECOMMIT, combine(datasets::SmallShapes(), framework::dataset::make("DataType", + DataType::F32))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +FIXTURE_DATA_TEST_CASE(RunLarge, CLAbsLayerFixture, framework::DatasetMode::NIGHTLY, combine(datasets::LargeShapes(), framework::dataset::make("DataType", + DataType::F32))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} + +TEST_SUITE_END() // FP32 +TEST_SUITE_END() // Float + +TEST_SUITE_END() // AbsLayer +TEST_SUITE_END() // CL +} // namespace validation +} // namespace test +} // namespace arm_compute -- cgit v1.2.1