From 00854295ac18e1a79d99e6f1692432503cc71448 Mon Sep 17 00:00:00 2001 From: Diego Lopez Recas Date: Thu, 22 Feb 2018 13:08:01 +0000 Subject: COMPMID-959: Fix valid region for Scale Change-Id: Ic9ce52d772a178916dfa60fbb6456d295c06b83d Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/122647 Tested-by: Jenkins Reviewed-by: Anthony Barbier --- src/core/CL/kernels/CLScaleKernel.cpp | 2 +- src/core/GLES_COMPUTE/kernels/GCScaleKernel.cpp | 3 +- src/core/Helpers.cpp | 72 +++++++++++++++++++++++++ src/core/NEON/kernels/NEScaleKernel.cpp | 6 ++- 4 files changed, 79 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/core/CL/kernels/CLScaleKernel.cpp b/src/core/CL/kernels/CLScaleKernel.cpp index f3d918514e..9b8a582349 100644 --- a/src/core/CL/kernels/CLScaleKernel.cpp +++ b/src/core/CL/kernels/CLScaleKernel.cpp @@ -102,7 +102,7 @@ void CLScaleKernel::configure(const ICLTensor *input, ICLTensor *output, Interpo output_access.set_valid_region(win, calculate_valid_region_scale(*(input->info()), output->info()->tensor_shape(), policy, - border, + sampling_policy, border_undefined)); ICLKernel::configure(win); diff --git a/src/core/GLES_COMPUTE/kernels/GCScaleKernel.cpp b/src/core/GLES_COMPUTE/kernels/GCScaleKernel.cpp index 46d7ff9172..f87615a27c 100644 --- a/src/core/GLES_COMPUTE/kernels/GCScaleKernel.cpp +++ b/src/core/GLES_COMPUTE/kernels/GCScaleKernel.cpp @@ -51,7 +51,6 @@ void GCScaleKernel::configure(const IGCTensor *input, IGCTensor *output, Interpo ARM_COMPUTE_ERROR_ON_MISMATCHING_DATA_TYPES(input, output); ARM_COMPUTE_ERROR_ON(output == input); ARM_COMPUTE_ERROR_ON(policy != InterpolationPolicy::NEAREST_NEIGHBOR); - ARM_COMPUTE_UNUSED(sampling_policy); _input = input; _output = output; @@ -123,7 +122,7 @@ void GCScaleKernel::configure(const IGCTensor *input, IGCTensor *output, Interpo output_access.set_valid_region(win, calculate_valid_region_scale(*(input->info()), output->info()->tensor_shape(), policy, - border, + sampling_policy, border_undefined)); IGCKernel::configure(win); diff --git a/src/core/Helpers.cpp b/src/core/Helpers.cpp index 0e7cd99eab..c39922bf03 100644 --- a/src/core/Helpers.cpp +++ b/src/core/Helpers.cpp @@ -173,3 +173,75 @@ Window arm_compute::calculate_max_window_horizontal(const ValidRegion &valid_reg return window; } + +ValidRegion arm_compute::calculate_valid_region_scale(const ITensorInfo &src_info, const TensorShape &dst_shape, + InterpolationPolicy interpolate_policy, SamplingPolicy sampling_policy, bool border_undefined) +{ + const float scale_x = static_cast(dst_shape[0]) / src_info.tensor_shape()[0]; + const float scale_y = static_cast(dst_shape[1]) / src_info.tensor_shape()[1]; + const float sampling_point = (sampling_policy == SamplingPolicy::CENTER) ? 0.5f : 0.0f; + + // Get input's valid region start and end points + const int valid_start_in_x = src_info.valid_region().anchor[0]; + const int valid_start_in_y = src_info.valid_region().anchor[1]; + const int valid_end_in_x = src_info.valid_region().anchor[0] + src_info.valid_region().shape[0]; + const int valid_end_in_y = src_info.valid_region().anchor[1] + src_info.valid_region().shape[1]; + + // Initialize output's valid region start and end points + auto valid_start_out_x = static_cast(valid_start_in_x * scale_x); + auto valid_start_out_y = static_cast(valid_start_in_y * scale_y); + auto valid_end_out_x = std::min(std::ceil(valid_end_in_x * scale_x), dst_shape[0]); + auto valid_end_out_y = std::min(std::ceil(valid_end_in_y * scale_y), dst_shape[1]); + + // Handle valid points in case of the bi-linear interpolation + if(border_undefined) + { + switch(interpolate_policy) + { + case InterpolationPolicy::NEAREST_NEIGHBOR: + { + // (start_out + sampling_point) >= (start_in * scale) + // start_out = ceil((start_in * scale) - sampling_point) + valid_start_out_x = std::ceil(valid_start_in_x * scale_x - sampling_point); + valid_start_out_y = std::ceil(valid_start_in_y * scale_y - sampling_point); + + // (end_out - 1 + sampling_point) < (end_in * scale) + // end_out = ceil((end_in * scale) - sampling_point); // <-- ceil(x - 1) strictly less + valid_end_out_x = std::ceil(valid_end_in_x * scale_x - sampling_point); + valid_end_out_y = std::ceil(valid_end_in_y * scale_y - sampling_point); + break; + } + case InterpolationPolicy::BILINEAR: + { + // (start_out + sampling_point) >= ((start_in + sampling_point) * scale) + // start_out = ceil(((start_in + sampling_point) * scale) - sampling_point) + valid_start_out_x = std::ceil((valid_start_in_x + sampling_point) * scale_x - sampling_point); + valid_start_out_y = std::ceil((valid_start_in_y + sampling_point) * scale_y - sampling_point); + + // (end_out - 1 + sampling_point) <= ((end_in - 1 + sampling_point) * scale) + // end_out = floor(((end_in - 1 + sampling_point) * scale) - sampling_point + 1) + valid_end_out_x = std::floor((valid_end_in_x - 1.f + sampling_point) * scale_x - sampling_point + 1.f); + valid_end_out_y = std::floor((valid_end_in_y - 1.f + sampling_point) * scale_y - sampling_point + 1.f); + break; + } + case InterpolationPolicy::AREA: + break; + default: + { + ARM_COMPUTE_ERROR("Invalid InterpolationPolicy"); + break; + } + } + } + + // Setup output valid region + ValidRegion valid_region{ Coordinates(), dst_shape, src_info.tensor_shape().num_dimensions() }; + + valid_region.anchor.set(0, std::max(0, valid_start_out_x)); + valid_region.anchor.set(1, std::max(0, valid_start_out_y)); + + valid_region.shape.set(0, std::min(valid_end_out_x - valid_start_out_x, dst_shape[0])); + valid_region.shape.set(1, std::min(valid_end_out_y - valid_start_out_y, dst_shape[1])); + + return valid_region; +} \ No newline at end of file diff --git a/src/core/NEON/kernels/NEScaleKernel.cpp b/src/core/NEON/kernels/NEScaleKernel.cpp index b5677dedac..852ec3e023 100644 --- a/src/core/NEON/kernels/NEScaleKernel.cpp +++ b/src/core/NEON/kernels/NEScaleKernel.cpp @@ -142,7 +142,11 @@ void NEScaleKernel::configure(const ITensor *input, const ITensor *dx, const ITe dy_access, output_access); - output_access.set_valid_region(win, calculate_valid_region_scale(*(input->info()), output->info()->tensor_shape(), policy, border_size(), border_undefined)); + output_access.set_valid_region(win, calculate_valid_region_scale(*(input->info()), + output->info()->tensor_shape(), + policy, + sampling_policy, + border_undefined)); INEKernel::configure(win); } -- cgit v1.2.1