From c1b76faf6be5c33dbf3269faea95e185ac37992f Mon Sep 17 00:00:00 2001 From: Manuel Bottini Date: Mon, 17 Jun 2019 12:04:40 +0100 Subject: COMPMID-2092: Refactoring interface for the deconvolution kernels (NEON/CL) 3RDPARTY_UPDATE Change-Id: Id7ddf97e2c9ceb2cb84084fab2c6f5697890c193 Signed-off-by: giuros01 Reviewed-on: https://review.mlplatform.org/c/1424 Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins Reviewed-by: Georgios Pinitas --- src/core/CPP/kernels/CPPUpsampleKernel.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/core/CPP/kernels') diff --git a/src/core/CPP/kernels/CPPUpsampleKernel.cpp b/src/core/CPP/kernels/CPPUpsampleKernel.cpp index d29c0f72f1..6620ce2aeb 100644 --- a/src/core/CPP/kernels/CPPUpsampleKernel.cpp +++ b/src/core/CPP/kernels/CPPUpsampleKernel.cpp @@ -37,7 +37,7 @@ using namespace arm_compute; CPPUpsampleKernel::CPPUpsampleKernel() - : _input(nullptr), _output(nullptr), _info(), _inner_border() + : _input(nullptr), _output(nullptr), _info() { } @@ -46,14 +46,13 @@ bool CPPUpsampleKernel::is_parallelisable() const return false; } -void CPPUpsampleKernel::configure(const ITensor *input, ITensor *output, const PadStrideInfo &info, unsigned int inner_border_right, unsigned int inner_border_top) +void CPPUpsampleKernel::configure(const ITensor *input, ITensor *output, const PadStrideInfo &info) { ARM_COMPUTE_ERROR_ON_NULLPTR(input, output); - _input = input; - _output = output; - _info = info; - _inner_border = std::make_pair(inner_border_right, inner_border_top); + _input = input; + _output = output; + _info = info; // Configure kernel window Window win = calculate_max_window(*input->info(), Steps()); @@ -78,9 +77,9 @@ void CPPUpsampleKernel::run(const Window &window, const ThreadInfo &info) const int stride_x = _info.stride().first; const int stride_y = _info.stride().second; const int start_x = _info.pad().first; - const int start_y = _inner_border.second + _info.pad().second; + const int start_y = _info.pad().second; const int end_y = height_scaled - _info.pad().second; - const int end_x = width_scaled - _inner_border.first - _info.pad().first; + const int end_x = width_scaled - _info.pad().first; const size_t element_size = _input->info()->element_size(); std::fill_n(_output->buffer(), _output->info()->total_size(), 0); -- cgit v1.2.1