From ee301b384f4aeb697a5c249b8bb848d784146582 Mon Sep 17 00:00:00 2001 From: Jakub Sujak Date: Fri, 4 Jun 2021 09:46:08 +0100 Subject: Fix errata in documentation This patch addresses the following errata found in the project documentation: * Common typos. * Missing use of trademarks. * Incomplete operator descriptions. * Examples of code that have since been removed from the library. * Plus clarification over the usage of `All` category for data types and layouts. In addition, the Operator list was not generated properly due to: * Non-matching cases in the filenames (i.e. `Elementwise` and `ElementWise`). For consistency, all usages of the latter have been renamed to the former. * Extra data layout tables in the headers for the `NESlice` and `NEStridedSlice` functions (note: not present in CL counterpart) meant documentation for those functions was generated twice. Resolves: COMPMID-4561, COMPMID-4562, COMPMID-4563 Change-Id: I1eb24559545397749e636ffbf927727fb1bc6201 Signed-off-by: Jakub Sujak Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5769 Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins Reviewed-by: Sheri Zhang Reviewed-by: SiCong Li --- .../validation/fixtures/ElementwiseUnaryFixture.h | 297 +++++++++++++++++++++ 1 file changed, 297 insertions(+) create mode 100644 tests/validation/fixtures/ElementwiseUnaryFixture.h (limited to 'tests/validation/fixtures/ElementwiseUnaryFixture.h') diff --git a/tests/validation/fixtures/ElementwiseUnaryFixture.h b/tests/validation/fixtures/ElementwiseUnaryFixture.h new file mode 100644 index 0000000000..7221226fd1 --- /dev/null +++ b/tests/validation/fixtures/ElementwiseUnaryFixture.h @@ -0,0 +1,297 @@ +/* + * Copyright (c) 2018-2021 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. + */ +#ifndef ARM_COMPUTE_TEST_ELEMENTWISE_UNARY_FIXTURE +#define ARM_COMPUTE_TEST_ELEMENTWISE_UNARY_FIXTURE + +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" +#include "tests/AssetsLibrary.h" +#include "tests/Globals.h" +#include "tests/IAccessor.h" +#include "tests/framework/Asserts.h" +#include "tests/framework/Fixture.h" +#include "tests/validation/reference/ElementwiseUnary.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +template +class ElementWiseUnaryValidationFixture : public framework::Fixture +{ +public: + template + void setup(TensorShape input_shape, DataType input_data_type, bool in_place, ElementWiseUnary op, bool use_dynamic_shape = false) + { + _op = op; + _target = compute_target(input_shape, input_data_type, in_place); + _reference = compute_reference(input_shape, input_data_type); + _use_dynamic_shape = use_dynamic_shape; + } + +protected: + template + void fill(U &&tensor, int i, DataType data_type) + { + using FloatType = typename std::conditional < std::is_same::value || std::is_floating_point::value, T, float >::type; + using FloatDistributionType = typename std::conditional::value, arm_compute::utils::uniform_real_distribution_16bit, std::uniform_real_distribution>::type; + + switch(_op) + { + case ElementWiseUnary::EXP: + { + FloatDistributionType distribution{ FloatType(-1.0f), FloatType(1.0f) }; + library->fill(tensor, distribution, i); + break; + } + case ElementWiseUnary::RSQRT: + { + FloatDistributionType distribution{ FloatType(1.0f), FloatType(2.0f) }; + library->fill(tensor, distribution, i); + break; + } + case ElementWiseUnary::ABS: + case ElementWiseUnary::NEG: + { + switch(data_type) + { + case DataType::F16: + { + arm_compute::utils::uniform_real_distribution_16bit distribution{ -2.0f, 2.0f }; + library->fill(tensor, distribution, i); + break; + } + case DataType::F32: + { + FloatDistributionType distribution{ FloatType(-2.0f), FloatType(2.0f) }; + library->fill(tensor, distribution, i); + break; + } + case DataType::S32: + { + std::uniform_int_distribution distribution(-100, 100); + library->fill(tensor, distribution, i); + break; + } + default: + ARM_COMPUTE_ERROR("DataType for Elementwise Negation Not implemented"); + } + break; + } + case ElementWiseUnary::LOG: + { + FloatDistributionType distribution{ FloatType(0.0000001f), FloatType(100.0f) }; + library->fill(tensor, distribution, i); + break; + } + case ElementWiseUnary::SIN: + { + FloatDistributionType distribution{ FloatType(-100.00f), FloatType(100.00f) }; + library->fill(tensor, distribution, i); + break; + } + case ElementWiseUnary::ROUND: + { + FloatDistributionType distribution{ FloatType(100.0f), FloatType(-100.0f) }; + library->fill(tensor, distribution, i); + break; + } + default: + ARM_COMPUTE_ERROR("Not implemented"); + } + } + + TensorType compute_target(const TensorShape &shape, DataType data_type, bool in_place) + { + // Create tensors + TensorType src = create_tensor(shape, data_type); + TensorType dst = create_tensor(shape, data_type); + + TensorType *actual_dst = in_place ? &src : &dst; + + // if _use_dynamic_shape is true, this fixture will test scenario for dynamic shapes. + // - At configure time, all input tensors are marked as dynamic using set_tensor_dynamic() + // - After configure, tensors are marked as static for run using set_tensor_static() + // - The tensors with static shape are given to run() + if(_use_dynamic_shape) + { + set_tensor_dynamic(src); + } + + // Create and configure function + FunctionType elwiseunary_layer; + elwiseunary_layer.configure(&src, actual_dst); + + if(_use_dynamic_shape) + { + set_tensor_static(src); + } + + ARM_COMPUTE_ASSERT(src.info()->is_resizable()); + src.allocator()->allocate(); + ARM_COMPUTE_ASSERT(!src.info()->is_resizable()); + if(!in_place) + { + ARM_COMPUTE_ASSERT(dst.info()->is_resizable()); + dst.allocator()->allocate(); + ARM_COMPUTE_ASSERT(!dst.info()->is_resizable()); + } + + // Fill tensors + fill(AccessorType(src), 0, data_type); + + // Compute function + elwiseunary_layer.run(); + + if(in_place) + { + return src; + } + else + { + return dst; + } + } + + SimpleTensor compute_reference(const TensorShape &shape, DataType data_type) + { + // Create reference + SimpleTensor src{ shape, data_type }; + + // Fill reference + fill(src, 0, data_type); + + return reference::elementwise_unary(src, _op); + } + + TensorType _target{}; + SimpleTensor _reference{}; + ElementWiseUnary _op{}; + bool _use_dynamic_shape{ false }; +}; + +template +class RsqrtValidationFixture : public ElementWiseUnaryValidationFixture +{ +public: + template + void setup(const TensorShape &shape, DataType data_type) + { + ElementWiseUnaryValidationFixture::setup(shape, data_type, false, ElementWiseUnary::RSQRT); + } +}; + +template +class RsqrtDynamicShapeValidationFixture : public ElementWiseUnaryValidationFixture +{ +public: + template + void setup(const TensorShape &shape, DataType data_type) + { + ElementWiseUnaryValidationFixture::setup(shape, data_type, false, ElementWiseUnary::RSQRT, true); + } +}; + +template +class ExpValidationFixture : public ElementWiseUnaryValidationFixture +{ +public: + template + void setup(const TensorShape &shape, DataType data_type) + { + ElementWiseUnaryValidationFixture::setup(shape, data_type, false, ElementWiseUnary::EXP); + } +}; + +template +class NegValidationFixture : public ElementWiseUnaryValidationFixture +{ +public: + template + void setup(const TensorShape &shape, DataType data_type) + { + ElementWiseUnaryValidationFixture::setup(shape, data_type, false, ElementWiseUnary::NEG); + } +}; + +template +class NegValidationInPlaceFixture : public ElementWiseUnaryValidationFixture +{ +public: + template + void setup(const TensorShape &shape, DataType data_type, bool in_place) + { + ElementWiseUnaryValidationFixture::setup(shape, data_type, in_place, ElementWiseUnary::NEG); + } +}; + +template +class LogValidationFixture : public ElementWiseUnaryValidationFixture +{ +public: + template + void setup(const TensorShape &shape, DataType data_type) + { + ElementWiseUnaryValidationFixture::setup(shape, data_type, false, ElementWiseUnary::LOG); + } +}; + +template +class AbsValidationFixture : public ElementWiseUnaryValidationFixture +{ +public: + template + void setup(const TensorShape &shape, DataType data_type) + { + ElementWiseUnaryValidationFixture::setup(shape, data_type, false, ElementWiseUnary::ABS); + } +}; + +template +class SinValidationFixture : public ElementWiseUnaryValidationFixture +{ +public: + template + void setup(const TensorShape &shape, DataType data_type) + { + ElementWiseUnaryValidationFixture::setup(shape, data_type, false, ElementWiseUnary::SIN); + } +}; + +template +class RoundValidationFixture : public ElementWiseUnaryValidationFixture +{ +public: + template + void setup(const TensorShape &shape, DataType data_type) + { + ElementWiseUnaryValidationFixture::setup(shape, data_type, false, ElementWiseUnary::ROUND); + } +}; +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_ELEMENTWISE_UNARY_FIXTURE */ -- cgit v1.2.1