From fc35b51d598d12e2a0895ed82d2368f07df68829 Mon Sep 17 00:00:00 2001 From: Sanghoon Lee Date: Wed, 18 Oct 2017 12:09:04 +0100 Subject: COMPMID-580 - Implement reference and CL/NEON validation for Remap Change-Id: I8ae6b5111b594f224ad9b600cdf078459a8cac36 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/93281 Tested-by: Kaizen Reviewed-by: Anthony Barbier --- src/core/CL/kernels/CLRemapKernel.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/core/CL/kernels/CLRemapKernel.cpp') diff --git a/src/core/CL/kernels/CLRemapKernel.cpp b/src/core/CL/kernels/CLRemapKernel.cpp index e63a5ef7c6..b46bb30c59 100644 --- a/src/core/CL/kernels/CLRemapKernel.cpp +++ b/src/core/CL/kernels/CLRemapKernel.cpp @@ -54,6 +54,7 @@ void CLRemapKernel::configure(const ICLTensor *input, const ICLTensor *map_x, co ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(map_x, 1, DataType::F32); ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(map_y, 1, DataType::F32); ARM_COMPUTE_ERROR_ON_MSG(policy == InterpolationPolicy::AREA, "Area interpolation is not supported!"); + ARM_COMPUTE_UNUSED(border_undefined); _input = input; _output = output; @@ -69,12 +70,14 @@ void CLRemapKernel::configure(const ICLTensor *input, const ICLTensor *map_x, co // Configure window constexpr unsigned int num_elems_processed_per_iteration = 4; - const int border_offset = (border_undefined) ? 0 : border_size().left; + + const int total_right = ceil_to_multiple(input->info()->dimension(0), num_elems_processed_per_iteration); + const int access_right = total_right + (((total_right - input->info()->dimension(0)) == 0) ? border_size().right : 0); Window win = calculate_max_window(*_output->info(), Steps(num_elems_processed_per_iteration)); - AccessWindowStatic input_access(output->info(), -border_offset, -border_offset, - _output->info()->dimension(0) + border_offset, _output->info()->dimension(1) + border_offset); - AccessWindowHorizontal output_access(input->info(), 0, num_elems_processed_per_iteration); + AccessWindowStatic input_access(input->info(), -border_size().left, -border_size().top, access_right, input->info()->dimension(1) + border_size().bottom); + + AccessWindowHorizontal output_access(output->info(), 0, num_elems_processed_per_iteration); update_window_and_padding(win, input_access, output_access); -- cgit v1.2.1