From 7a81d2aaf33d1d134148d051b901567db5908922 Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Thu, 30 Jul 2020 14:52:16 +0100 Subject: COMPMID-3624: CTS failure on Resize quantized in Neon and CL Allow computations with aligned corners when the tensors have width/height equal to 1. Change-Id: Ia01733f6c02e0740835b26a794b9a79fa35319b4 Signed-off-by: Michele Di Giorgio Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3634 Tested-by: Arm Jenkins Reviewed-by: Sadik Armagan Reviewed-by: Georgios Pinitas Comments-Addressed: Arm Jenkins --- src/core/utils/ScaleUtils.cpp | 9 +-------- src/core/utils/ScaleUtils.h | 9 --------- 2 files changed, 1 insertion(+), 17 deletions(-) (limited to 'src/core/utils') diff --git a/src/core/utils/ScaleUtils.cpp b/src/core/utils/ScaleUtils.cpp index bf059f7df2..d46ca0ea8e 100644 --- a/src/core/utils/ScaleUtils.cpp +++ b/src/core/utils/ScaleUtils.cpp @@ -26,7 +26,7 @@ float arm_compute::scale_utils::calculate_resize_ratio(size_t input_size, size_t output_size, bool align_corners) { - const size_t offset = align_corners ? 1 : 0; + const size_t offset = (align_corners && output_size > 1) ? 1 : 0; const auto in = input_size - offset; const auto out = output_size - offset; @@ -34,11 +34,4 @@ float arm_compute::scale_utils::calculate_resize_ratio(size_t input_size, size_t ARM_COMPUTE_ERROR_ON(out == 0); return static_cast(in) / static_cast(out); -} - -bool arm_compute::scale_utils::is_align_corners_allowed_output_shape(const TensorShape &output_shape, DataLayout layout) -{ - const size_t idx_width = get_data_layout_dimension_index(layout, DataLayoutDimension::WIDTH); - const size_t idx_height = get_data_layout_dimension_index(layout, DataLayoutDimension::HEIGHT); - return (output_shape[idx_width] > 1) && (output_shape[idx_height] > 1); } \ No newline at end of file diff --git a/src/core/utils/ScaleUtils.h b/src/core/utils/ScaleUtils.h index 894bd1edc4..3cc986b1db 100644 --- a/src/core/utils/ScaleUtils.h +++ b/src/core/utils/ScaleUtils.h @@ -53,15 +53,6 @@ inline bool is_align_corners_allowed_sampling_policy(SamplingPolicy sampling_pol { return sampling_policy != SamplingPolicy::CENTER; } - -/** Returns if aligned corners are allowed for the given output shape - * - * @param[in] output_shape The shape of the scaled output tensor - * @param[in] layout The data layout of the output tensor - * - * @return True if aligned corners are allowed - */ -bool is_align_corners_allowed_output_shape(const TensorShape &output_shape, DataLayout layout); } // namespace scale_utils } // namespace arm_compute #endif /* UTILS_CORE_SCALEUTILS_H */ \ No newline at end of file -- cgit v1.2.1