From 32982d8129f53b612021660d3007e80a52d18898 Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Fri, 7 Jul 2017 14:44:43 +0100 Subject: COMPMID-439: Implement NEON Dequantization Layer. Change-Id: I2f4f9d0d3437e9d8142f0f82b330233d31ffd552 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/80086 Tested-by: Kaizen Reviewed-by: Anthony Barbier --- .../NEON/kernels/NEDequantizationLayerKernel.h | 68 ++++++++++ .../runtime/NEON/functions/NEDequantizationLayer.h | 64 +++++++++ .../runtime/NEON/functions/NEQuantizationLayer.h | 2 +- .../NEON/kernels/NEDequantizationLayerKernel.cpp | 103 +++++++++++++++ .../NEON/functions/NEDequantizationLayer.cpp | 48 +++++++ tests/validation_new/CPP/DequantizationLayer.cpp | 55 ++++++++ tests/validation_new/CPP/DequantizationLayer.h | 44 ++++++ tests/validation_new/NEON/DequantizationLayer.cpp | 100 ++++++++++++++ .../fixtures/DequantizationLayerFixture.h | 147 +++++++++++++++++++++ 9 files changed, 630 insertions(+), 1 deletion(-) create mode 100644 arm_compute/core/NEON/kernels/NEDequantizationLayerKernel.h create mode 100644 arm_compute/runtime/NEON/functions/NEDequantizationLayer.h create mode 100644 src/core/NEON/kernels/NEDequantizationLayerKernel.cpp create mode 100644 src/runtime/NEON/functions/NEDequantizationLayer.cpp create mode 100644 tests/validation_new/CPP/DequantizationLayer.cpp create mode 100644 tests/validation_new/CPP/DequantizationLayer.h create mode 100644 tests/validation_new/NEON/DequantizationLayer.cpp create mode 100644 tests/validation_new/fixtures/DequantizationLayerFixture.h diff --git a/arm_compute/core/NEON/kernels/NEDequantizationLayerKernel.h b/arm_compute/core/NEON/kernels/NEDequantizationLayerKernel.h new file mode 100644 index 0000000000..4b26fd54e0 --- /dev/null +++ b/arm_compute/core/NEON/kernels/NEDequantizationLayerKernel.h @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2017 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_NEDEQUANTIZATIONLAYERKERNEL_H__ +#define __ARM_COMPUTE_NEDEQUANTIZATIONLAYERKERNEL_H__ + +#include "arm_compute/core/NEON/INEKernel.h" + +namespace arm_compute +{ +class ITensor; + +/** Interface for the dequantization layer kernel. */ +class NEDequantizationLayerKernel : public INEKernel +{ +public: + /** Default constructor */ + NEDequantizationLayerKernel(); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + NEDequantizationLayerKernel(const NEDequantizationLayerKernel &) = delete; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + NEDequantizationLayerKernel &operator=(const NEDequantizationLayerKernel &) = delete; + /** Default Move Constructor. */ + NEDequantizationLayerKernel(NEDequantizationLayerKernel &&) = default; + /** Default move assignment operator. */ + NEDequantizationLayerKernel &operator=(NEDequantizationLayerKernel &&) = default; + /** Default destructor */ + ~NEDequantizationLayerKernel() = default; + /** Set input, output, min and max. + * + * @param[in] input Source tensor. Data types supported: U8. + * @param[out] output Destination tensor. Data types supported: F32. + * @param[in] min Minimum value of the input tensor. + * @param[in] max Maximum value of the input tensor. + */ + void configure(const ITensor *input, ITensor *output, const float *min, const float *max); + + // Inherited methods overridden: + void run(const Window &window) override; + +private: + const ITensor *_input; + ITensor *_output; + const float *_min; + const float *_max; +}; +} +#endif /*__ARM_COMPUTE_NEDEQUANTIZATIONLAYERKERNEL_H__ */ diff --git a/arm_compute/runtime/NEON/functions/NEDequantizationLayer.h b/arm_compute/runtime/NEON/functions/NEDequantizationLayer.h new file mode 100644 index 0000000000..7cd8360713 --- /dev/null +++ b/arm_compute/runtime/NEON/functions/NEDequantizationLayer.h @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2017 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_NEDEQUANTIZATIONLAYER_H__ +#define __ARM_COMPUTE_NEDEQUANTIZATIONLAYER_H__ + +#include "arm_compute/runtime/IFunction.h" + +#include "arm_compute/core/NEON/kernels/NEDequantizationLayerKernel.h" +#include "arm_compute/runtime/Tensor.h" + +#include "arm_compute/core/Types.h" + +namespace arm_compute +{ +class ITensor; + +/** Basic function to simulate a dequantization layer. This function calls the following NEON kernels: + * + * -# @ref NEDequantizationLayerKernel + * + */ +class NEDequantizationLayer : public IFunction +{ +public: + /** Default constructor */ + NEDequantizationLayer(); + /** Configure the kernel. + * + * @param[in] input Source tensor. Data types supported: U8. + * @param[out] output Destination tensor. Data types supported: F32. + * @param[in] min Minimum value of the input tensor. + * @param[in] max Maximum value of the input tensor. + */ + void configure(const ITensor *input, ITensor *output, const float *min, const float *max); + + // Inherited methods overridden: + void run() override; + +private: + NEDequantizationLayerKernel _dequantize_kernel; +}; +} +#endif /* __ARM_COMPUTE_NEDEQUANTIZATIONLAYER_H__ */ diff --git a/arm_compute/runtime/NEON/functions/NEQuantizationLayer.h b/arm_compute/runtime/NEON/functions/NEQuantizationLayer.h index ad0f68c58c..ab189fe3a2 100644 --- a/arm_compute/runtime/NEON/functions/NEQuantizationLayer.h +++ b/arm_compute/runtime/NEON/functions/NEQuantizationLayer.h @@ -50,7 +50,7 @@ public: /** Set the input and output tensors. * * @param[in] input Source tensor. Data types supported: F32 - * @param[out] output Destination tensor. Data types supported: F32 + * @param[out] output Destination tensor. Data types supported: U8 */ void configure(const ITensor *input, ITensor *output); diff --git a/src/core/NEON/kernels/NEDequantizationLayerKernel.cpp b/src/core/NEON/kernels/NEDequantizationLayerKernel.cpp new file mode 100644 index 0000000000..70685c92c5 --- /dev/null +++ b/src/core/NEON/kernels/NEDequantizationLayerKernel.cpp @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2017 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/NEON/kernels/NEDequantizationLayerKernel.h" + +#include "arm_compute/core/Error.h" +#include "arm_compute/core/Helpers.h" +#include "arm_compute/core/TensorInfo.h" +#include "arm_compute/core/Utils.h" +#include "arm_compute/core/Validate.h" +#include "arm_compute/core/Window.h" + +#include + +using namespace arm_compute; + +NEDequantizationLayerKernel::NEDequantizationLayerKernel() + : _input(nullptr), _output(nullptr), _min(nullptr), _max(nullptr) +{ +} + +void NEDequantizationLayerKernel::configure(const ITensor *input, ITensor *output, const float *min, const float *max) +{ + ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::U8); + ARM_COMPUTE_ERROR_ON_NULLPTR(output); + ARM_COMPUTE_ERROR_ON_NULLPTR(min); + ARM_COMPUTE_ERROR_ON_NULLPTR(max); + + // Output tensor auto initialization if not yet initialized + auto_init_if_empty(*output->info(), input->info()->tensor_shape(), 1, DataType::F32, 0); + + ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(output, 1, DataType::F32); + ARM_COMPUTE_ERROR_ON_MISMATCHING_SHAPES(input, output); + + _input = input; + _output = output; + _min = min; + _max = max; + + constexpr unsigned int num_elems_processed_per_iteration = 8; + + // Configure window + Window win = calculate_max_window(*input->info(), Steps(num_elems_processed_per_iteration)); + AccessWindowHorizontal output_access(output->info(), 0, num_elems_processed_per_iteration); + update_window_and_padding(win, AccessWindowHorizontal(input->info(), 0, num_elems_processed_per_iteration), output_access); + output_access.set_valid_region(win, input->info()->valid_region()); + + INEKernel::configure(win); +} + +void NEDequantizationLayerKernel::run(const Window &window) +{ + ARM_COMPUTE_ERROR_ON_UNCONFIGURED_KERNEL(this); + ARM_COMPUTE_ERROR_ON_INVALID_SUBWINDOW(INEKernel::window(), window); + + Iterator input(_input, window); + Iterator output(_output, window); + + const float32x4_t vmin = vdupq_n_f32(*_min); + const float range = *_max - *_min; + const float32x4_t scaling = vdupq_n_f32(range / 255.0f); + + // Uniformly map values to range 8bit integers, i.e. [min, max] -> [0, 255] + execute_window_loop(window, [&](const Coordinates & id) + { + const uint8x8_t val_u8 = vld1_u8(reinterpret_cast(input.ptr())); + const uint16x8_t val_u16 = vmovl_u8(val_u8); + const uint32x4_t val_u32_low = vmovl_u16(vget_low_u16(val_u16)); + const uint32x4_t val_u32_high = vmovl_u16(vget_high_u16(val_u16)); + float32x4_t val_low = vcvtq_f32_u32(val_u32_low); + float32x4_t val_high = vcvtq_f32_u32(val_u32_high); + + // Dequantize -> (q / 255.0 * range) + min + val_low = vmulq_f32(val_low, scaling); + val_high = vmulq_f32(val_high, scaling); + val_low = vaddq_f32(val_low, vmin); + val_high = vaddq_f32(val_high, vmin); + + const float32x4x2_t dequantized = vuzpq_f32(val_low, val_high); + vst2q_f32(reinterpret_cast(output.ptr()), dequantized); + }, + input, output); +} diff --git a/src/runtime/NEON/functions/NEDequantizationLayer.cpp b/src/runtime/NEON/functions/NEDequantizationLayer.cpp new file mode 100644 index 0000000000..f1743674da --- /dev/null +++ b/src/runtime/NEON/functions/NEDequantizationLayer.cpp @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2017 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/runtime/NEON/functions/NEDequantizationLayer.h" + +#include "arm_compute/core/Error.h" +#include "arm_compute/core/Types.h" +#include "arm_compute/core/Validate.h" +#include "arm_compute/runtime/NEON/NEScheduler.h" + +using namespace arm_compute; + +NEDequantizationLayer::NEDequantizationLayer() + : _dequantize_kernel() +{ +} + +void NEDequantizationLayer::configure(const ITensor *input, ITensor *output, const float *min, const float *max) +{ + // Configure kernels + _dequantize_kernel.configure(input, output, min, max); +} + +void NEDequantizationLayer::run() +{ + NEScheduler::get().schedule(&_dequantize_kernel, Window::DimY); +} diff --git a/tests/validation_new/CPP/DequantizationLayer.cpp b/tests/validation_new/CPP/DequantizationLayer.cpp new file mode 100644 index 0000000000..1c7ec25255 --- /dev/null +++ b/tests/validation_new/CPP/DequantizationLayer.cpp @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2017 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 "DequantizationLayer.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template ::value, int>::type> +SimpleTensor dequantization_layer(const SimpleTensor &src, float min, float max) +{ + // Create reference + SimpleTensor dst{ src.shape(), DataType::F32 }; + + const float range = max - min; + const float scaling = range / 255.0f; + + for(int i = 0; i < src.num_elements(); ++i) + { + dst[i] = (static_cast(src[i]) * scaling) + min; + } + + return dst; +} + +template SimpleTensor dequantization_layer(const SimpleTensor &src, float min, float max); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation_new/CPP/DequantizationLayer.h b/tests/validation_new/CPP/DequantizationLayer.h new file mode 100644 index 0000000000..33592b89b8 --- /dev/null +++ b/tests/validation_new/CPP/DequantizationLayer.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2017 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_DEQUANTIZATION_LAYER_H__ +#define __ARM_COMPUTE_TEST_DEQUANTIZATION_LAYER_H__ + +#include "tests/SimpleTensor.h" +#include "tests/validation_new/Helpers.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template ::value, int>::type = 0> +SimpleTensor dequantization_layer(const SimpleTensor &src, float min, float max); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* __ARM_COMPUTE_TEST_DEQUANTIZATION_LAYER_H__ */ diff --git a/tests/validation_new/NEON/DequantizationLayer.cpp b/tests/validation_new/NEON/DequantizationLayer.cpp new file mode 100644 index 0000000000..8b67a14d12 --- /dev/null +++ b/tests/validation_new/NEON/DequantizationLayer.cpp @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2017 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/NEDequantizationLayer.h" +#include "arm_compute/runtime/Tensor.h" +#include "arm_compute/runtime/TensorAllocator.h" +#include "framework/Asserts.h" +#include "framework/Macros.h" +#include "framework/datasets/Datasets.h" +#include "tests/NEON/Accessor.h" +#include "tests/PaddingCalculator.h" +#include "tests/datasets_new/ShapeDatasets.h" +#include "tests/validation_new/Validation.h" +#include "tests/validation_new/fixtures/DequantizationLayerFixture.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace +{ +/** Tolerance for float operations */ +constexpr AbsoluteTolerance tolerance_f32(0.001f); +} // namespace + +TEST_SUITE(NEON) +TEST_SUITE(DequantizationLayer) + +DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(concat(datasets::Small2DShapes(), datasets::Large2DShapes()), framework::dataset::make("DataType", DataType::U8)), shape, data_type) +{ + // Create tensors + Tensor src = create_tensor(shape, data_type); + Tensor dst = create_tensor(shape, DataType::F32); + + ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Create and configure function + float min = 0.f; + float max = 0.f; + NEDequantizationLayer dequant_layer; + dequant_layer.configure(&src, &dst, &min, &max); + + // 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); + + // Validate padding + const PaddingSize padding = PaddingCalculator(shape.x(), 8).required_padding(); + validate(src.info()->padding(), padding); + validate(dst.info()->padding(), padding); +} + +template +using NEDequantizationLayerFixture = DequantizationValidationFixture; + +TEST_SUITE(Integer) +TEST_SUITE(U8) +FIXTURE_DATA_TEST_CASE(RunSmall, NEDequantizationLayerFixture, framework::DatasetMode::PRECOMMIT, combine(datasets::Small2DShapes(), framework::dataset::make("DataType", DataType::U8))) +{ + // Validate output + validate(Accessor(_target), _reference, tolerance_f32); +} +FIXTURE_DATA_TEST_CASE(RunLarge, NEDequantizationLayerFixture, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(), framework::dataset::make("DataType", DataType::U8))) +{ + // Validate output + validate(Accessor(_target), _reference, tolerance_f32); +} +TEST_SUITE_END() +TEST_SUITE_END() + +TEST_SUITE_END() +TEST_SUITE_END() +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation_new/fixtures/DequantizationLayerFixture.h b/tests/validation_new/fixtures/DequantizationLayerFixture.h new file mode 100644 index 0000000000..35c536d6a0 --- /dev/null +++ b/tests/validation_new/fixtures/DequantizationLayerFixture.h @@ -0,0 +1,147 @@ +/* + * Copyright (c) 2017 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_DEQUANTIZATION_LAYER_FIXTURE +#define ARM_COMPUTE_TEST_DEQUANTIZATION_LAYER_FIXTURE + +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" +#include "arm_compute/runtime/Tensor.h" +#include "framework/Asserts.h" +#include "framework/Fixture.h" +#include "tests/AssetsLibrary.h" +#include "tests/Globals.h" +#include "tests/IAccessor.h" +#include "tests/validation_new/CPP/DequantizationLayer.h" + +#include + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +template +class DequantizationValidationFixedPointFixture : public framework::Fixture +{ +public: + template + void setup(TensorShape shape, DataType data_type) + { + // Initialize random min and max values + rand_min_max(&_min, &_max); + + _target = compute_target(shape, data_type, _min, _max); + _reference = compute_reference(shape, data_type, _min, _max); + } + +protected: + template + void fill(U &&tensor) + { + library->fill_tensor_uniform(tensor, 0); + } + + TensorType compute_target(const TensorShape &shape, DataType data_type, float min, float max) + { + // Create tensors + TensorType src = create_tensor(shape, data_type); + TensorType dst = create_tensor(shape, DataType::F32); + + // Create and configure function + FunctionType dequantization_layer; + dequantization_layer.configure(&src, &dst, &min, &max); + + ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Allocate tensors + src.allocator()->allocate(); + dst.allocator()->allocate(); + + ARM_COMPUTE_EXPECT(!src.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(!dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Fill tensors + fill(AccessorType(src)); + + // Compute function + dequantization_layer.run(); + + return dst; + } + + SimpleTensor compute_reference(const TensorShape &shape, DataType data_type, float min, float max) + { + // Create reference + SimpleTensor src{ shape, data_type }; + + // Fill reference + fill(src); + + return reference::dequantization_layer(src, min, max); + } + + /** Generate random constant values to be used as min and max for dequantization. + */ + void rand_min_max(float *min, float *max) + { + std::mt19937 gen(library->seed()); + std::uniform_real_distribution distribution(-10000.0, 10000.0); + + const float n1 = distribution(gen); + const float n2 = distribution(gen); + + if(n1 < n2) + { + *min = n1; + *max = n2; + } + else + { + *min = n2; + *max = n1; + } + } + + TensorType _target{}; + SimpleTensor _reference{}; + float _min = 0.f; + float _max = 0.f; +}; + +template +class DequantizationValidationFixture : public DequantizationValidationFixedPointFixture +{ +public: + template + void setup(TensorShape shape, DataType data_type) + { + DequantizationValidationFixedPointFixture::setup(shape, data_type); + } +}; +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_DEQUANTIZATION_LAYER_FIXTURE */ -- cgit v1.2.1