From 01bbacb465da79d3b4d1a3f313b172fe295642f5 Mon Sep 17 00:00:00 2001 From: Pablo Tello Date: Tue, 30 Apr 2019 10:32:42 +0100 Subject: COMPMID-2176: Add dilation support in calculate_same_pad() Change-Id: Ic12138cd3ebd3198c854b13eef02717137bda660 Signed-off-by: Pablo Tello Reviewed-on: https://review.mlplatform.org/c/1059 Tested-by: Arm Jenkins Reviewed-by: Usama Arif Comments-Addressed: Usama Arif Reviewed-by: Michalis Spyrou --- arm_compute/core/Utils.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'arm_compute/core/Utils.h') diff --git a/arm_compute/core/Utils.h b/arm_compute/core/Utils.h index 2640264f55..1de0df6096 100644 --- a/arm_compute/core/Utils.h +++ b/arm_compute/core/Utils.h @@ -828,10 +828,11 @@ inline void permute_strides(Dimensions &dimensions, const PermutationVector & * @param[in] weights_shape Weights shape * @param[in] conv_info Convolution information (containing strides) * @param[in] data_layout (Optional) Data layout of the input and weights tensor + * @param[in] dilation (Optional) Dilation factor used in the convolution. * * @return PadStrideInfo for SAME padding */ -PadStrideInfo calculate_same_pad(TensorShape input_shape, TensorShape weights_shape, PadStrideInfo conv_info, DataLayout data_layout = DataLayout::NCHW); +PadStrideInfo calculate_same_pad(TensorShape input_shape, TensorShape weights_shape, PadStrideInfo conv_info, DataLayout data_layout = DataLayout::NCHW, const Size2D &dilation = Size2D(1u, 1u)); /** Returns expected width and height of the deconvolution's output tensor. * @@ -846,10 +847,10 @@ PadStrideInfo calculate_same_pad(TensorShape input_shape, TensorShape weights_sh * * @return A pair with the new width in the first position and the new height in the second. */ -const std::pair 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 stride_x, unsigned int stride_y); +std::pair 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 stride_x, unsigned int stride_y); /** Returns expected width and height of output scaled tensor depending on dimensions rounding mode. * @@ -862,10 +863,10 @@ const std::pair deconvolution_output_dimensions(unsi * * @return A pair with the new width in the first position and the new height in the second. */ -const std::pair scaled_dimensions(unsigned int width, unsigned int height, - unsigned int kernel_width, unsigned int kernel_height, - const PadStrideInfo &pad_stride_info, - const Size2D &dilation = Size2D(1U, 1U)); +std::pair scaled_dimensions(unsigned int width, unsigned int height, + unsigned int kernel_width, unsigned int kernel_height, + const PadStrideInfo &pad_stride_info, + const Size2D &dilation = Size2D(1U, 1U)); /** Convert a tensor format into a string. * -- cgit v1.2.1