From ac33d7eb7bf0db65c3663d9707e509ca91337349 Mon Sep 17 00:00:00 2001 From: Usama Arif Date: Mon, 20 May 2019 14:21:40 +0100 Subject: COMPMID-2264: Implement LOG operator for CL Change-Id: I95ca659e8884191762b5d611a424a6e8a1d88885 Signed-off-by: Usama Arif Reviewed-on: https://review.mlplatform.org/c/1189 Comments-Addressed: Arm Jenkins Reviewed-by: Pablo Marquez Reviewed-by: Georgios Pinitas Tested-by: Arm Jenkins --- .../runtime/CL/functions/CLElementWiseUnaryLayer.h | 20 +++++ src/core/CL/cl_kernels/elementwise_unary.cl | 2 + .../CL/kernels/CLElementWiseUnaryLayerKernel.cpp | 3 + .../CL/functions/CLElementWiseUnaryLayer.cpp | 10 +++ tests/validation/CL/LogLayer.cpp | 90 ++++++++++++++++++++++ utils/TypePrinter.h | 3 + 6 files changed, 128 insertions(+) create mode 100644 tests/validation/CL/LogLayer.cpp diff --git a/arm_compute/runtime/CL/functions/CLElementWiseUnaryLayer.h b/arm_compute/runtime/CL/functions/CLElementWiseUnaryLayer.h index b8a6fa8a81..de4bc59240 100644 --- a/arm_compute/runtime/CL/functions/CLElementWiseUnaryLayer.h +++ b/arm_compute/runtime/CL/functions/CLElementWiseUnaryLayer.h @@ -110,6 +110,26 @@ public: static Status validate(const ITensorInfo *input, const ITensorInfo *output); }; +/** Basic function to perform elementwise log on an input tensor. */ +class CLLogLayer : 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 CLLogLayer + * + * @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); +}; + /** Basic function to get the absolute value of an input tensor. */ class CLAbsLayer : public ICLSimpleFunction { diff --git a/src/core/CL/cl_kernels/elementwise_unary.cl b/src/core/CL/cl_kernels/elementwise_unary.cl index 89bffed16d..866b7ee2b0 100644 --- a/src/core/CL/cl_kernels/elementwise_unary.cl +++ b/src/core/CL/cl_kernels/elementwise_unary.cl @@ -36,6 +36,8 @@ #define sin_op(input) sin(input) // Calculate abs for floating point values #define fabs_op(input) fabs(input) +// Calculate natural_log +#define natural_log_op(input) log(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 15823b06ce..8b8d2965df 100644 --- a/src/core/CL/kernels/CLElementWiseUnaryLayerKernel.cpp +++ b/src/core/CL/kernels/CLElementWiseUnaryLayerKernel.cpp @@ -93,6 +93,9 @@ void CLElementWiseUnaryLayerKernel::configure(const ICLTensor *input, ICLTensor case ElementWiseUnary::ABS: build_opts.add_option("-DOPERATION=fabs_op"); break; + case ElementWiseUnary::LOG: + build_opts.add_option("-DOPERATION=natural_log_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 14e77eadce..b1e18ecd7e 100644 --- a/src/runtime/CL/functions/CLElementWiseUnaryLayer.cpp +++ b/src/runtime/CL/functions/CLElementWiseUnaryLayer.cpp @@ -84,5 +84,15 @@ Status CLAbsLayer::validate(const ITensorInfo *input, const ITensorInfo *output) { return CLElementWiseUnaryLayerKernel::validate(input, output, ElementWiseUnary::ABS); } +void CLLogLayer::configure(const ICLTensor *input, ICLTensor *output) +{ + auto k = arm_compute::support::cpp14::make_unique(); + k->configure(input, output, ElementWiseUnary::LOG); + _kernel = std::move(k); +} +Status CLLogLayer::validate(const ITensorInfo *input, const ITensorInfo *output) +{ + return CLElementWiseUnaryLayerKernel::validate(input, output, ElementWiseUnary::LOG); +} } // namespace arm_compute diff --git a/tests/validation/CL/LogLayer.cpp b/tests/validation/CL/LogLayer.cpp new file mode 100644 index 0000000000..856c6c4453 --- /dev/null +++ b/tests/validation/CL/LogLayer.cpp @@ -0,0 +1,90 @@ +/* + * 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 +{ +namespace +{ +RelativeTolerance tolerance_fp32(0.000001f); +RelativeTolerance tolerance_fp16(0.1f); +} // namespace +TEST_SUITE(CL) +TEST_SUITE(LogLayer) +template +using CLLogLayerFixture = LogValidationFixture; + +TEST_SUITE(Float) +TEST_SUITE(FP16) +FIXTURE_DATA_TEST_CASE(RunSmall, CLLogLayerFixture, framework::DatasetMode::PRECOMMIT, combine(datasets::SmallShapes(), framework::dataset::make("DataType", + DataType::F16))) +{ + // Validate output + validate(CLAccessor(_target), _reference, tolerance_fp16); +} +FIXTURE_DATA_TEST_CASE(RunLarge, CLLogLayerFixture, framework::DatasetMode::NIGHTLY, combine(datasets::LargeShapes(), framework::dataset::make("DataType", + DataType::F16))) +{ + // Validate output + validate(CLAccessor(_target), _reference, tolerance_fp16); +} + +TEST_SUITE_END() // FP16 +TEST_SUITE(FP32) +FIXTURE_DATA_TEST_CASE(RunSmall, CLLogLayerFixture, framework::DatasetMode::PRECOMMIT, combine(datasets::SmallShapes(), framework::dataset::make("DataType", + DataType::F32))) +{ + // Validate output + validate(CLAccessor(_target), _reference, tolerance_fp32); +} +FIXTURE_DATA_TEST_CASE(RunLarge, CLLogLayerFixture, framework::DatasetMode::NIGHTLY, combine(datasets::LargeShapes(), framework::dataset::make("DataType", + DataType::F32))) +{ + // Validate output + validate(CLAccessor(_target), _reference, tolerance_fp32); +} + +TEST_SUITE_END() // FP32 +TEST_SUITE_END() // Float + +TEST_SUITE_END() // LogLayer +TEST_SUITE_END() // CL +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/utils/TypePrinter.h b/utils/TypePrinter.h index 2f9f8cba68..b8927615ee 100644 --- a/utils/TypePrinter.h +++ b/utils/TypePrinter.h @@ -1522,6 +1522,9 @@ inline ::std::ostream &operator<<(::std::ostream &os, const ElementWiseUnary &op case ElementWiseUnary::NEG: os << "NEG"; break; + case ElementWiseUnary::LOG: + os << "LOG"; + break; default: ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); } -- cgit v1.2.1