diff options
author | Manuel Bottini <manuel.bottini@arm.com> | 2019-07-10 17:06:12 +0100 |
---|---|---|
committer | Manuel Bottini <manuel.bottini@arm.com> | 2019-07-19 09:49:54 +0000 |
commit | d25af6786c0a714f2b4f099d0338dab17a5dc7e1 (patch) | |
tree | b8a1eafa1d01be903a238fff92ad6acd34b6a499 /tests/validation/reference/UpsampleLayer.cpp | |
parent | db9116ff15170ff734aad0300b46c48abc2a3b7b (diff) | |
download | ComputeLibrary-d25af6786c0a714f2b4f099d0338dab17a5dc7e1.tar.gz |
COMPMID-2456: NEDeconvolutionLayer.cpp, NHWC is not supported
Support of NHWC for NEDeconvolutionLayer
Bugfix for QASYMM8 in CPPUpsample when offset is different than 0
QASYMM8 tests added in NEUpsample with offset different than 0
Change-Id: I8283fa5e5e323fd4d5777136359ddb33025674bb
Signed-off-by: Manuel Bottini <manuel.bottini@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1517
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Pablo Marquez <pablo.tello@arm.com>
Diffstat (limited to 'tests/validation/reference/UpsampleLayer.cpp')
-rw-r--r-- | tests/validation/reference/UpsampleLayer.cpp | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/tests/validation/reference/UpsampleLayer.cpp b/tests/validation/reference/UpsampleLayer.cpp index 876f6d794a..8e36ee857e 100644 --- a/tests/validation/reference/UpsampleLayer.cpp +++ b/tests/validation/reference/UpsampleLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -33,9 +33,10 @@ namespace validation { namespace reference { +namespace +{ template <typename T> -SimpleTensor<T> upsample_layer(const SimpleTensor<T> &src, - const Size2D &info, const InterpolationPolicy policy) +SimpleTensor<T> upsample_function(const SimpleTensor<T> &src, const Size2D &info, const InterpolationPolicy policy) { ARM_COMPUTE_ERROR_ON(policy != InterpolationPolicy::NEAREST_NEIGHBOR); ARM_COMPUTE_UNUSED(policy); @@ -72,16 +73,39 @@ SimpleTensor<T> upsample_layer(const SimpleTensor<T> &src, } } } - return out; } +} // namespace + +template <typename T> +SimpleTensor<T> upsample_layer(const SimpleTensor<T> &src, const Size2D &info, const InterpolationPolicy policy) +{ + return upsample_function<T>(src, info, policy); +} + +template <> +SimpleTensor<uint8_t> upsample_layer(const SimpleTensor<uint8_t> &src, const Size2D &info, const InterpolationPolicy policy) +{ + SimpleTensor<uint8_t> dst(src.shape(), src.data_type(), 1, src.quantization_info()); + + if(is_data_type_quantized_asymmetric(src.data_type())) + { + SimpleTensor<float> src_tmp = convert_from_asymmetric(src); + SimpleTensor<float> dst_tmp = upsample_function<float>(src_tmp, info, policy); + dst = convert_to_asymmetric(dst_tmp, src.quantization_info()); + } + else + { + dst = upsample_function<uint8_t>(src, info, policy); + } + return dst; +} + template SimpleTensor<float> upsample_layer(const SimpleTensor<float> &src, const Size2D &info, const InterpolationPolicy policy); template SimpleTensor<half> upsample_layer(const SimpleTensor<half> &src, const Size2D &info, const InterpolationPolicy policy); -template SimpleTensor<uint8_t> upsample_layer(const SimpleTensor<uint8_t> &src, - const Size2D &info, const InterpolationPolicy policy); } // namespace reference } // namespace validation } // namespace test |