From 84ce1f9d5d63c7fcfa5ac3f52e4de5bbb9ccb886 Mon Sep 17 00:00:00 2001 From: Vidhya Sudhan Loganathan Date: Wed, 25 Apr 2018 13:00:09 +0100 Subject: COMPMID-718 : Winograd: add validate method and tests Changed API's to use winograd_info struct instead of individual params Modified validation to test Validate API Change-Id: I796650092165069e2067e02ace3f42a43f545779 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/128991 Reviewed-by: Anthony Barbier Tested-by: Jenkins Reviewed-by: Georgios Pinitas --- .../core/NEON/kernels/NEWinogradLayerKernel.h | 31 ++++++++++------------ 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'arm_compute/core') diff --git a/arm_compute/core/NEON/kernels/NEWinogradLayerKernel.h b/arm_compute/core/NEON/kernels/NEWinogradLayerKernel.h index 69d8cc6851..7284f9fdc4 100644 --- a/arm_compute/core/NEON/kernels/NEWinogradLayerKernel.h +++ b/arm_compute/core/NEON/kernels/NEWinogradLayerKernel.h @@ -154,14 +154,13 @@ public: /** Static function to check if given info will lead to a valid configuration of @ref NEWinogradLayerTransformInputKernel * - * @param[in] input First tensor input info. Data types supported: F32. - * @param[in] output Output tensor info. Data types supported: same as @p input. - * @param[in] conv_info Contains padding and stride information described in @ref PadStrideInfo. Currently only unit strides are supported. - * @param[in] kernel_dims Kernel dimensions. Currently only 3x3 and 5x5 kernels are supported + * @param[in] input First tensor input info. Data types supported: F32. + * @param[in] output Output tensor info. Data types supported: same as @p input. + * @param[in] winograd_info Contains Winograd's information described in @ref WinogradInfo * * @return a status */ - static Status validate(const ITensorInfo *input, const ITensorInfo *output, const PadStrideInfo &conv_info, const Size2D &kernel_dims); + static Status validate(const ITensorInfo *input, const ITensorInfo *output, const WinogradInfo &winograd_info); private: using InputTransform = typename WinogradBase::template InputTransform; @@ -314,16 +313,14 @@ public: /** Static function to check if given info will lead to a valid configuration of @ref NEWinogradLayerTransformOutputKernel * - * @param[in] input Source tensor with shape [C, N, 16, batches] or [C, N, 36, batches]. Data types supported: F32. - * @param[in] bias Biases tensor. Shared biases supported. Biases are 1D tensor with dimensions [OFM]. It can be a nullptr. Data type supported: as @p input - * @param[out] output Destination tensor with shape [output_convolved_dims.width, output_convolved_dims.height, C, batches]. Data type supported: same as @p input - * @param[in] kernel_dims Kernel dimensions (Width and height). Currently only supported 3x3 and 5x5 kernels - * @param[in] output_convolved_dims Output dimensions after the convolution (Width and height) - * @param[in] num_tiles Number of tiles of size 2x2 or 4x4 in the output tensor along the X and Y direction + * @param[in] input Source tensor with shape [C, N, 16, batches] or [C, N, 36, batches]. Data types supported: F32. + * @param[in] bias Biases tensor. Shared biases supported. Biases are 1D tensor with dimensions [OFM]. It can be a nullptr. Data type supported: as @p input + * @param[out] output Destination tensor with shape [output_convolved_dims.width, output_convolved_dims.height, C, batches]. Data type supported: same as @p input + * @param[in] winograd_info Contains Winograd's information described in @ref WinogradInfo * * @return a status */ - static Status validate(const ITensorInfo *input, const ITensorInfo *bias, const ITensorInfo *output, const Size2D &kernel_dims, const Size2D &output_convolved_dims, const Size2D &num_tiles); + static Status validate(const ITensorInfo *input, const ITensorInfo *bias, const ITensorInfo *output, const WinogradInfo &winograd_info); private: using WinogradBase = winograd::WinogradGEMM; @@ -392,14 +389,14 @@ public: /** Static function to check if given info will lead to a valid configuration of @ref NEWinogradLayerTransformWeightsKernel * - * @param[in] input Source tensor info. The input is a 4D tensor with dimensions [kernel_x, kernel_y, IFM, OFM] (NCHW data layout). - * kernel_x must be 3 and equal to kernel_y. Data types supported: F32. - * @param[in] output Destination tensor info. The output is a 3D tensor with dimensions [OFM, IFM, 16] or [OFM, IFM, 36]. Data type supported: same as @p input - * @param[in] output_tile Output tile. Currently only 2x2 and 4x4 tiles are supported. + * @param[in] input Source tensor info. The input is a 4D tensor with dimensions [kernel_x, kernel_y, IFM, OFM] (NCHW data layout). + * kernel_x must be 3 and equal to kernel_y. Data types supported: F32. + * @param[in] output Destination tensor info. The output is a 3D tensor with dimensions [OFM, IFM, 16] or [OFM, IFM, 36]. Data type supported: same as @p input + * @param[in] winograd_info Contains Winograd's information described in @ref WinogradInfo * * @return a status */ - static Status validate(const ITensorInfo *input, const ITensorInfo *output, const Size2D &output_tile); + static Status validate(const ITensorInfo *input, const ITensorInfo *output, const WinogradInfo &winograd_info); // Inherited methods overridden: void configure(const ITensor *weights_hwio, T *const output, const int matrix_stride, const int n_output_channels, const int n_input_channels) override; -- cgit v1.2.1