From afbc5ffb0b567ae93fa2765066bd136d72be88ff Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Wed, 3 Oct 2018 14:18:19 +0100 Subject: COMPMID-1621 Deconvolution wrong output calculation Change-Id: Ida71312bcf6dbd854f2ab1efc65f74910c79e152 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/151510 Tested-by: bsgcomp Reviewed-by: Michele DiGiorgio --- src/core/CPP/kernels/CPPFlipWeightsKernel.cpp | 106 ++++++++++++++++++++++++++ src/core/Utils.cpp | 15 ++-- 2 files changed, 112 insertions(+), 9 deletions(-) create mode 100644 src/core/CPP/kernels/CPPFlipWeightsKernel.cpp (limited to 'src/core') diff --git a/src/core/CPP/kernels/CPPFlipWeightsKernel.cpp b/src/core/CPP/kernels/CPPFlipWeightsKernel.cpp new file mode 100644 index 0000000000..741218e4f7 --- /dev/null +++ b/src/core/CPP/kernels/CPPFlipWeightsKernel.cpp @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2018 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#include "arm_compute/core/CPP/kernels/CPPFlipWeightsKernel.h" + +#include "arm_compute/core/Error.h" +#include "arm_compute/core/Helpers.h" +#include "arm_compute/core/ITensor.h" +#include "arm_compute/core/TensorInfo.h" +#include "arm_compute/core/Types.h" +#include "arm_compute/core/Validate.h" +#include "arm_compute/core/utils/misc/ShapeCalculator.h" + +#include +#include + +using namespace arm_compute; + +CPPFlipWeightsKernel::CPPFlipWeightsKernel() + : _input(nullptr), _output(nullptr), _func(nullptr) +{ +} + +template +void CPPFlipWeightsKernel::flip_weights(const Window &window_input, const Window &window) +{ + // Create iterators + Iterator in(_input, window_input); + + Iterator out(_output, window); + + const int kernel_size = _input->info()->dimension(0); + + execute_window_loop(window_input, [&](const Coordinates & id) + { + *((reinterpret_cast(out.ptr()) + kernel_size * (kernel_size - id.y() - 1) + (kernel_size - id.x() - 1))) = *(reinterpret_cast(in.ptr())); + }, + in, out); +} + +void CPPFlipWeightsKernel::configure(const ITensor *input, ITensor *output) +{ + ARM_COMPUTE_ERROR_ON_NULLPTR(input, output); + + _input = input; + _output = output; + + // Configure kernel window + Window win = calculate_max_window(*input->info(), Steps()); + + // The CPPFlipWeightsKernel doesn't need padding so update_window_and_padding() can be skipped + Coordinates coord; + coord.set_num_dimensions(output->info()->num_dimensions()); + output->info()->set_valid_region(ValidRegion(coord, output->info()->tensor_shape())); + + ICPPKernel::configure(win); + + switch(input->info()->data_type()) + { + case DataType::F32: + _func = &CPPFlipWeightsKernel::flip_weights; + break; + case DataType::F16: + _func = &CPPFlipWeightsKernel::flip_weights; + break; + case DataType::QASYMM8: + _func = &CPPFlipWeightsKernel::flip_weights; + break; + default: + ARM_COMPUTE_ERROR("Not supported"); + } +} + +void CPPFlipWeightsKernel::run(const Window &window, const ThreadInfo &info) +{ + ARM_COMPUTE_UNUSED(info); + ARM_COMPUTE_ERROR_ON_UNCONFIGURED_KERNEL(this); + ARM_COMPUTE_ERROR_ON_INVALID_SUBWINDOW(ICPPKernel::window(), window); + ARM_COMPUTE_ERROR_ON(_func == nullptr); + + Window out_window{ window }; + out_window.set(Window::DimX, Window::Dimension(0, 0, 0)); + out_window.set(Window::DimY, Window::Dimension(0, 0, 0)); + + (this->*_func)(window, out_window); +} diff --git a/src/core/Utils.cpp b/src/core/Utils.cpp index 229579d8d9..a6a5771ec1 100644 --- a/src/core/Utils.cpp +++ b/src/core/Utils.cpp @@ -334,17 +334,14 @@ TensorShape arm_compute::deconvolution_output_shape(const std::pair arm_compute::deconvolution_output_dimensions( unsigned int in_width, unsigned int in_height, unsigned int kernel_width, unsigned int kernel_height, unsigned int padx, unsigned int pady, - unsigned int inner_border_right, unsigned int inner_border_top, unsigned int stride_x, unsigned int stride_y) + unsigned int stride_x, unsigned int stride_y) { ARM_COMPUTE_ERROR_ON(in_width < 1 || in_height < 1); - ARM_COMPUTE_ERROR_ON(((in_width - 1) * stride_x + kernel_width + inner_border_right) < 2 * padx); - ARM_COMPUTE_ERROR_ON(((in_height - 1) * stride_y + kernel_height + inner_border_top) < 2 * pady); - const int padx_deconv = (kernel_width - padx - 1); - const int pady_deconv = (kernel_height - pady - 1); - ARM_COMPUTE_ERROR_ON(padx_deconv < 0); - ARM_COMPUTE_ERROR_ON(pady_deconv < 0); - const int w = stride_x * (in_width - 1) + kernel_width + inner_border_right - 2 * padx_deconv; - const int h = stride_y * (in_height - 1) + kernel_height + inner_border_top - 2 * pady_deconv; + ARM_COMPUTE_ERROR_ON(((in_width - 1) * stride_x + kernel_width) < 2 * padx); + ARM_COMPUTE_ERROR_ON(((in_height - 1) * stride_y + kernel_height) < 2 * pady); + const int w = stride_x * (in_width - 1) + kernel_width - 2 * padx; + const int h = stride_y * (in_height - 1) + kernel_height - 2 * pady; + return std::make_pair(w, h); } -- cgit v1.2.1