From 4e288696a2ca8e1c9d6d37d90d237c1a18d6e364 Mon Sep 17 00:00:00 2001 From: Gian Marco Iodice Date: Tue, 27 Jun 2017 11:41:59 +0100 Subject: COMPMID-417 - Adding support for rectangular kernels Change-Id: I4dde0929bc689c83582b95856dd0253228125df2 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/78994 Reviewed-by: Moritz Pflanzer Tested-by: Kaizen Reviewed-by: Georgios Pinitas --- arm_compute/core/Utils.h | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'arm_compute/core/Utils.h') diff --git a/arm_compute/core/Utils.h b/arm_compute/core/Utils.h index 9d3ff0a1bd..c2f0e3982a 100644 --- a/arm_compute/core/Utils.h +++ b/arm_compute/core/Utils.h @@ -542,21 +542,17 @@ inline DataType data_type_for_convolution_matrix(const int16_t *conv, size_t siz /** Returns expected width and height of output scaled tensor depending on dimensions rounding mode. * - * @param[in] width Width of input tensor (Number of columns) - * @param[in] height Height of input tensor (Number of rows) - * @param[in] kernel_size Kernel size. - * @param[in] stride_x Stride of the operation in the x dimension. - * @param[in] stride_y Stride of the operation in the y dimension. - * @param[in] pad_x Padding size in the x dimension. - * @param[in] pad_y Padding size in the y dimension. - * @param[in] round_type Dimensions rounding mode. + * @param[in] width Width of input tensor (Number of columns) + * @param[in] height Height of input tensor (Number of rows) + * @param[in] kernel_width Kernel width. + * @param[in] kernel_height Kernel height. + * @param[in] pad_stride_info Pad and stride information. * * @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_size, - unsigned int stride_x, unsigned int stride_y, - unsigned int pad_x, unsigned int pad_y, - DimensionRoundingType round_type); +const std::pair scaled_dimensions(unsigned int width, unsigned int height, + unsigned int kernel_width, unsigned int kernel_height, + const PadStrideInfo &pad_stride_info); /** Convert a tensor format into a string. * -- cgit v1.2.1