diff options
| author | Luca Foschiani <luca.foschiani@arm.com> | 2020-01-21 16:24:16 +0000 |
|---|---|---|
| committer | Michalis Spyrou <michalis.spyrou@arm.com> | 2020-01-24 10:33:33 +0000 |
| commit | 5c09ae8d3f82ddf8bf9438fc67e1991b62ae88e3 (patch) | |
| tree | a28b63bd6a06858f25719e6f7c00ed05d55d60f8 /tests | |
| parent | d374ff2eb5d50785fb1d39d53b01109e452f4cfe (diff) | |
| download | ComputeLibrary-5c09ae8d3f82ddf8bf9438fc67e1991b62ae88e3.tar.gz | |
COMPMID-2809 Added support for QASYMM8_SIGNED in NEUpsampleLayer
Signed-off-by: Luca Foschiani <luca.foschiani@arm.com>
Change-Id: I61638cb1e4f65130b150a456dc1cdb90099b0efa
Reviewed-on: https://review.mlplatform.org/c/2615
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/validation/NEON/Upsample.cpp | 16 | ||||
| -rw-r--r-- | tests/validation/fixtures/UpsampleLayerFixture.h | 13 |
2 files changed, 16 insertions, 13 deletions
diff --git a/tests/validation/NEON/Upsample.cpp b/tests/validation/NEON/Upsample.cpp index 9ddfbe0f8e..50aadeff05 100644 --- a/tests/validation/NEON/Upsample.cpp +++ b/tests/validation/NEON/Upsample.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -149,8 +149,20 @@ FIXTURE_DATA_TEST_CASE(RunSmall, NEUpsampleLayerQuantizedFixture<uint8_t>, frame // Validate output validate(Accessor(_target), _reference); } -TEST_SUITE_END() // Quantized TEST_SUITE_END() // QASYMM8 +TEST_SUITE(QASYMM8_SIGNED) +FIXTURE_DATA_TEST_CASE(RunSmall, NEUpsampleLayerQuantizedFixture<int8_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(combine(datasets::SmallShapes(), + framework::dataset::make("DataType", DataType::QASYMM8_SIGNED)), + framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })), + framework::dataset::make("PadInfo", { Size2D(2, 2) })), + framework::dataset::make("UpsamplingPolicy", { InterpolationPolicy::NEAREST_NEIGHBOR })), + framework::dataset::make("QuantizationInfo", QuantizationInfo(2.f / 255.f, 10)))) +{ + // Validate output + validate(Accessor(_target), _reference); +} +TEST_SUITE_END() // QASYMM8_SIGNED +TEST_SUITE_END() // Quantized TEST_SUITE_END() // UpsampleLayer TEST_SUITE_END() // NEON diff --git a/tests/validation/fixtures/UpsampleLayerFixture.h b/tests/validation/fixtures/UpsampleLayerFixture.h index 0a72e44dad..e46e19a635 100644 --- a/tests/validation/fixtures/UpsampleLayerFixture.h +++ b/tests/validation/fixtures/UpsampleLayerFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -57,16 +57,7 @@ protected: template <typename U> void fill(U &&tensor, int i) { - if(_data_type == DataType::QASYMM8) - { - const auto bounds = get_quantized_bounds(tensor.quantization_info(), -1.0f, 1.0f); - std::uniform_int_distribution<uint8_t> distribution(bounds.first, bounds.second); - library->fill(tensor, distribution, i); - } - else - { - library->fill_tensor_uniform(tensor, i); - } + library->fill_tensor_uniform(tensor, i); } TensorType compute_target(TensorShape input_shape, const Size2D &info, const InterpolationPolicy &policy, |