From 17220e2eb49e75b85f2b802489a44b8019997c25 Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Wed, 12 Sep 2018 13:35:38 +0100 Subject: COMPMID-1507 Add support for QASYMM8 in CLScaleKernel Change-Id: I4a32e47e6d9152633668cf0e14db88fc8c26f7ea Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/148167 Tested-by: bsgcomp Reviewed-by: Michele DiGiorgio --- tests/validation/fixtures/ScaleFixture.h | 70 +++++++++++++++++++++++++------- 1 file changed, 56 insertions(+), 14 deletions(-) (limited to 'tests/validation/fixtures') diff --git a/tests/validation/fixtures/ScaleFixture.h b/tests/validation/fixtures/ScaleFixture.h index 5413147699..2be02ec4d6 100644 --- a/tests/validation/fixtures/ScaleFixture.h +++ b/tests/validation/fixtures/ScaleFixture.h @@ -41,20 +41,21 @@ namespace test namespace validation { template -class ScaleValidationFixture : public framework::Fixture +class ScaleValidationGenericFixture : public framework::Fixture { public: template - void setup(TensorShape shape, DataType data_type, DataLayout data_layout, InterpolationPolicy policy, BorderMode border_mode, SamplingPolicy sampling_policy) + void setup(TensorShape shape, DataType data_type, QuantizationInfo quantization_info, DataLayout data_layout, InterpolationPolicy policy, BorderMode border_mode, SamplingPolicy sampling_policy) { constexpr float max_width = 8192.0f; constexpr float max_height = 6384.0f; - _shape = shape; - _policy = policy; - _border_mode = border_mode; - _sampling_policy = sampling_policy; - _data_type = data_type; + _shape = shape; + _policy = policy; + _border_mode = border_mode; + _sampling_policy = sampling_policy; + _data_type = data_type; + _quantization_info = quantization_info; std::mt19937 generator(library->seed()); std::uniform_real_distribution distribution_float(0.25, 3); @@ -70,8 +71,8 @@ public: std::uniform_int_distribution distribution_u8(0, 255); T constant_border_value = static_cast(distribution_u8(generator)); - _target = compute_target(shape, data_layout, scale_x, scale_y, policy, border_mode, constant_border_value, sampling_policy); - _reference = compute_reference(shape, scale_x, scale_y, policy, border_mode, constant_border_value, sampling_policy); + _target = compute_target(shape, data_layout, scale_x, scale_y, policy, border_mode, constant_border_value, sampling_policy, quantization_info); + _reference = compute_reference(shape, scale_x, scale_y, policy, border_mode, constant_border_value, sampling_policy, quantization_info); } protected: @@ -82,6 +83,11 @@ protected: { library->fill_tensor_uniform(tensor, 0); } + else if(is_data_type_quantized(tensor.data_type())) + { + std::uniform_int_distribution<> distribution(0, 100); + library->fill(tensor, distribution, 0); + } else { // Restrict range for float to avoid any floating point issues @@ -91,7 +97,8 @@ protected: } TensorType compute_target(TensorShape shape, DataLayout data_layout, const float scale_x, const float scale_y, - InterpolationPolicy policy, BorderMode border_mode, T constant_border_value, SamplingPolicy sampling_policy) + InterpolationPolicy policy, BorderMode border_mode, T constant_border_value, SamplingPolicy sampling_policy, + QuantizationInfo quantization_info) { // Change shape in case of NHWC. if(data_layout == DataLayout::NHWC) @@ -100,7 +107,7 @@ protected: } // Create tensors - TensorType src = create_tensor(shape, _data_type, 1, QuantizationInfo(), data_layout); + TensorType src = create_tensor(shape, _data_type, 1, quantization_info, data_layout); const int idx_width = get_data_layout_dimension_index(data_layout, DataLayoutDimension::WIDTH); const int idx_height = get_data_layout_dimension_index(data_layout, DataLayoutDimension::HEIGHT); @@ -108,7 +115,7 @@ protected: TensorShape shape_scaled(shape); shape_scaled.set(idx_width, shape[idx_width] * scale_x); shape_scaled.set(idx_height, shape[idx_height] * scale_y); - TensorType dst = create_tensor(shape_scaled, _data_type, 1, QuantizationInfo(), data_layout); + TensorType dst = create_tensor(shape_scaled, _data_type, 1, quantization_info, data_layout); // Create and configure function FunctionType scale; @@ -134,10 +141,11 @@ protected: } SimpleTensor compute_reference(const TensorShape &shape, const float scale_x, const float scale_y, - InterpolationPolicy policy, BorderMode border_mode, T constant_border_value, SamplingPolicy sampling_policy) + InterpolationPolicy policy, BorderMode border_mode, T constant_border_value, SamplingPolicy sampling_policy, + QuantizationInfo quantization_info) { // Create reference - SimpleTensor src{ shape, _data_type, 1, QuantizationInfo() }; + SimpleTensor src{ shape, _data_type, 1, quantization_info }; // Fill reference fill(src); @@ -152,6 +160,40 @@ protected: BorderMode _border_mode{}; SamplingPolicy _sampling_policy{}; DataType _data_type{}; + QuantizationInfo _quantization_info{}; +}; + +template +class ScaleValidationQuantizedFixture : public ScaleValidationGenericFixture +{ +public: + template + void setup(TensorShape shape, DataType data_type, QuantizationInfo quantization_info, DataLayout data_layout, InterpolationPolicy policy, BorderMode border_mode, SamplingPolicy sampling_policy) + { + ScaleValidationGenericFixture::setup(shape, + data_type, + quantization_info, + data_layout, + policy, + border_mode, + sampling_policy); + } +}; +template +class ScaleValidationFixture : public ScaleValidationGenericFixture +{ +public: + template + void setup(TensorShape shape, DataType data_type, DataLayout data_layout, InterpolationPolicy policy, BorderMode border_mode, SamplingPolicy sampling_policy) + { + ScaleValidationGenericFixture::setup(shape, + data_type, + QuantizationInfo(), + data_layout, + policy, + border_mode, + sampling_policy); + } }; } // namespace validation } // namespace test -- cgit v1.2.1