From 2eb5d16b839cbc28c6cb7f0de7a0bf15290b425a Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Fri, 2 Jul 2021 09:01:49 +0100 Subject: Align kernel/operator header layout - Redirect validate documentation to configure - Align header names - Align class layout Signed-off-by: Georgios Pinitas Change-Id: Ia40f67383826a66e9f9a33745d66805551e31a3a Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5897 Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio --- .../kernels/CpuConvertFullyConnectedWeightsKernel.h | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'src/core/cpu/kernels/CpuConvertFullyConnectedWeightsKernel.h') diff --git a/src/core/cpu/kernels/CpuConvertFullyConnectedWeightsKernel.h b/src/core/cpu/kernels/CpuConvertFullyConnectedWeightsKernel.h index c867e3deeb..3ba3162c34 100644 --- a/src/core/cpu/kernels/CpuConvertFullyConnectedWeightsKernel.h +++ b/src/core/cpu/kernels/CpuConvertFullyConnectedWeightsKernel.h @@ -21,8 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef ARM_COMPUTE_CPU_CONVERTFULLYCONNECTEDWEIGHTS_KERNEL_H -#define ARM_COMPUTE_CPU_CONVERTFULLYCONNECTEDWEIGHTS_KERNEL_H +#ifndef ARM_COMPUTE_CPU_CONVERT_FULLYCONNECTED_WEIGHTS_KERNEL_H +#define ARM_COMPUTE_CPU_CONVERT_FULLYCONNECTED_WEIGHTS_KERNEL_H #include "src/core/common/Macros.h" #include "src/core/cpu/ICpuKernel.h" @@ -44,8 +44,7 @@ namespace kernels class CpuConvertFullyConnectedWeightsKernel : public ICpuKernel { public: - /** Default constructor */ - CpuConvertFullyConnectedWeightsKernel(); + CpuConvertFullyConnectedWeightsKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuConvertFullyConnectedWeightsKernel); /** Set the src and dst tensor. * @@ -55,12 +54,9 @@ public: * @param[in] data_layout The data layout the weights have been trained in. */ void configure(const ITensorInfo *src, ITensorInfo *dst, const TensorShape &original_input_shape, DataLayout data_layout); - /** Static function to check if given info will lead to a valid configuration of @ref CpuConvertFullyConnectedWeightsKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src Source weights tensor info to convert. Must be 2 dimensional. Data types supported: All. - * @param[in] dst The converted weights tensor info. Shape and Data Type: Same as @p src. - * @param[in] original_input_shape Shape of the original src tensor (the one entering fully connected layer). - * @param[in] data_layout The data layout the weights have been trained in. + * Similar to @ref CpuConvertFullyConnectedWeightsKernel::configure() * * @return a status */ @@ -71,8 +67,8 @@ public: const char *name() const override; private: - unsigned int _factor1; /* equals to the number of elements per original src plane if @p data_layout == NCHW; its number of channels otherwise */ - unsigned int _factor2; /* equals to the number of elements per original src plane if @p data_layout == NHWC; its number of channels otherwise */ + unsigned int _factor1{ 0 }; /* equals to the number of elements per original src plane if @p data_layout == NCHW; its number of channels otherwise */ + unsigned int _factor2{ 0 }; /* equals to the number of elements per original src plane if @p data_layout == NHWC; its number of channels otherwise */ /** Template function to run the permute * @@ -86,4 +82,4 @@ private: } // namespace kernels } // namespace cpu } // namespace arm_compute -#endif /*ARM_COMPUTE_CPU_CONVERTFULLYCONNECTEDWEIGHTS_KERNEL_H */ \ No newline at end of file +#endif /* ARM_COMPUTE_CPU_CONVERT_FULLYCONNECTED_WEIGHTS_KERNEL_H */ \ No newline at end of file -- cgit v1.2.1