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/NEON/kernels/NERemapKernel.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'src/core/NEON') diff --git a/src/core/NEON/kernels/NERemapKernel.cpp b/src/core/NEON/kernels/NERemapKernel.cpp index 83004aedc1..9b8d931b39 100644 --- a/src/core/NEON/kernels/NERemapKernel.cpp +++ b/src/core/NEON/kernels/NERemapKernel.cpp @@ -68,6 +68,11 @@ NERemapKernel::NERemapKernel() { } +BorderSize NERemapKernel::border_size() const +{ + return BorderSize(1); +} + void NERemapKernel::configure(const ITensor *input, const ITensor *map_x, const ITensor *map_y, ITensor *output, InterpolationPolicy policy) { ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::U8); @@ -102,15 +107,19 @@ void NERemapKernel::configure(const ITensor *input, const ITensor *map_x, const // Configure kernel window Window win = calculate_max_window(*output->info(), Steps(num_elems_processed_per_iteration)); - AccessWindowStatic output_access(output->info(), 0, 0, output->info()->dimension(0), output->info()->dimension(1)); + 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); + + 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, - AccessWindowRectangle(input->info(), 0, 0, num_elems_processed_per_iteration, 1), + update_window_and_padding(win, input_access, AccessWindowRectangle(map_x->info(), 0, 0, num_elems_processed_per_iteration, 1), AccessWindowRectangle(map_y->info(), 0, 0, num_elems_processed_per_iteration, 1), output_access); - output_access.set_valid_region(win, ValidRegion(Coordinates(0, 0), output->info()->tensor_shape())); + output_access.set_valid_region(win, ValidRegion(Coordinates(), output->info()->tensor_shape())); INEKernel::configure(win); } -- cgit v1.2.1