From d6ca478a7e410f8f529c2e505305b46d9fe21a9b Mon Sep 17 00:00:00 2001 From: Pablo Tello Date: Tue, 23 Jan 2018 09:36:04 +0000 Subject: COMPMID-784: Added support for biases in WinogradLayer. 1) Updated to the latest code from the RSH repo. 2) Moved winograd transforms into kernels. 3) Added support for biases Change-Id: I7f39f34a599b49d7d9b549cc10a4f4d4a8007ab8 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/117474 Tested-by: Jenkins Reviewed-by: Anthony Barbier --- .../core/NEON/kernels/winograd/winograd_layer.hpp | 89 +++++++--------------- 1 file changed, 29 insertions(+), 60 deletions(-) (limited to 'arm_compute/core/NEON/kernels/winograd/winograd_layer.hpp') diff --git a/arm_compute/core/NEON/kernels/winograd/winograd_layer.hpp b/arm_compute/core/NEON/kernels/winograd/winograd_layer.hpp index 4559312df4..1db63d750b 100644 --- a/arm_compute/core/NEON/kernels/winograd/winograd_layer.hpp +++ b/arm_compute/core/NEON/kernels/winograd/winograd_layer.hpp @@ -74,87 +74,56 @@ class WinogradConvolutionLayer /** Determine how much memory (in units of TIn) to allocate for the * transformed weights. - * - * @param[in] n_output_channels Number of output feature maps. - * @param[in] n_input_channels Number of input feature maps. */ static unsigned int get_weight_storage_size( - const int n_output_channels, - const int n_input_channels + const int n_output_channels, /** Number of output feature maps. */ + const int n_input_channels /** Number of input feature maps. */ ); /** Determine how much memory (in units of TIn) to allocate for the * transformed input. - * - * @param[in] n_batches Number of batches in the input tensor. - * @param[in] n_channels Number of feature maps in the input tensor. - * @param[in] n_rows Number of rows in each feature map. - * @param[in] n_cols Number of columns in each feature map. - * @param[in] same_padding Use "SAME" padding, otherwise use "VALID". */ static unsigned int get_input_storage_size( - const int n_batches, - const int n_channels, - const int n_rows, - const int n_cols, - const bool same_padding + const int n_batches, /** Number of batches in the input tensor. */ + const int n_channels, /** Number of feature maps in the input tensor. */ + const int n_rows, /** Number of rows in each feature map. */ + const int n_cols, /** Number of columns in each feature map. */ + const bool same_padding /** Use "SAME" padding, otherwise use "VALID". */ ); /** Determine how much memory (in units of TOut) to allocate for the * (Winograd domain) output. - * - * @param[in] n_batches Number of batches in the output tensor. - * @param[in] n_rows Number of rows in each feature map of the input tensor. - * @param[in] n_cols Number of columns in each feature map of the input tensor. - * @param[in] n_output_channels Number of feature maps in the output tensor. - * @param[in] same_padding Use "SAME" padding, otherwise use "VALID". */ static unsigned int get_output_storage_size( - const int n_batches, - const int n_rows, - const int n_cols, - const int n_output_channels, - const bool same_padding + const int n_batches, /** Number of batches in the output tensor. */ + const int n_rows, /** Number of rows in each feature map of the input tensor. */ + const int n_cols, /** Number of columns in each feature map of the input tensor. */ + const int n_output_channels, /** Number of feature maps in the output tensor. */ + const bool same_padding /** Use "SAME" padding, otherwise use "VALID". */ ); - /** Get the shape (rows, cols) of a feature map of the output tensor. - * - * @param[in] n_input_rows Number of rows in the input feature map. - * @param[in] n_input_cols Number of columns in the input feature map. - * @param[in] same_padding Use "SAME" padding, otherwise use "VALID". - */ + /** Get the shape (rows, cols) of a feature map of the output tensor. */ static std::pair get_output_feature_map_shape( - const int n_input_rows, - const int n_input_cols, - const bool same_padding + const int n_input_rows, /** Number of rows in the input feature map. */ + const int n_input_cols, /** Number of columns in the input feature map. */ + const bool same_padding /** Use "SAME" padding, otherwise use "VALID". */ ); /** Create a new Winograd convolution layer. - * @param[in] n_batches Number of batches in the input and output tensors. - * @param[in] n_input_channels Number of feature maps in a batch of the input tensor. - * @param[in] n_input_rows Number of rows in a feature map of the input tensor. - * @param[in] n_input_cols Number of columns in a feature map of the input tensor. - * @param[in] n_output_channels Number of feature maps in the output tensor. - * @param[in] same_padding Use "SAME" padding, otherwise use "VALID". - * @param[in] weights Pointer to weight tensor in spatial domain. Must be ordered as "Height x Rows x Input Feature Maps x Output Feature Maps. - * @param[out] weights_storage Pointer to storage for weight tensor in the Winograd domain. Must be at least the size returned by `get_weight_storage_size - * @param[in] input Pointer to NHWC ordered input tensor, in the spatial domain. - * @param[out] winograd_input Pointer to working space for the input tensor in the Winograd domain. Must be at least the size returned by `get_input_storage_size`. - * @param[out] output Pointer to NHWC ordered output tensor, in the spatial domain. - * @param[out] winograd_output Pointer to working space for the output tensor in the Winograd domain. Must be at least the size returned by `get_output_storage_size`. */ WinogradConvolutionLayer( - const int n_batches, - const int n_input_channels, - const int n_input_rows, - const int n_input_cols, - const int n_output_channels, - const bool same_padding, - const TIn* const weights, - TIn* const weights_storage, - const TIn* const input, - TIn* const winograd_input, - TOut* const output, - TOut* const winograd_output + const int n_batches, /** Number of batches in the input and output tensors. */ + const int n_input_channels, /** Number of feature maps in a batch of the input tensor. */ + const int n_input_rows, /** Number of rows in a feature map of the input tensor. */ + const int n_input_cols, /** Number of columns in a feature map of the input tensor. */ + const int n_output_channels, /** Number of feature maps in the output tensor. */ + const bool same_padding, /** Use "SAME" padding, otherwise use "VALID". */ + const TIn* const weights, /** Pointer to weight tensor in spatial domain. Must be ordered as "Height x Rows x Input Feature Maps x Output Feature Maps. */ + TIn* const weights_storage, /** Pointer to storage for weight tensor in the Winograd domain. Must be at least the size returned by `get_weight_storage_size`. */ + const TIn* const input, /** Pointer to NHWC ordered input tensor, in the spatial domain. */ + TIn* const winograd_input, /** Pointer to working space for the input tensor in the Winograd domain. Must be at least the size returned by `get_input_storage_size`. */ + const TOut* const biases, /** Pointer to biases vector. */ + TOut* const output, /** Pointer to NHWC ordered output tensor, in the spatial domain. */ + TOut* const winograd_output /** Pointer to working space for the output tensor in the Winograd domain. Must be at least the size returned by `get_output_storage_size`. */ ); }; -- cgit v1.2.1