diff options
| author | Sang-Hoon Park <sang-hoon.park@arm.com> | 2020-06-24 13:34:04 +0100 |
|---|---|---|
| committer | Sang-Hoon Park <sang-hoon.park@arm.com> | 2020-06-30 11:03:10 +0000 |
| commit | 3687ee1e7719436ff155a35911946b045903e8b6 (patch) | |
| tree | 127d4b9da3996f473cef51f01a07fb02b75c0f1b /src/runtime/NEON/functions/NEScale.cpp | |
| parent | 781cba7f33e056b1ca470ab34eb478177768eaf4 (diff) | |
| download | ComputeLibrary-3687ee1e7719436ff155a35911946b045903e8b6.tar.gz | |
COMPMID-3539: Ignore align_corners for scaled size of 1
Scale kernels failed to validate when align_corners is true
for scaled output size 1. Change this behavior to ignoring
align_corners value to be aligned with expected behavior of
higher-level frameworks.
Also the minimum output size generated by the fixture for
Scale kernels is changed to 1.
Change-Id: Ib8e479af8bc43de3780005545f0c53fe195dc22e
Signed-off-by: Sang-Hoon Park <sang-hoon.park@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3478
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/runtime/NEON/functions/NEScale.cpp')
| -rw-r--r-- | src/runtime/NEON/functions/NEScale.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/runtime/NEON/functions/NEScale.cpp b/src/runtime/NEON/functions/NEScale.cpp index 170b2ee3eb..28fbab4303 100644 --- a/src/runtime/NEON/functions/NEScale.cpp +++ b/src/runtime/NEON/functions/NEScale.cpp @@ -33,6 +33,8 @@ #include "arm_compute/runtime/NEON/NEScheduler.h" #include "arm_compute/runtime/TensorAllocator.h" +#include "src/core/utils/ScaleUtils.h" + #include <cmath> #include <cstddef> #include <utility> @@ -107,7 +109,8 @@ void NEScale::configure(ITensor *input, ITensor *output, const ScaleKernelInfo & ARM_COMPUTE_ERROR_THROW_ON(NEScale::validate(input->info(), output->info(), info)); _use_padding = info.use_padding; - const bool is_align_corners_used = info.align_corners && is_align_corners_allowed(info.sampling_policy); + const bool is_align_corners_used = info.align_corners && arm_compute::scale_utils::is_align_corners_allowed_sampling_policy(info.sampling_policy) + && arm_compute::scale_utils::is_align_corners_allowed_output_shape(output->info()->tensor_shape(), output->info()->data_layout()); // Get data layout and width/height indices const DataLayout data_layout = input->info()->data_layout(); @@ -118,8 +121,8 @@ void NEScale::configure(ITensor *input, ITensor *output, const ScaleKernelInfo & const TensorShape shape(output->info()->dimension(idx_width), output->info()->dimension(idx_height)); // Compute the ratio between source width/height and destination width/height - const auto wr = arm_compute::calculate_resize_ratio(input->info()->dimension(idx_width), output->info()->dimension(idx_width), is_align_corners_used); - const auto hr = arm_compute::calculate_resize_ratio(input->info()->dimension(idx_height), output->info()->dimension(idx_height), is_align_corners_used); + const auto wr = arm_compute::scale_utils::calculate_resize_ratio(input->info()->dimension(idx_width), output->info()->dimension(idx_width), is_align_corners_used); + const auto hr = arm_compute::scale_utils::calculate_resize_ratio(input->info()->dimension(idx_height), output->info()->dimension(idx_height), is_align_corners_used); // Get the element size of the input image const size_t input_element_size = input->info()->element_size(); |