diff options
| -rw-r--r-- | arm_compute/core/Types.h | 1 | ||||
| -rw-r--r-- | arm_compute/runtime/NEON/functions/NEElementwiseUnaryLayer.h | 20 | ||||
| -rw-r--r-- | src/core/NEON/kernels/NEElementwiseUnaryKernel.cpp | 12 | ||||
| -rw-r--r-- | src/runtime/NEON/functions/NEElementwiseUnaryLayer.cpp | 11 | ||||
| -rw-r--r-- | tests/validation/NEON/ElementwiseAbsoluteValue.cpp | 134 | ||||
| -rw-r--r-- | tests/validation/fixtures/ElementWiseUnaryFixture.h | 12 | ||||
| -rw-r--r-- | tests/validation/reference/ElementWiseUnary.cpp | 3 |
7 files changed, 192 insertions, 1 deletions
diff --git a/arm_compute/core/Types.h b/arm_compute/core/Types.h index c6c2728407..382b7f4abe 100644 --- a/arm_compute/core/Types.h +++ b/arm_compute/core/Types.h @@ -581,6 +581,7 @@ enum class ElementWiseUnary EXP, /**< Exponential */ NEG, /**< Negate */ LOG, /**< Natural Logarithm */ + ABS, /**< Absolute value */ }; /** The normalization type used for the normalization layer */ diff --git a/arm_compute/runtime/NEON/functions/NEElementwiseUnaryLayer.h b/arm_compute/runtime/NEON/functions/NEElementwiseUnaryLayer.h index cce2837a8d..bea9145b80 100644 --- a/arm_compute/runtime/NEON/functions/NEElementwiseUnaryLayer.h +++ b/arm_compute/runtime/NEON/functions/NEElementwiseUnaryLayer.h @@ -109,5 +109,25 @@ public: */ static Status validate(const ITensorInfo *input, const ITensorInfo *output); }; + +/** Basic function to compute the absolute value of an input tensor. */ +class NEAbsLayer : public INESimpleFunction +{ +public: + /** Initialize the function + * + * @param[in] input Input tensor. Data types supported: F16/F32/S32. + * @param[out] output Output tensor. Data types supported: same as @p input. + */ + void configure(const ITensor *input, ITensor *output); + /** Static function to check if given info will lead to a valid configuration of @ref NEAbsLayer + * + * @param[in] input First tensor input info. Data types supported: F16/F32/S32. + * @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_NEELEMENTWISEUNARYLAYER_H__ */ diff --git a/src/core/NEON/kernels/NEElementwiseUnaryKernel.cpp b/src/core/NEON/kernels/NEElementwiseUnaryKernel.cpp index 8678bcd41b..437676ddb3 100644 --- a/src/core/NEON/kernels/NEElementwiseUnaryKernel.cpp +++ b/src/core/NEON/kernels/NEElementwiseUnaryKernel.cpp @@ -59,6 +59,8 @@ inline ScalarType elementwise_op_scalar(const ScalarType &a) return -a; case ElementWiseUnary::LOG: return std::log(a); + case ElementWiseUnary::ABS: + return std::abs(a); default: ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); } @@ -78,6 +80,8 @@ inline VectorType elementwise_op(const VectorType &a) return wrapper::vneg(a); case ElementWiseUnary::LOG: return wrapper::vlog(a); + case ElementWiseUnary::ABS: + return wrapper::vabs(a); default: ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); } @@ -91,6 +95,8 @@ inline VectorType elementwise_op(const VectorType &a) { case ElementWiseUnary::NEG: return wrapper::vneg(a); + case ElementWiseUnary::ABS: + return wrapper::vabs(a); default: ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); } @@ -197,6 +203,9 @@ void NEElementwiseUnaryKernel::configure(ElementWiseUnary op, const ITensor *inp case ElementWiseUnary::LOG: _function = configure_func<ElementWiseUnary::LOG>(input, output); break; + case ElementWiseUnary::ABS: + _function = configure_func<ElementWiseUnary::ABS>(input, output); + break; default: ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); } @@ -213,10 +222,11 @@ Status NEElementwiseUnaryKernel::validate_arguments(ElementWiseUnary op, const I ARM_COMPUTE_RETURN_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(&input, 1, DataType::F16, DataType::F32); break; case ElementWiseUnary::NEG: + case ElementWiseUnary::ABS: ARM_COMPUTE_RETURN_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(&input, 1, DataType::F16, DataType::F32, DataType::S32); break; default: - ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); + ARM_COMPUTE_ERROR("ElementWiseUnary operation not supported"); } // Validate in case of configured output if(output.total_size() > 0) diff --git a/src/runtime/NEON/functions/NEElementwiseUnaryLayer.cpp b/src/runtime/NEON/functions/NEElementwiseUnaryLayer.cpp index d0117d0131..231b8aa445 100644 --- a/src/runtime/NEON/functions/NEElementwiseUnaryLayer.cpp +++ b/src/runtime/NEON/functions/NEElementwiseUnaryLayer.cpp @@ -74,4 +74,15 @@ Status NELogLayer::validate(const ITensorInfo *input, const ITensorInfo *output) return NEElementwiseUnaryKernel::validate(ElementWiseUnary::LOG, input, output); } +void NEAbsLayer::configure(const ITensor *input, ITensor *output) +{ + auto k = arm_compute::support::cpp14::make_unique<NEElementwiseUnaryKernel>(); + k->configure(ElementWiseUnary::ABS, input, output); + _kernel = std::move(k); +} +Status NEAbsLayer::validate(const ITensorInfo *input, const ITensorInfo *output) +{ + return NEElementwiseUnaryKernel::validate(ElementWiseUnary::ABS, input, output); +} + } // namespace arm_compute diff --git a/tests/validation/NEON/ElementwiseAbsoluteValue.cpp b/tests/validation/NEON/ElementwiseAbsoluteValue.cpp new file mode 100644 index 0000000000..3aee46fa93 --- /dev/null +++ b/tests/validation/NEON/ElementwiseAbsoluteValue.cpp @@ -0,0 +1,134 @@ +/* + * 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/NEON/functions/NEElementwiseUnaryLayer.h" +#include "arm_compute/runtime/Tensor.h" +#include "arm_compute/runtime/TensorAllocator.h" +#include "tests/NEON/Accessor.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<float> tolerance_fp32(0.000001f); +#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC +RelativeTolerance<float> tolerance_fp16(0.01f); +#endif // __ARM_FEATURE_FP16_VECTOR_ARITHMETIC +} // namespace + +TEST_SUITE(NEON) +TEST_SUITE(AbsLayer) + +DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::F32)), shape, data_type) +{ + // Create tensors + Tensor src = create_tensor<Tensor>(shape, data_type); + Tensor dst = create_tensor<Tensor>(shape, data_type); + + ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Create and configure function + NEAbsLayer neg_layer; + neg_layer.configure(&src, &dst); + + // Validate valid region + const ValidRegion valid_region = shape_to_valid_region(shape); + validate(src.info()->valid_region(), valid_region); + validate(dst.info()->valid_region(), valid_region); +} + +template <typename T> +using NEAbsLayerFixture = AbsValidationFixture<Tensor, Accessor, NEAbsLayer, T>; + +TEST_SUITE(Float) +#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC +TEST_SUITE(FP16) +FIXTURE_DATA_TEST_CASE(RunSmall, NEAbsLayerFixture<half>, framework::DatasetMode::PRECOMMIT, combine(datasets::SmallShapes(), framework::dataset::make("DataType", + DataType::F16))) +{ + // Validate output + validate(Accessor(_target), _reference, tolerance_fp16); +} +FIXTURE_DATA_TEST_CASE(RunLarge, NEAbsLayerFixture<half>, framework::DatasetMode::NIGHTLY, combine(datasets::LargeShapes(), framework::dataset::make("DataType", + DataType::F16))) +{ + // Validate output + validate(Accessor(_target), _reference, tolerance_fp16); +} + +TEST_SUITE_END() // FP16 +#endif // __ARM_FEATURE_FP16_VECTOR_ARITHMETIC + +TEST_SUITE(FP32) +FIXTURE_DATA_TEST_CASE(RunSmall, NEAbsLayerFixture<float>, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), framework::dataset::make("DataType", + DataType::F32))) +{ + // Validate output + validate(Accessor(_target), _reference, tolerance_fp32); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, NEAbsLayerFixture<float>, framework::DatasetMode::NIGHTLY, combine(datasets::LargeShapes(), framework::dataset::make("DataType", + DataType::F32))) +{ + // Validate output + validate(Accessor(_target), _reference, tolerance_fp32); +} +TEST_SUITE_END() // FP32 +TEST_SUITE_END() // Float + +TEST_SUITE(Integer) +TEST_SUITE(S32) +FIXTURE_DATA_TEST_CASE(RunSmall, NEAbsLayerFixture<int32_t>, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), framework::dataset::make("DataType", + DataType::S32))) +{ + // Validate output + validate(Accessor(_target), _reference); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, NEAbsLayerFixture<int32_t>, framework::DatasetMode::NIGHTLY, combine(datasets::LargeShapes(), framework::dataset::make("DataType", + DataType::S32))) +{ + // Validate output + validate(Accessor(_target), _reference); +} +TEST_SUITE_END() // S32 +TEST_SUITE_END() // Integer + +TEST_SUITE_END() // AbsLayer +TEST_SUITE_END() // NEON +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/fixtures/ElementWiseUnaryFixture.h b/tests/validation/fixtures/ElementWiseUnaryFixture.h index 1658ed00bb..37da3b1405 100644 --- a/tests/validation/fixtures/ElementWiseUnaryFixture.h +++ b/tests/validation/fixtures/ElementWiseUnaryFixture.h @@ -69,6 +69,7 @@ protected: library->fill(tensor, distribution, i); break; } + case ElementWiseUnary::ABS: case ElementWiseUnary::NEG: { switch(data_type) @@ -190,6 +191,17 @@ public: ElementWiseUnaryValidationFixture<TensorType, AccessorType, FunctionType, T>::setup(shape, data_type, ElementWiseUnary::LOG); } }; + +template <typename TensorType, typename AccessorType, typename FunctionType, typename T> +class AbsValidationFixture : public ElementWiseUnaryValidationFixture<TensorType, AccessorType, FunctionType, T> +{ +public: + template <typename...> + void setup(const TensorShape &shape, DataType data_type) + { + ElementWiseUnaryValidationFixture<TensorType, AccessorType, FunctionType, T>::setup(shape, data_type, ElementWiseUnary::ABS); + } +}; } // namespace validation } // namespace test } // namespace arm_compute diff --git a/tests/validation/reference/ElementWiseUnary.cpp b/tests/validation/reference/ElementWiseUnary.cpp index 9a98144718..c6b2fd125b 100644 --- a/tests/validation/reference/ElementWiseUnary.cpp +++ b/tests/validation/reference/ElementWiseUnary.cpp @@ -52,6 +52,9 @@ SimpleTensor<T> elementwise_unary(const SimpleTensor<T> &src, ElementWiseUnary o case ElementWiseUnary::LOG: dst[i] = std::log(src[i]); break; + case ElementWiseUnary::ABS: + dst[i] = std::abs(src[i]); + break; default: ARM_COMPUTE_ERROR("Not implemented"); } |