diff options
| author | Michalis Spyrou <michalis.spyrou@arm.com> | 2018-10-03 14:18:19 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:55:45 +0000 |
| commit | afbc5ffb0b567ae93fa2765066bd136d72be88ff (patch) | |
| tree | 328005d70d5526609a9d84173a317fd1f10b4ed2 /arm_compute/core/utils | |
| parent | 67d94d29c154a376d12e582421323c1d250da20c (diff) | |
| download | ComputeLibrary-afbc5ffb0b567ae93fa2765066bd136d72be88ff.tar.gz | |
COMPMID-1621 Deconvolution wrong output calculation
Change-Id: Ida71312bcf6dbd854f2ab1efc65f74910c79e152
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/151510
Tested-by: bsgcomp <bsgcomp@arm.com>
Reviewed-by: Michele DiGiorgio <michele.digiorgio@arm.com>
Diffstat (limited to 'arm_compute/core/utils')
| -rw-r--r-- | arm_compute/core/utils/misc/ShapeCalculator.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/arm_compute/core/utils/misc/ShapeCalculator.h b/arm_compute/core/utils/misc/ShapeCalculator.h index 804ff3c709..f68401c1b9 100644 --- a/arm_compute/core/utils/misc/ShapeCalculator.h +++ b/arm_compute/core/utils/misc/ShapeCalculator.h @@ -229,11 +229,20 @@ inline TensorShape compute_depthwise_convolution_shape(const ITensorInfo &input, return output_shape; } -inline TensorShape compute_deconvolution_shape(const ITensorInfo &input, unsigned int sx, unsigned int sy, unsigned int inner_border_right, unsigned int inner_border_top, const PadStrideInfo &info) +inline TensorShape compute_deconvolution_shape(const ITensorInfo &input, const ITensorInfo &weights, unsigned int sx, unsigned int sy, unsigned int inner_border_right, unsigned int inner_border_top, + std::pair<unsigned int, unsigned int> &out_dims) { - TensorShape scale_out_shape(input.tensor_shape()); - const unsigned int out_x = input.dimension(0) + (input.dimension(0) - 1) * (sx - 1) + inner_border_right + 2 * info.pad().first; - const unsigned int out_y = input.dimension(1) + (input.dimension(1) - 1) * (sy - 1) + inner_border_top + 2 * info.pad().second; + // Find the upsampled dimensions + unsigned int out_x = (input.dimension(0) - 1) * sx + inner_border_right + 1; + unsigned int out_y = (input.dimension(1) - 1) * sy + inner_border_top + 1; + + // Find the padding needed for the convolution with stride 1 in order to match output shape + unsigned int padx = out_dims.first - (out_x - weights.dimension(0) + 1); + unsigned int pady = out_dims.second - (out_y - weights.dimension(1) + 1); + out_x += padx; + out_y += pady; + + TensorShape scale_out_shape(input.tensor_shape()); scale_out_shape.set(0, out_x); scale_out_shape.set(1, out_y); |