From 6631ac22efdb75438e8f35e836ae9f17cfd40c86 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Wed, 17 Apr 2019 12:12:56 +0100 Subject: COMPMID-2116: (Nightly) : CLWidthConcatenate fails on 32-bit for QASYMM8 Fixes width concatenate kernels to check all inputs/output for mismatching quantization info. Change-Id: I87dbb4458d4afb4913143034f031e72a06548098 Signed-off-by: Georgios Pinitas Reviewed-on: https://review.mlplatform.org/c/1007 Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- arm_compute/core/utils/helpers/tensor_info.h | 57 ++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 arm_compute/core/utils/helpers/tensor_info.h (limited to 'arm_compute') diff --git a/arm_compute/core/utils/helpers/tensor_info.h b/arm_compute/core/utils/helpers/tensor_info.h new file mode 100644 index 0000000000..f23ad6e57e --- /dev/null +++ b/arm_compute/core/utils/helpers/tensor_info.h @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2019 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_UTILS_HELPERS_TENSOR_INFO_H__ +#define __ARM_COMPUTE_UTILS_HELPERS_TENSOR_INFO_H__ + +#include "arm_compute/core/ITensorInfo.h" + +namespace arm_compute +{ +namespace helpers +{ +namespace tensor_info +{ +/** Checks if the quantization info of given tensors are different + * + * @param tensor_info_1 Tensor info of the first tensor + * @param tensor_info_2 Tensor info of the second tensor + * @param tensor_infos Tensor infos of the rest tensors + * + * @return True if tensors have mismatching quantization info else false. + */ +template +inline bool tensors_have_different_quantization_info(const ITensorInfo *tensor_info_1, const ITensorInfo *tensor_info_2, Ts... tensor_infos) +{ + const QuantizationInfo first_quantization_info = tensor_info_1->quantization_info(); + + const std::array < const ITensorInfo *, 1 + sizeof...(Ts) > tensor_infos_array{ { tensor_info_2, std::forward(tensor_infos)... } }; + return std::any_of(tensor_infos_array.begin(), tensor_infos_array.end(), [&](const ITensorInfo * tensor_info) + { + return tensor_info->quantization_info() != first_quantization_info; + }); +} +} // namespace tensor_info +} // namespace helpers +} // namespace arm_compute +#endif /* __ARM_COMPUTE_UTILS_HELPERS_TENSOR_INFO_H__ */ -- cgit v1.2.1