diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2021-07-02 09:01:49 +0100 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2021-07-02 15:47:11 +0000 |
| commit | 2eb5d16b839cbc28c6cb7f0de7a0bf15290b425a (patch) | |
| tree | 523d495c3a4c07d87b337c45a81afa06c9b1f495 /src/core | |
| parent | 4dfc5538948c196def6d2e3305fe8051a5df3f15 (diff) | |
| download | ComputeLibrary-2eb5d16b839cbc28c6cb7f0de7a0bf15290b425a.tar.gz | |
Align kernel/operator header layout
- Redirect validate documentation to configure
- Align header names
- Align class layout
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: Ia40f67383826a66e9f9a33745d66805551e31a3a
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5897
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Diffstat (limited to 'src/core')
73 files changed, 197 insertions, 427 deletions
diff --git a/src/core/cpu/kernels/CpuAddKernel.h b/src/core/cpu/kernels/CpuAddKernel.h index 3ebaa462ee..717d0132c6 100644 --- a/src/core/cpu/kernels/CpuAddKernel.h +++ b/src/core/cpu/kernels/CpuAddKernel.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_CPUADDKERNEL_H -#define ARM_COMPUTE_CPUADDKERNEL_H +#ifndef ARM_COMPUTE_CPU_ADD_KERNEL_H +#define ARM_COMPUTE_CPU_ADD_KERNEL_H #include "src/core/common/Macros.h" #include "src/core/cpu/ICpuKernel.h" @@ -84,4 +84,4 @@ private: } // namespace kernels } // namespace cpu } // namespace arm_compute -#endif /*ARM_COMPUTE_CPUADDKERNEL_H */ +#endif /* ARM_COMPUTE_CPU_ADD_KERNEL_H */ diff --git a/src/core/cpu/kernels/CpuConcatenateBatchKernel.cpp b/src/core/cpu/kernels/CpuConcatenateBatchKernel.cpp index 5df5ac3dd0..16c0efc793 100644 --- a/src/core/cpu/kernels/CpuConcatenateBatchKernel.cpp +++ b/src/core/cpu/kernels/CpuConcatenateBatchKernel.cpp @@ -146,11 +146,6 @@ Status validate_arguments(const ITensorInfo *src, unsigned int batch_offset, con } } // namespace -CpuConcatenateBatchKernel::CpuConcatenateBatchKernel() - : _func(nullptr), _batch_offset(0) -{ -} - void CpuConcatenateBatchKernel::configure(const ITensorInfo *src, unsigned int batch_offset, ITensorInfo *dst) { ARM_COMPUTE_ERROR_ON_NULLPTR(src, dst); diff --git a/src/core/cpu/kernels/CpuConcatenateBatchKernel.h b/src/core/cpu/kernels/CpuConcatenateBatchKernel.h index 99e8d84d99..1706926fa8 100644 --- a/src/core/cpu/kernels/CpuConcatenateBatchKernel.h +++ b/src/core/cpu/kernels/CpuConcatenateBatchKernel.h @@ -21,17 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef ARM_COMPUTE_CPU_CONCATENATEBATCH_KERNEL_H -#define ARM_COMPUTE_CPU_CONCATENATEBATCH_KERNEL_H +#ifndef ARM_COMPUTE_CPU_CONCATENATE_BATCH_KERNEL_H +#define ARM_COMPUTE_CPU_CONCATENATE_BATCH_KERNEL_H #include "src/core/common/Macros.h" #include "src/core/cpu/ICpuKernel.h" namespace arm_compute { -// Forward declarations -class ITensor; - namespace cpu { namespace kernels @@ -42,7 +39,7 @@ namespace kernels class CpuConcatenateBatchKernel : public ICpuKernel { public: - CpuConcatenateBatchKernel(); + CpuConcatenateBatchKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuConcatenateBatchKernel); /** Configure kernel for a given list of arguments * @@ -51,11 +48,9 @@ public: * @param[in,out] dst Destination tensor info. Data types supported: Same as @p src. */ void configure(const ITensorInfo *src, unsigned int batch_offset, ITensorInfo *dst); - /** Static function to check if given info will lead to a valid configuration of @ref CpuConcatenateBatchKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src Source tensor info. Data types supported: All. - * @param[in] batch_offset The offset on axis # 3. - * @param[in] dst Destination tensor info. Data types supported: Same as @p src. + * Similar to @ref CpuConcatenateBatchKernel::configure() * * @return a status */ @@ -69,10 +64,10 @@ private: using BatchConcatFunction = void(const ITensor *, ITensor *, unsigned int, const Window &); private: - BatchConcatFunction *_func; - unsigned int _batch_offset; + BatchConcatFunction *_func{ nullptr }; + unsigned int _batch_offset{ 0 }; }; } // namespace kernels } // namespace cpu } // namespace arm_compute -#endif /* ARM_COMPUTE_CPU_CONCATENATEBATCH_KERNEL_H */ +#endif /* ARM_COMPUTE_CPU_CONCATENATE_BATCH_KERNEL_H */ diff --git a/src/core/cpu/kernels/CpuConcatenateDepthKernel.cpp b/src/core/cpu/kernels/CpuConcatenateDepthKernel.cpp index a7e5cd8c60..133499deb6 100644 --- a/src/core/cpu/kernels/CpuConcatenateDepthKernel.cpp +++ b/src/core/cpu/kernels/CpuConcatenateDepthKernel.cpp @@ -146,11 +146,6 @@ Status validate_arguments(const ITensorInfo *input, unsigned int depth_offset, c } } // namespace -CpuConcatenateDepthKernel::CpuConcatenateDepthKernel() - : _func(nullptr), _depth_offset(0) -{ -} - void CpuConcatenateDepthKernel::configure(const ITensorInfo *src, unsigned int depth_offset, ITensorInfo *dst) { ARM_COMPUTE_ERROR_ON_NULLPTR(src, dst); diff --git a/src/core/cpu/kernels/CpuConcatenateDepthKernel.h b/src/core/cpu/kernels/CpuConcatenateDepthKernel.h index af89c2464f..3ec19a86d1 100644 --- a/src/core/cpu/kernels/CpuConcatenateDepthKernel.h +++ b/src/core/cpu/kernels/CpuConcatenateDepthKernel.h @@ -22,8 +22,8 @@ * SOFTWARE. */ -#ifndef ARM_COMPUTE_CPU_CONCATENATEDEPTH_KERNEL_H -#define ARM_COMPUTE_CPU_CONCATENATEDEPTH_KERNEL_H +#ifndef ARM_COMPUTE_CPU_CONCATENATE_DEPTH_KERNEL_H +#define ARM_COMPUTE_CPU_CONCATENATE_DEPTH_KERNEL_H #include "src/core/common/Macros.h" #include "src/core/cpu/ICpuKernel.h" @@ -43,7 +43,7 @@ namespace kernels class CpuConcatenateDepthKernel : public ICpuKernel { public: - CpuConcatenateDepthKernel(); + CpuConcatenateDepthKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuConcatenateDepthKernel); /** Configure kernel for a given list of arguments * @@ -56,11 +56,9 @@ public: * */ void configure(const ITensorInfo *src, unsigned int depth_offset, ITensorInfo *dst); - /** Static function to check if given info will lead to a valid configuration of @ref CpuConcatenateDepthKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src Source tensor info. Data types supported: QASYMM8/QASYMM8_SIGNED/F16/F32. - * @param[in] depth_offset The offset on the Z axis. - * @param[in] dst Destination tensor info. Data types supported: Same as @p src. + * Similar to @ref CpuConcatenateDepthKernel::configure() * * @return a status */ @@ -74,10 +72,10 @@ private: using DepthConcatFunction = void(const ITensor *, ITensor *, unsigned int, const Window &); private: - DepthConcatFunction *_func; - unsigned int _depth_offset; + DepthConcatFunction *_func{ nullptr }; + unsigned int _depth_offset{ 0 }; }; } // namespace kernels } // namespace cpu } // namespace arm_compute -#endif /* ARM_COMPUTE_CPU_CONCATENATEDEPTH_KERNEL_H */ +#endif /* ARM_COMPUTE_CPU_CONCATENATE_DEPTH_KERNEL_H */ diff --git a/src/core/cpu/kernels/CpuConcatenateHeightKernel.cpp b/src/core/cpu/kernels/CpuConcatenateHeightKernel.cpp index 54b972662b..dfd442b10a 100644 --- a/src/core/cpu/kernels/CpuConcatenateHeightKernel.cpp +++ b/src/core/cpu/kernels/CpuConcatenateHeightKernel.cpp @@ -62,11 +62,6 @@ Status validate_arguments(const ITensorInfo *src, unsigned int height_offset, co } } // namespace -CpuConcatenateHeightKernel::CpuConcatenateHeightKernel() - : _height_offset(0) -{ -} - void CpuConcatenateHeightKernel::configure(const ITensorInfo *src, unsigned int height_offset, ITensorInfo *dst) { ARM_COMPUTE_UNUSED(src); diff --git a/src/core/cpu/kernels/CpuConcatenateHeightKernel.h b/src/core/cpu/kernels/CpuConcatenateHeightKernel.h index 609bb21da7..e5e15e1aee 100644 --- a/src/core/cpu/kernels/CpuConcatenateHeightKernel.h +++ b/src/core/cpu/kernels/CpuConcatenateHeightKernel.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_CONCATENATEHEIGHT_KERNEL_H -#define ARM_COMPUTE_CPU_CONCATENATEHEIGHT_KERNEL_H +#ifndef ARM_COMPUTE_CPU_CONCATENATE_HEIGHT_KERNEL_H +#define ARM_COMPUTE_CPU_CONCATENATE_HEIGHT_KERNEL_H #include "src/core/common/Macros.h" #include "src/core/cpu/ICpuKernel.h" @@ -39,7 +39,7 @@ namespace kernels class CpuConcatenateHeightKernel : public ICpuKernel { public: - CpuConcatenateHeightKernel(); + CpuConcatenateHeightKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuConcatenateHeightKernel); /** Configure kernel for a given list of arguments * @@ -49,11 +49,9 @@ public: * */ void configure(const ITensorInfo *src, unsigned int height_offset, ITensorInfo *dst); - /** Static function to check if given info will lead to a valid configuration of @ref CpuConcatenateHeightKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src Source tensor info. Data types supported: All - * @param[in] height_offset The starting offset on the Y axis for the output tensor. - * @param[in] dst Destination tensor info. Data types supported: Same as @p src. + * Similar to @ref CpuConcatenateHeightKernel::configure() * * @return a status */ @@ -64,9 +62,9 @@ public: const char *name() const override; private: - unsigned int _height_offset; + unsigned int _height_offset{ 0 }; }; } // namespace kernels } // namespace cpu } // namespace arm_compute -#endif /* ARM_COMPUTE_CPU_CONCATENATEHEIGHT_KERNEL_H */ +#endif /* ARM_COMPUTE_CPU_CONCATENATE_HEIGHT_KERNEL_H */ diff --git a/src/core/cpu/kernels/CpuConcatenateWidthKernel.cpp b/src/core/cpu/kernels/CpuConcatenateWidthKernel.cpp index effcbc336c..ad33b0c951 100644 --- a/src/core/cpu/kernels/CpuConcatenateWidthKernel.cpp +++ b/src/core/cpu/kernels/CpuConcatenateWidthKernel.cpp @@ -62,11 +62,6 @@ Status validate_arguments(const ITensorInfo *src, unsigned int width_offset, con } } // namespace -CpuConcatenateWidthKernel::CpuConcatenateWidthKernel() - : _width_offset(0) -{ -} - void CpuConcatenateWidthKernel::configure(const ITensorInfo *src, unsigned int width_offset, ITensorInfo *dst) { ARM_COMPUTE_ERROR_ON_NULLPTR(src, dst); diff --git a/src/core/cpu/kernels/CpuConcatenateWidthKernel.h b/src/core/cpu/kernels/CpuConcatenateWidthKernel.h index afdc3ccddd..f64191e173 100644 --- a/src/core/cpu/kernels/CpuConcatenateWidthKernel.h +++ b/src/core/cpu/kernels/CpuConcatenateWidthKernel.h @@ -22,8 +22,8 @@ * SOFTWARE. */ -#ifndef ARM_COMPUTE_CPU_CONCATENATEWIDTH_KERNEL_H -#define ARM_COMPUTE_CPU_CONCATENATEWIDTH_KERNEL_H +#ifndef ARM_COMPUTE_CPU_CONCATENATE_WIDTH_KERNEL_H +#define ARM_COMPUTE_CPU_CONCATENATE_WIDTH_KERNEL_H #include "src/core/common/Macros.h" #include "src/core/cpu/ICpuKernel.h" @@ -40,7 +40,7 @@ namespace kernels class CpuConcatenateWidthKernel : public ICPPKernel { public: - CpuConcatenateWidthKernel(); + CpuConcatenateWidthKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuConcatenateWidthKernel); /** Configure kernel for a given list of arguments * @@ -49,11 +49,9 @@ public: * @param[in,out] dst Destination tensor info. Data types supported: Same as @p src. */ void configure(const ITensorInfo *src, unsigned int width_offset, ITensorInfo *dst); - /** Static function to check if given info will lead to a valid configuration of @ref CpuConcatenateWidthKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src Source tensor info. Data types supported: All - * @param[in] width_offset The offset on the X axis. - * @param[in] dst Destination tensor info. Data types supported: Same as @p src. + * Similar to @ref CpuConcatenateWidthKernel::configure() * * @return a status */ @@ -64,9 +62,9 @@ public: const char *name() const override; private: - unsigned int _width_offset; + unsigned int _width_offset{ 0 }; }; } // namespace kernels } // namespace cpu } // namespace arm_compute -#endif /* ARM_COMPUTE_CPU_CONCATENATEWIDTH_KERNEL_H */ +#endif /* ARM_COMPUTE_CPU_CONCATENATE_WIDTH_KERNEL_H */ diff --git a/src/core/cpu/kernels/CpuConvertFullyConnectedWeightsKernel.cpp b/src/core/cpu/kernels/CpuConvertFullyConnectedWeightsKernel.cpp index d91ee64ecf..5bf70dc9bf 100644 --- a/src/core/cpu/kernels/CpuConvertFullyConnectedWeightsKernel.cpp +++ b/src/core/cpu/kernels/CpuConvertFullyConnectedWeightsKernel.cpp @@ -34,11 +34,6 @@ namespace cpu { namespace kernels { -CpuConvertFullyConnectedWeightsKernel::CpuConvertFullyConnectedWeightsKernel() - : _factor1(0), _factor2(0) -{ -} - void CpuConvertFullyConnectedWeightsKernel::configure(const ITensorInfo *src, ITensorInfo *dst, const TensorShape &original_input_shape, DataLayout data_layout) 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 diff --git a/src/core/cpu/kernels/CpuCopyKernel.h b/src/core/cpu/kernels/CpuCopyKernel.h index 98b79a964c..e2f1ed60a6 100644 --- a/src/core/cpu/kernels/CpuCopyKernel.h +++ b/src/core/cpu/kernels/CpuCopyKernel.h @@ -46,11 +46,9 @@ public: * @param[in] padding (Optional) Padding to be applied to the input tensor */ void configure(const ITensorInfo *src, ITensorInfo *dst, const PaddingList &padding = PaddingList()); - /** Static function to check if given info will lead to a valid configuration of @ref CpuCopyKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src Source tensor. Data types supported: All - * @param[in] dst Destination tensor. Data types supported: same as @p src. - * @param[in] padding (Optional) Padding to be applied to the input tensor + * Similar to @ref CpuCopyKernel::configure() * * @return a status */ diff --git a/src/core/cpu/kernels/CpuDepthwiseConv2dNativeKernel.cpp b/src/core/cpu/kernels/CpuDepthwiseConv2dNativeKernel.cpp index eac9baaf01..5530eba9f1 100644 --- a/src/core/cpu/kernels/CpuDepthwiseConv2dNativeKernel.cpp +++ b/src/core/cpu/kernels/CpuDepthwiseConv2dNativeKernel.cpp @@ -803,11 +803,6 @@ Status validate_arguments(const ITensorInfo *src, const ITensorInfo *weights, co } } // namespace -CpuDepthwiseConv2dNativeKernel::CpuDepthwiseConv2dNativeKernel() - : _func(), _conv_info(), _depth_multiplier(1), _dilation(), _output_multiplier(), _output_shift(), _has_biases() -{ -} - void CpuDepthwiseConv2dNativeKernel::configure(const ITensorInfo *src, const ITensorInfo *weights, const ITensorInfo *biases, ITensorInfo *dst, const ConvolutionInfo &info) { ARM_COMPUTE_ERROR_ON_NULLPTR(src, weights, dst); @@ -945,6 +940,11 @@ void CpuDepthwiseConv2dNativeKernel::run_op(ITensorPack &tensors, const Window & auto dst = tensors.get_tensor(TensorType::ACL_DST); (this->*_func)(src, weights, biases, dst, window, _has_biases); } + +const char *CpuDepthwiseConv2dNativeKernel::name() const +{ + return "CpuDepthwiseConv2dNativeKernel"; +} } // namespace kernels } // namespace cpu } // namespace arm_compute diff --git a/src/core/cpu/kernels/CpuDepthwiseConv2dNativeKernel.h b/src/core/cpu/kernels/CpuDepthwiseConv2dNativeKernel.h index 559c46dc93..eb7041f7b6 100644 --- a/src/core/cpu/kernels/CpuDepthwiseConv2dNativeKernel.h +++ b/src/core/cpu/kernels/CpuDepthwiseConv2dNativeKernel.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_DEPTHWISECONV2DNATIVEKERNEL_H -#define ARM_COMPUTE_CPU_DEPTHWISECONV2DNATIVEKERNEL_H +#ifndef ARM_COMPUTE_CPU_DEPTHWISE_CONV2D_NATIVE_KERNEL_H +#define ARM_COMPUTE_CPU_DEPTHWISE_CONV2D_NATIVE_KERNEL_H #include "arm_compute/core/utils/misc/Traits.h" #include "src/core/common/Macros.h" @@ -43,12 +43,7 @@ namespace kernels class CpuDepthwiseConv2dNativeKernel : public ICpuKernel { public: - const char *name() const override - { - return "CpuDepthwiseConv2dNativeKernel"; - } - /** Default constructor */ - CpuDepthwiseConv2dNativeKernel(); + CpuDepthwiseConv2dNativeKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuDepthwiseConv2dNativeKernel); /** Initialize the function's source, destination and parameters. @@ -75,6 +70,7 @@ public: // Inherited methods overridden: void run_op(ITensorPack &tensors, const Window &window, const ThreadInfo &info) override; + const char *name() const override; private: template <typename T> @@ -95,15 +91,15 @@ private: */ using DepthwiseFunctionPtr = void (CpuDepthwiseConv2dNativeKernel::*)(const ITensor *src, const ITensor *weights, const ITensor *bias, ITensor *dst, const Window &window, bool has_biases); - DepthwiseFunctionPtr _func; - PadStrideInfo _conv_info; - unsigned int _depth_multiplier; - Size2D _dilation; - std::vector<int> _output_multiplier; - std::vector<int> _output_shift; - bool _has_biases; + DepthwiseFunctionPtr _func{ nullptr }; + PadStrideInfo _conv_info{}; + unsigned int _depth_multiplier{ 1 }; + Size2D _dilation{}; + std::vector<int> _output_multiplier{}; + std::vector<int> _output_shift{}; + bool _has_biases{ false }; }; } // namespace kernels } // namespace cpu } // namespace arm_compute -#endif /* ARM_COMPUTE_CPU_DEPTHWISECONV2DNATIVEKERNEL_H */ +#endif /* ARM_COMPUTE_CPU_DEPTHWISE_CONV2D_NATIVE_KERNEL_H */ diff --git a/src/core/cpu/kernels/CpuDequantizeKernel.h b/src/core/cpu/kernels/CpuDequantizeKernel.h index 798f32cec7..e80aa3aaad 100644 --- a/src/core/cpu/kernels/CpuDequantizeKernel.h +++ b/src/core/cpu/kernels/CpuDequantizeKernel.h @@ -37,7 +37,6 @@ namespace kernels class CpuDequantizeKernel : public ICpuKernel { public: - /** Default constructor */ CpuDequantizeKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuDequantizeKernel); /** Set input, output tensors. diff --git a/src/core/cpu/kernels/CpuDirectConv2dKernel.h b/src/core/cpu/kernels/CpuDirectConv2dKernel.h index 62ed96f255..9bef1c484a 100644 --- a/src/core/cpu/kernels/CpuDirectConv2dKernel.h +++ b/src/core/cpu/kernels/CpuDirectConv2dKernel.h @@ -21,15 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef ARM_COMPUTE_CPU_DIRECTCONV2D_KERNEL_H -#define ARM_COMPUTE_CPU_DIRECTCONV2D_KERNEL_H +#ifndef ARM_COMPUTE_CPU_DIRECT_CONV2D_KERNEL_H +#define ARM_COMPUTE_CPU_DIRECT_CONV2D_KERNEL_H #include "src/core/common/Macros.h" #include "src/core/cpu/ICpuKernel.h" namespace arm_compute { -class ITensor; namespace cpu { namespace kernels @@ -38,7 +37,6 @@ namespace kernels class CpuDirectConv2dKernel : public ICpuKernel { public: - /** Default constructor */ CpuDirectConv2dKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuDirectConv2dKernel); /** Set the src, weights, and dst tensors. diff --git a/src/core/cpu/kernels/CpuDirectConv2dOutputStageKernel.h b/src/core/cpu/kernels/CpuDirectConv2dOutputStageKernel.h index 62bc5d41c9..749411c0a7 100644 --- a/src/core/cpu/kernels/CpuDirectConv2dOutputStageKernel.h +++ b/src/core/cpu/kernels/CpuDirectConv2dOutputStageKernel.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_DIRECTCONV2D_OUTPUTSTAGE_KERNEL_H -#define ARM_COMPUTE_CPU_DIRECTCONV2D_OUTPUTSTAGE_KERNEL_H +#ifndef ARM_COMPUTE_CPU_DIRECT_CONV2D_OUTPUT_STAGE_KERNEL_H +#define ARM_COMPUTE_CPU_DIRECT_CONV2D_OUTPUT_STAGE_KERNEL_H #include "arm_compute/core/KernelDescriptors.h" #include "src/core/common/Macros.h" @@ -30,7 +30,6 @@ namespace arm_compute { -class ITensor; namespace cpu { namespace kernels @@ -44,7 +43,6 @@ namespace kernels class CpuDirectConv2dOutputStageKernel : public ICpuKernel { public: - /** Default constructor */ CpuDirectConv2dOutputStageKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuDirectConv2dOutputStageKernel); /** Set the accumulate buffer and the biases of the kernel. @@ -84,4 +82,4 @@ private: } // namespace kernels } // namespace cpu } // namespace arm_compute -#endif /*ARM_COMPUTE_CPU_DIRECTCONV2D_OUTPUTSTAGE_KERNEL_H */ +#endif /* ARM_COMPUTE_CPU_DIRECT_CONV2D_OUTPUT_STAGE_KERNEL_H */ diff --git a/src/core/cpu/kernels/CpuElementwiseKernel.h b/src/core/cpu/kernels/CpuElementwiseKernel.h index 50c8d29ac5..75137da65d 100644 --- a/src/core/cpu/kernels/CpuElementwiseKernel.h +++ b/src/core/cpu/kernels/CpuElementwiseKernel.h @@ -29,7 +29,6 @@ namespace arm_compute { -class ITensor; namespace cpu { namespace kernels @@ -89,7 +88,6 @@ protected: class CpuArithmeticKernel : public CpuElementwiseKernel { public: - /** Default constructor */ CpuArithmeticKernel() = default; /** Configure kernel @@ -130,7 +128,6 @@ private: class CpuDivisionKernel : public CpuArithmeticKernel { public: - /** Default constructor */ CpuDivisionKernel() = default; /** Configure kernel @@ -157,7 +154,6 @@ protected: class CpuPowerKernel : public CpuArithmeticKernel { public: - /** Default constructor */ CpuPowerKernel() = default; /** Configure kernel @@ -184,7 +180,6 @@ protected: class CpuComparisonKernel : public CpuElementwiseKernel { public: - /** Default constructor */ CpuComparisonKernel() = default; /** Configure kernel diff --git a/src/core/cpu/kernels/CpuElementwiseUnaryKernel.cpp b/src/core/cpu/kernels/CpuElementwiseUnaryKernel.cpp index 91fa75ebaf..56e3297e73 100644 --- a/src/core/cpu/kernels/CpuElementwiseUnaryKernel.cpp +++ b/src/core/cpu/kernels/CpuElementwiseUnaryKernel.cpp @@ -105,11 +105,6 @@ const ElementwiseUnaryKernel *get_implementation(DataType dt) } } // namespace -CpuElementwiseUnaryKernel::CpuElementwiseUnaryKernel() - : _op() -{ -} - void CpuElementwiseUnaryKernel::configure(ElementWiseUnary op, const ITensorInfo &src, ITensorInfo &dst) { ARM_COMPUTE_ERROR_THROW_ON(validate(op, src, dst)); @@ -169,6 +164,11 @@ void CpuElementwiseUnaryKernel::run_op(ITensorPack &tensors, const Window &windo ARM_COMPUTE_ERROR_ON(func == nullptr); func(src, dst, window, _op); } + +const char *CpuElementwiseUnaryKernel::name() const +{ + return "CpuElementwiseUnaryKernel"; +} } // namespace kernels } // namespace cpu } // namespace arm_compute diff --git a/src/core/cpu/kernels/CpuElementwiseUnaryKernel.h b/src/core/cpu/kernels/CpuElementwiseUnaryKernel.h index ceb90dcf70..43c6eded60 100644 --- a/src/core/cpu/kernels/CpuElementwiseUnaryKernel.h +++ b/src/core/cpu/kernels/CpuElementwiseUnaryKernel.h @@ -30,7 +30,6 @@ namespace arm_compute { -class ITensor; namespace cpu { namespace kernels @@ -39,19 +38,11 @@ namespace kernels * * Element-wise operation is computed by: * @f[ dst(x) = OP(src(x))@f] - * */ class CpuElementwiseUnaryKernel : public ICpuKernel { public: - const char *name() const override - { - return "CpuElementwiseUnaryKernel"; - } - /** Default constructor */ - CpuElementwiseUnaryKernel(); - /** Default destructor */ - ~CpuElementwiseUnaryKernel() = default; + CpuElementwiseUnaryKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuElementwiseUnaryKernel); /** Function to configure the @ref CpuElementwiseUnaryKernel @@ -61,19 +52,17 @@ public: * @param[out] dst Output tensor. Data types supported: Same as @p src. */ void configure(ElementWiseUnary op, const ITensorInfo &src, ITensorInfo &dst); - - /** Static function to check if given info will lead to a valid configuration of @ref CpuElementwiseUnaryKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] op Arithmetic operation to be executed. - * @param[in] src First tensor input info. Data types supported: F16/F32, F16/F32/S32 for NEG/ABS operations. - * @param[in] dst Output tensor info. Data types supported: Same as @p src. + * Similar to CpuElementwiseUnaryKernel::configure() * - * @return a Status + * @return a status */ static Status validate(ElementWiseUnary op, const ITensorInfo &src, const ITensorInfo &dst); // Inherited methods overridden: void run_op(ITensorPack &tensors, const Window &window, const ThreadInfo &info) override; + const char *name() const override; /** Common signature for all the specialised elementwise unary micro-kernels * @@ -82,7 +71,7 @@ public: using ElementwiseUnaryUkernelPtr = std::add_pointer<void(const ITensor *, ITensor *, const Window &, ElementWiseUnary)>::type; private: - ElementWiseUnary _op; + ElementWiseUnary _op{}; }; } // namespace kernels } // namespace cpu diff --git a/src/core/cpu/kernels/CpuGemmInterleave4x4Kernel.h b/src/core/cpu/kernels/CpuGemmInterleave4x4Kernel.h index 243aab9375..8f1a54314a 100644 --- a/src/core/cpu/kernels/CpuGemmInterleave4x4Kernel.h +++ b/src/core/cpu/kernels/CpuGemmInterleave4x4Kernel.h @@ -55,7 +55,6 @@ namespace kernels class CpuGemmInterleave4x4Kernel : public ICpuKernel { public: - /** Default Constructor */ CpuGemmInterleave4x4Kernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuGemmInterleave4x4Kernel); /** Initialise the kernel's src and dst. @@ -79,4 +78,4 @@ public: } // namespace kernels } // namespace cpu } // namespace arm_compute -#endif /*ARM_COMPUTE_CPU_GEMM_INTERLEAVE4x4_KERNEL_H*/ +#endif /* ARM_COMPUTE_CPU_GEMM_INTERLEAVE4x4_KERNEL_H */ diff --git a/src/core/cpu/kernels/CpuGemmLowpQuantizeDownInt32ScaleKernel.h b/src/core/cpu/kernels/CpuGemmLowpQuantizeDownInt32ScaleKernel.h index 646242dc7e..f3cdbdc610 100644 --- a/src/core/cpu/kernels/CpuGemmLowpQuantizeDownInt32ScaleKernel.h +++ b/src/core/cpu/kernels/CpuGemmLowpQuantizeDownInt32ScaleKernel.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_GEMMLOWP_QUANTIZEDOWNINT32_SCALE_KERNEL_H -#define ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWNINT32_SCALE_KERNEL_H +#ifndef ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWN_INT32_SCALE_KERNEL_H +#define ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWN_INT32_SCALE_KERNEL_H #include "arm_compute/core/KernelDescriptors.h" #include "src/core/common/Macros.h" @@ -30,6 +30,7 @@ namespace arm_compute { +// Forward declarations class ITensor; namespace cpu { @@ -53,7 +54,6 @@ namespace kernels class CpuGemmLowpQuantizeDownInt32ScaleKernel : public ICpuKernel { public: - /** Default constructor */ CpuGemmLowpQuantizeDownInt32ScaleKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuGemmLowpQuantizeDownInt32ScaleKernel); /** Initialise the kernel's input and output. @@ -104,4 +104,4 @@ private: } // namespace kernels } // namespace cpu } // namespace arm_compute -#endif /* ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWNINT32_SCALE_KERNEL_H */ +#endif /* ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWN_INT32_SCALE_KERNEL_H */ diff --git a/src/core/cpu/kernels/CpuGemmLowpQuantizeDownInt32ToInt16ScaleByFixedPointKernel.h b/src/core/cpu/kernels/CpuGemmLowpQuantizeDownInt32ToInt16ScaleByFixedPointKernel.h index 4d743e9a0a..7a1197d2cf 100644 --- a/src/core/cpu/kernels/CpuGemmLowpQuantizeDownInt32ToInt16ScaleByFixedPointKernel.h +++ b/src/core/cpu/kernels/CpuGemmLowpQuantizeDownInt32ToInt16ScaleByFixedPointKernel.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_GEMMLOWP_QUANTIZEDOWNINT32TOINT16_SCALEBYFIXEDPOINT_KERNEL_H -#define ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWNINT32TOINT16_SCALEBYFIXEDPOINT_KERNEL_H +#ifndef ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWN_INT32TOINT16_SCALEBYFIXEDPOINT_KERNEL_H +#define ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWN_INT32TOINT16_SCALEBYFIXEDPOINT_KERNEL_H #include "arm_compute/core/KernelDescriptors.h" #include "src/core/common/Macros.h" @@ -30,6 +30,7 @@ namespace arm_compute { +// Forward declaration class ITensor; namespace cpu { @@ -50,7 +51,6 @@ namespace kernels class CpuGemmLowpQuantizeDownInt32ToInt16ScaleByFixedPointKernel : public ICpuKernel { public: - /** Default constructor */ CpuGemmLowpQuantizeDownInt32ToInt16ScaleByFixedPointKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuGemmLowpQuantizeDownInt32ToInt16ScaleByFixedPointKernel); /** Initialise the kernel's input and output. @@ -108,4 +108,4 @@ private: } // namespace kernels } // namespace cpu } // namespace arm_compute -#endif /* ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWNINT32TOINT16_SCALEBYFIXEDPOINT_KERNEL_H */ +#endif /* ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWN_INT32TOINT16_SCALEBYFIXEDPOINT_KERNEL_H */ diff --git a/src/core/cpu/kernels/CpuGemmLowpQuantizeDownInt32ToInt8ScaleByFixedPointKernel.h b/src/core/cpu/kernels/CpuGemmLowpQuantizeDownInt32ToInt8ScaleByFixedPointKernel.h index a941f1f542..9ebb529990 100644 --- a/src/core/cpu/kernels/CpuGemmLowpQuantizeDownInt32ToInt8ScaleByFixedPointKernel.h +++ b/src/core/cpu/kernels/CpuGemmLowpQuantizeDownInt32ToInt8ScaleByFixedPointKernel.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_GEMMLOWP_QUANTIZEDOWNINT32TOINT8_SCALEBYFIXEDPOINT_KERNEL_H -#define ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWNINT32TOINT8_SCALEBYFIXEDPOINT_KERNEL_H +#ifndef ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWN_INT32TOINT8_SCALEBYFIXEDPOINT_KERNEL_H +#define ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWN_INT32TOINT8_SCALEBYFIXEDPOINT_KERNEL_H #include "arm_compute/core/KernelDescriptors.h" #include "src/core/common/Macros.h" @@ -30,6 +30,7 @@ namespace arm_compute { +// Forward declaration class ITensor; namespace cpu { @@ -51,7 +52,6 @@ namespace kernels class CpuGemmLowpQuantizeDownInt32ToInt8ScaleByFixedPointKernel : public ICpuKernel { public: - /** Default constructor */ CpuGemmLowpQuantizeDownInt32ToInt8ScaleByFixedPointKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuGemmLowpQuantizeDownInt32ToInt8ScaleByFixedPointKernel); /** Initialise the kernel's input and output. @@ -111,4 +111,4 @@ private: } // namespace kernels } // namespace cpu } // namespace arm_compute -#endif /* ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWNINT32TOINT8_SCALEBYFIXEDPOINT_KERNEL_H */ +#endif /* ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWN_INT32TOINT8_SCALEBYFIXEDPOINT_KERNEL_H */ diff --git a/src/core/cpu/kernels/CpuGemmLowpQuantizeDownInt32ToUint8ScaleByFixedPointKernel.h b/src/core/cpu/kernels/CpuGemmLowpQuantizeDownInt32ToUint8ScaleByFixedPointKernel.h index 9b4c056419..312cad971b 100644 --- a/src/core/cpu/kernels/CpuGemmLowpQuantizeDownInt32ToUint8ScaleByFixedPointKernel.h +++ b/src/core/cpu/kernels/CpuGemmLowpQuantizeDownInt32ToUint8ScaleByFixedPointKernel.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_GEMMLOWP_QUANTIZEDOWNINT32TOUINT8_SCALEBYFIXEDPOINT_KERNEL_H -#define ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWNINT32TOUINT8_SCALEBYFIXEDPOINT_KERNEL_H +#ifndef ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWN_INT32TOUINT8_SCALEBYFIXEDPOINT_KERNEL_H +#define ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWN_INT32TOUINT8_SCALEBYFIXEDPOINT_KERNEL_H #include "arm_compute/core/KernelDescriptors.h" #include "src/core/common/Macros.h" @@ -30,6 +30,7 @@ namespace arm_compute { +// Forward declaration class ITensor; namespace cpu { @@ -51,7 +52,6 @@ namespace kernels class CpuGemmLowpQuantizeDownInt32ToUint8ScaleByFixedPointKernel : public ICpuKernel { public: - /** Default constructor */ CpuGemmLowpQuantizeDownInt32ToUint8ScaleByFixedPointKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuGemmLowpQuantizeDownInt32ToUint8ScaleByFixedPointKernel); /** Initialise the kernel's input and output. @@ -105,4 +105,4 @@ private: } // namespace kernels } // namespace cpu } // namespace arm_compute -#endif /* ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWNINT32TOUINT8_SCALEBYFIXEDPOINT_KERNEL_H */ +#endif /* ARM_COMPUTE_CPU_GEMMLOWP_QUANTIZEDOWN_INT32TOUINT8_SCALEBYFIXEDPOINT_KERNEL_H */ diff --git a/src/core/cpu/kernels/CpuGemmMatrixAdditionKernel.h b/src/core/cpu/kernels/CpuGemmMatrixAdditionKernel.h index c8e6fa9589..f9450b962b 100644 --- a/src/core/cpu/kernels/CpuGemmMatrixAdditionKernel.h +++ b/src/core/cpu/kernels/CpuGemmMatrixAdditionKernel.h @@ -44,7 +44,6 @@ namespace kernels class CpuGemmMatrixAdditionKernel : public ICpuKernel { public: - /** Constructor */ CpuGemmMatrixAdditionKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuGemmMatrixAdditionKernel); /** Initialise the kernel's input and output. diff --git a/src/core/cpu/kernels/CpuGemmMatrixMultiplyKernel.h b/src/core/cpu/kernels/CpuGemmMatrixMultiplyKernel.h index bf13342739..974ff85606 100644 --- a/src/core/cpu/kernels/CpuGemmMatrixMultiplyKernel.h +++ b/src/core/cpu/kernels/CpuGemmMatrixMultiplyKernel.h @@ -42,7 +42,6 @@ namespace kernels class CpuGemmMatrixMultiplyKernel : public ICpuKernel { public: - /** Constructor */ CpuGemmMatrixMultiplyKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuGemmMatrixMultiplyKernel); /** Initialise the kernel's input and output. @@ -89,4 +88,4 @@ private: } // namespace kernels } // namespace cpu } // namespace arm_compute -#endif /*ARM_COMPUTE_CPU_GEMM_MATRIX_MULTIPLY_KERNEL_H*/ +#endif /* ARM_COMPUTE_CPU_GEMM_MATRIX_MULTIPLY_KERNEL_H */ diff --git a/src/core/cpu/kernels/CpuGemmTranspose1xWKernel.h b/src/core/cpu/kernels/CpuGemmTranspose1xWKernel.h index c9c22bd27b..1a9287f7b0 100644 --- a/src/core/cpu/kernels/CpuGemmTranspose1xWKernel.h +++ b/src/core/cpu/kernels/CpuGemmTranspose1xWKernel.h @@ -71,7 +71,6 @@ namespace kernels class CpuGemmTranspose1xWKernel : public ICpuKernel { public: - /** Constructor */ CpuGemmTranspose1xWKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuGemmTranspose1xWKernel); /** Configure kernel for a given list of arguments @@ -95,4 +94,4 @@ public: } // namespace kernels } // namespace cpu } // namespace arm_compute -#endif /*ARM_COMPUTE_CPU_GEMM_TRANSPOSE1xW_KERNEL_H */ +#endif /* ARM_COMPUTE_CPU_GEMM_TRANSPOSE1xW_KERNEL_H */ diff --git a/src/core/cpu/kernels/CpuMulKernel.h b/src/core/cpu/kernels/CpuMulKernel.h index 3e667bc4be..3ea176cc31 100644 --- a/src/core/cpu/kernels/CpuMulKernel.h +++ b/src/core/cpu/kernels/CpuMulKernel.h @@ -37,7 +37,6 @@ namespace kernels class CpuMulKernel : public ICpuKernel { public: - /** Default constructor */ CpuMulKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuMulKernel); /** Initialise the kernel's input, dst and border mode. @@ -122,7 +121,6 @@ private: class CpuComplexMulKernel : public ICpuKernel { public: - /** Default constructor */ CpuComplexMulKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuComplexMulKernel); /** Initialise the kernel's src, dst and border mode. diff --git a/src/core/cpu/kernels/CpuPermuteKernel.h b/src/core/cpu/kernels/CpuPermuteKernel.h index 9c59d5b9d4..2955f38960 100644 --- a/src/core/cpu/kernels/CpuPermuteKernel.h +++ b/src/core/cpu/kernels/CpuPermuteKernel.h @@ -48,13 +48,9 @@ public: * @param[in] perm Permutation vector */ void configure(const ITensorInfo *src, ITensorInfo *dst, const PermutationVector &perm); - /** Static function to check if given info will lead to a valid configuration of @ref CpuPermuteKernel + /** Static function to check if given info will lead to a valid configuration * - * @note Arbitrary permutation vectors are supported with rank not greater than 4 - * - * @param[in] src Source tensor to permute. Data types supported: All - * @param[in] dst Destination tensor. Data types supported: Same as @p src - * @param[in] perm Permutation vector + * Similar to @ref CpuPermuteKernel::configure() * * @return a status */ diff --git a/src/core/cpu/kernels/CpuPool2dKernel.h b/src/core/cpu/kernels/CpuPool2dKernel.h index ff7d7bb21d..9ed398b907 100644 --- a/src/core/cpu/kernels/CpuPool2dKernel.h +++ b/src/core/cpu/kernels/CpuPool2dKernel.h @@ -38,7 +38,6 @@ namespace kernels class CpuPool2dKernel : public ICpuKernel { public: - /** Default constructor */ CpuPool2dKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuPool2dKernel); /** Configure kernel for a given list of arguments @@ -80,4 +79,4 @@ private: } // namespace kernels } // namespace cpu } // namespace arm_compute -#endif /*ARM_COMPUTE_CPU_POOL2D_KERNEL_H */ +#endif /* ARM_COMPUTE_CPU_POOL2D_KERNEL_H */ diff --git a/src/core/cpu/kernels/CpuQuantizeKernel.h b/src/core/cpu/kernels/CpuQuantizeKernel.h index d3422d3fbd..834a2e03d2 100644 --- a/src/core/cpu/kernels/CpuQuantizeKernel.h +++ b/src/core/cpu/kernels/CpuQuantizeKernel.h @@ -40,7 +40,6 @@ namespace kernels class CpuQuantizeKernel : public ICpuKernel { public: - /** Default constructor */ CpuQuantizeKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuQuantizeKernel); /** Set the input, output. diff --git a/src/core/cpu/kernels/CpuReshapeKernel.h b/src/core/cpu/kernels/CpuReshapeKernel.h index add6782b9e..1425fbe917 100644 --- a/src/core/cpu/kernels/CpuReshapeKernel.h +++ b/src/core/cpu/kernels/CpuReshapeKernel.h @@ -46,10 +46,9 @@ public: */ void configure(const ITensorInfo *src, ITensorInfo *dst); - /** Static function to check if given info will lead to a valid configuration of @ref CpuReshapeKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src Source tensor info. Data type supported: All - * @param[in] dst Destination tensor info. Data type supported: Same as @p src + * Similar to @ref CpuReshapeKernel::configure() * * @return a status */ diff --git a/src/core/cpu/kernels/CpuScaleKernel.h b/src/core/cpu/kernels/CpuScaleKernel.h index afaf074340..a2b65370ba 100644 --- a/src/core/cpu/kernels/CpuScaleKernel.h +++ b/src/core/cpu/kernels/CpuScaleKernel.h @@ -38,7 +38,6 @@ namespace kernels class CpuScaleKernel : public ICpuKernel { public: - /** Default constructor */ CpuScaleKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuScaleKernel); /** Initialise the kernel's inputs, output and interpolation policy @@ -106,4 +105,4 @@ private: } // namespace kernels } // namespace cpu } // namespace arm_compute -#endif /*ARM_COMPUTE_CPU_SCALEKERNEL_H */ +#endif /* ARM_COMPUTE_CPU_SCALEKERNEL_H */ diff --git a/src/core/cpu/kernels/CpuSoftmaxKernel.h b/src/core/cpu/kernels/CpuSoftmaxKernel.h index 2912098c30..776c0d6f79 100644 --- a/src/core/cpu/kernels/CpuSoftmaxKernel.h +++ b/src/core/cpu/kernels/CpuSoftmaxKernel.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_SOFTMAXKERNEL_H -#define ARM_COMPUTE_CPU_SOFTMAXKERNEL_H +#ifndef ARM_COMPUTE_CPU_SOFTMAX_KERNEL_H +#define ARM_COMPUTE_CPU_SOFTMAX_KERNEL_H #include "src/core/common/Macros.h" #include "src/core/cpu/ICpuKernel.h" @@ -37,7 +37,6 @@ namespace kernels class CpuLogits1DMaxKernel : public ICpuKernel { public: - /** Constructor */ CpuLogits1DMaxKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuLogits1DMaxKernel); /** Set the input and output tensors. @@ -71,7 +70,6 @@ template <bool IS_LOG = false> class CpuLogits1DSoftmaxKernel : public ICpuKernel { public: - /** Default constructor */ CpuLogits1DSoftmaxKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuLogits1DSoftmaxKernel); @@ -110,4 +108,4 @@ private: } // namespace kernels } // namespace cpu } // namespace arm_compute -#endif /* ARM_COMPUTE_CPU_SOFTMAXKERNEL_H */ +#endif /* ARM_COMPUTE_CPU_SOFTMAX_KERNEL_H */ diff --git a/src/core/cpu/kernels/CpuTransposeKernel.h b/src/core/cpu/kernels/CpuTransposeKernel.h index f09f427be8..920349d5e7 100644 --- a/src/core/cpu/kernels/CpuTransposeKernel.h +++ b/src/core/cpu/kernels/CpuTransposeKernel.h @@ -45,10 +45,9 @@ public: * @param[out] dst Destination tensor. Data types supported: Same as @p src */ void configure(const ITensorInfo *src, ITensorInfo *dst); - /** Static function to check if given info will lead to a valid configuration of @ref CpuTransposeKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src Source tensor to permute. Data types supported: All - * @param[in] dst Destination tensor. Data types supported: Same as @p src + * Similar to CpuTransposeKernel::configure() * * @return a status */ diff --git a/src/core/gpu/cl/kernels/ClActivationKernel.cpp b/src/core/gpu/cl/kernels/ClActivationKernel.cpp index e892d6a778..21c05632f9 100644 --- a/src/core/gpu/cl/kernels/ClActivationKernel.cpp +++ b/src/core/gpu/cl/kernels/ClActivationKernel.cpp @@ -87,7 +87,6 @@ Status validate_arguments(const ITensorInfo *src, const ITensorInfo *dst, const } // namespace ClActivationKernel::ClActivationKernel() - : _run_in_place(false) { _type = CLKernelType::ELEMENTWISE; } diff --git a/src/core/gpu/cl/kernels/ClActivationKernel.h b/src/core/gpu/cl/kernels/ClActivationKernel.h index 68c309e9e7..720b16a691 100644 --- a/src/core/gpu/cl/kernels/ClActivationKernel.h +++ b/src/core/gpu/cl/kernels/ClActivationKernel.h @@ -51,12 +51,9 @@ public: * @param[in] act_info Activation layer information. */ void configure(const ClCompileContext &compile_context, ITensorInfo *src, ITensorInfo *dst, ActivationLayerInfo act_info); - /** Static function to check if given info will lead to a valid configuration of @ref ClActivationKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src Source tensor info. In case of @p dst tensor info = nullptr, this tensor will store the result - * of the activation function. Data types supported: QASYMM8/QASYMM8_SIGNED/QSYMM16/F16/F32. - * @param[in] dst Destination tensor info. Data type supported: same as @p src - * @param[in] act_info Activation layer information. + * Similar to @ref ClActivationKernel::configure() * * @return a status */ @@ -66,7 +63,7 @@ public: void run_op(ITensorPack &tensors, const Window &window, ::cl::CommandQueue &queue) override; private: - bool _run_in_place; + bool _run_in_place{ false }; }; } // namespace kernels } // namespace opencl diff --git a/src/core/gpu/cl/kernels/ClBatchConcatenateKernel.cpp b/src/core/gpu/cl/kernels/ClBatchConcatenateKernel.cpp index dbc628d6d5..fba1b0e087 100644 --- a/src/core/gpu/cl/kernels/ClBatchConcatenateKernel.cpp +++ b/src/core/gpu/cl/kernels/ClBatchConcatenateKernel.cpp @@ -60,7 +60,6 @@ Status validate_arguments(const ITensorInfo *src, unsigned int batch_offset, con } // namespace ClBatchConcatenateKernel::ClBatchConcatenateKernel() - : _batch_offset(0) { _type = CLKernelType::ELEMENTWISE; } diff --git a/src/core/gpu/cl/kernels/ClBatchConcatenateKernel.h b/src/core/gpu/cl/kernels/ClBatchConcatenateKernel.h index d9fa905e8e..2963d7cdfd 100644 --- a/src/core/gpu/cl/kernels/ClBatchConcatenateKernel.h +++ b/src/core/gpu/cl/kernels/ClBatchConcatenateKernel.h @@ -40,7 +40,6 @@ namespace kernels class ClBatchConcatenateKernel : public IClKernel { public: - /** Default constructor */ ClBatchConcatenateKernel(); ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClBatchConcatenateKernel); /** Initialise the kernel's source and destination @@ -55,11 +54,9 @@ public: * */ void configure(const CLCompileContext &compile_context, ITensorInfo *src, unsigned int batch_offset, ITensorInfo *dst); - /** Static function to check if given info will lead to a valid configuration of @ref ClBatchConcatenateKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src Input tensor info. Data types supported: All. - * @param[in] batch_offset The offset on axis # 3. - * @param[in] dst Destination tensor info. Data types supported: Same as @p src. + * Similar to @ref ClBatchConcatenateKernel::configure() * * @return a status */ @@ -69,7 +66,7 @@ public: void run_op(ITensorPack &tensors, const Window &window, ::cl::CommandQueue &queue) override; private: - unsigned int _batch_offset; + unsigned int _batch_offset{ 0 }; }; } // namespace kernels } // namespace opencl diff --git a/src/core/gpu/cl/kernels/ClConvertFullyConnectedWeightsKernel.h b/src/core/gpu/cl/kernels/ClConvertFullyConnectedWeightsKernel.h index 6f4f09dc32..3976fd45db 100644 --- a/src/core/gpu/cl/kernels/ClConvertFullyConnectedWeightsKernel.h +++ b/src/core/gpu/cl/kernels/ClConvertFullyConnectedWeightsKernel.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_CLCONVERTFULLYCONNECTEDWEIGHTSKERNEL_H -#define ARM_COMPUTE_CLCONVERTFULLYCONNECTEDWEIGHTSKERNEL_H +#ifndef ARM_COMPUTE_CL_CONVERT_FULLYCONNECTED_WEIGHTS_KERNEL_H +#define ARM_COMPUTE_CL_CONVERT_FULLYCONNECTED_WEIGHTS_KERNEL_H #include "src/core/common/Macros.h" #include "src/core/gpu/cl/ClCompileContext.h" @@ -30,8 +30,6 @@ namespace arm_compute { -class ICLTensor; - /** Interface to convert the 2D Fully Connected weights from NCHW to NHWC or vice versa. * * @note This function can be applied to the 2D weights used by a Fully Connected layer if: @@ -58,12 +56,11 @@ public: * @param[in] data_layout The data layout the weights have been trained in. */ void configure(const CLCompileContext &compile_context, const ITensorInfo *src, ITensorInfo *dst, const TensorShape &original_src_shape, DataLayout data_layout); - /** Static function to check if given info will lead to a valid configuration of @ref ClConvertFullyConnectedWeightsKernel + /** Static function to check if given info will lead to a valid configuration + * + * Similar to @ref ClConvertFullyConnectedWeightsKernel::configure() * - * @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_src_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. + * @return a status */ static Status validate(const ITensorInfo *src, const ITensorInfo *dst, const TensorShape &original_src_shape, DataLayout data_layout); @@ -73,4 +70,4 @@ public: } // namespace kernels } // namespace opencl } // namespace arm_compute -#endif /*ARM_COMPUTE_CLCONVERTFULLYCONNECTEDWEIGHTSKERNEL_H */ +#endif /* ARM_COMPUTE_CL_CONVERT_FULLYCONNECTED_WEIGHTS_KERNEL_H */ diff --git a/src/core/gpu/cl/kernels/ClCopyKernel.h b/src/core/gpu/cl/kernels/ClCopyKernel.h index f3eb0aab62..d2732c4e59 100644 --- a/src/core/gpu/cl/kernels/ClCopyKernel.h +++ b/src/core/gpu/cl/kernels/ClCopyKernel.h @@ -48,11 +48,9 @@ public: * @param[in] dst_window (Optional) Window to be used in case only copying into part of a tensor. Default is nullptr. */ void configure(const CLCompileContext &compile_context, const ITensorInfo *src, ITensorInfo *dst, Window *dst_window = nullptr); - /** Static function to check if given info will lead to a valid configuration of @ref ClCopyKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src Source tensor info. Data types supported: All. - * @param[in] dst Destination tensor info. Data types supported: same as @p src. - * @param[in] dst_window (Optional) Window to be used in case only copying into part of a tensor. Default is nullptr. + * Similar to @ref ClCopyKernel::configure() * * @return a status */ @@ -68,4 +66,4 @@ private: } // namespace kernels } // namespace opencl } // namespace arm_compute -#endif /*ARM_COMPUTE_CL_COPY_KERNEL_H */ +#endif /* ARM_COMPUTE_CL_COPY_KERNEL_H */ diff --git a/src/core/gpu/cl/kernels/ClCropKernel.cpp b/src/core/gpu/cl/kernels/ClCropKernel.cpp index ef2e48b45d..a052ef53f9 100644 --- a/src/core/gpu/cl/kernels/ClCropKernel.cpp +++ b/src/core/gpu/cl/kernels/ClCropKernel.cpp @@ -41,11 +41,6 @@ namespace opencl { namespace kernels { -void ClCropKernel::configure(const ITensorInfo *src, ITensorInfo *dst, Coordinates2D start, Coordinates2D end, uint32_t batch_index, float extrapolation_value, Window *dst_window) -{ - configure(CLKernelLibrary::get().get_compile_context(), src, dst, start, end, batch_index, extrapolation_value, dst_window); -} - ClCropKernel::ClCropKernel() { _type = CLKernelType::ELEMENTWISE; diff --git a/src/core/gpu/cl/kernels/ClCropKernel.h b/src/core/gpu/cl/kernels/ClCropKernel.h index 7120dbbc81..d81912284e 100644 --- a/src/core/gpu/cl/kernels/ClCropKernel.h +++ b/src/core/gpu/cl/kernels/ClCropKernel.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_CLCROPKERNEL_H -#define ARM_COMPUTE_CLCROPKERNEL_H +#ifndef ARM_COMPUTE_CL_CROP_KERNEL_H +#define ARM_COMPUTE_CL_CROP_KERNEL_H #include "src/core/common/Macros.h" #include "src/core/gpu/cl/ClCompileContext.h" @@ -44,19 +44,6 @@ public: * * @note Supported tensor rank: up to 4 * - * @param[in] src Source tensor info. Data type supported: All. Data layouts supported: NHWC. - * @param[out] dst Destination tensor info. Data type supported: F32 - * @param[in] start Coordinates of where to start cropping the image. - * @param[in] end Coordinates of where to end cropping the image. - * @param[in] batch_index Fourth dimension index of the 3D image to crop in @p src. - * @param[in] extrapolation_value Value to be used for values outside of the image. Default is 0. - * @param[in] dst_window Output window to be used in case cropped image is being copied into a tensor. Default is nullptr. - */ - void configure(const ITensorInfo *src, ITensorInfo *dst, Coordinates2D start, Coordinates2D end, uint32_t batch_index, float extrapolation_value = 0, Window *dst_window = nullptr); - /** Configure kernel - * - * @note Supported tensor rank: up to 4 - * * @param[in] compile_context The compile context to be used. * @param[in] src Source tensor info. Data type supported: All. Data layouts supported: NHWC. * @param[out] dst Destination tensor info. Data type supported: F32 @@ -68,18 +55,11 @@ public: */ void configure(const CLCompileContext &compile_context, const ITensorInfo *src, ITensorInfo *dst, Coordinates2D start, Coordinates2D end, uint32_t batch_index, float extrapolation_value = 0, Window *dst_window = nullptr); - - /** Static function to check if given info will lead to a valid configuration of @ref CLStridedSliceKernel + /** Static function to check if given info will lead to a valid configuration * - * @note Supported tensor rank: up to 4 + * Similar to @ref ClCropKernel::configure() * - * @param[in] src Source tensor info. Data type supported: All. Data layouts supported: NHWC. - * @param[in] dst Destination tensor info. Data type supported: F32 - * @param[in] start Coordinates of where to start cropping the image. - * @param[in] end Coordinates of where to end cropping the image. - * @param[in] batch_index Fourth dimension index of the 3D image to crop in @p src. - * @param[in] extrapolation_value Value to be used for values outside of the image. Default is 0. - * @param[in] dst_window Output window to be used in case cropped image is being copied into a tensor. Default is nullptr. + * @return a status */ static Status validate(const ITensorInfo *src, const ITensorInfo *dst, Coordinates2D start, Coordinates2D end, uint32_t batch_index, float extrapolation_value = 0, Window *dst_window = nullptr); @@ -95,4 +75,4 @@ private: } // namespace kernels } // namespace opencl } // namespace arm_compute -#endif /*ARM_COMPUTE_CLCROPKERNEL_H */ +#endif /* ARM_COMPUTE_CL_CROP_KERNEL_H */ diff --git a/src/core/gpu/cl/kernels/ClDepthConcatenateKernel.h b/src/core/gpu/cl/kernels/ClDepthConcatenateKernel.h index 103ef00695..0f408477b1 100644 --- a/src/core/gpu/cl/kernels/ClDepthConcatenateKernel.h +++ b/src/core/gpu/cl/kernels/ClDepthConcatenateKernel.h @@ -40,7 +40,6 @@ namespace kernels class ClDepthConcatenateKernel : public IClKernel { public: - /** Default constructor */ ClDepthConcatenateKernel(); ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClDepthConcatenateKernel); /** Initialise the kernel's source and destination @@ -55,11 +54,9 @@ public: * */ void configure(const CLCompileContext &compile_context, ITensorInfo *src, unsigned int depth_offset, ITensorInfo *dst); - /** Static function to check if given info will lead to a valid configuration of @ref ClDepthConcatenateKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src Source tensor info. Data types supported: QASYMM8/QASYMM8_SIGNED/F16/F32 - * @param[in] depth_offset The offset on the Z axis. - * @param[in] dst Destination tensor info. Data types supported: Same as @p src. + * Similar to @ref ClDepthConcatenateKernel::configure() * * @return a status */ diff --git a/src/core/gpu/cl/kernels/ClDequantizeKernel.h b/src/core/gpu/cl/kernels/ClDequantizeKernel.h index 2460674067..0912e1b228 100644 --- a/src/core/gpu/cl/kernels/ClDequantizeKernel.h +++ b/src/core/gpu/cl/kernels/ClDequantizeKernel.h @@ -38,7 +38,6 @@ namespace kernels class ClDequantizeKernel : public IClKernel { public: - /** Default constructor */ ClDequantizeKernel(); ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClDequantizeKernel); /** Initialise the kernel's input and output diff --git a/src/core/gpu/cl/kernels/ClDirectConv2dKernel.h b/src/core/gpu/cl/kernels/ClDirectConv2dKernel.h index b592a2191b..4880d4a668 100644 --- a/src/core/gpu/cl/kernels/ClDirectConv2dKernel.h +++ b/src/core/gpu/cl/kernels/ClDirectConv2dKernel.h @@ -86,4 +86,4 @@ public: } // namespace kernels } // namespace opencl } // namespace arm_compute -#endif /*ARM_COMPUTE_CL_DIRECT_CONV2D_KERNEL_H */ +#endif /* ARM_COMPUTE_CL_DIRECT_CONV2D_KERNEL_H */ diff --git a/src/core/gpu/cl/kernels/ClElementwiseKernel.cpp b/src/core/gpu/cl/kernels/ClElementwiseKernel.cpp index 7bfdb9efdd..b645353dd6 100644 --- a/src/core/gpu/cl/kernels/ClElementwiseKernel.cpp +++ b/src/core/gpu/cl/kernels/ClElementwiseKernel.cpp @@ -276,21 +276,12 @@ ClElementwiseKernel::ClElementwiseKernel() _type = CLKernelType::ELEMENTWISE; } -void ClElementwiseKernel::configure_common(ITensorInfo *src1, ITensorInfo *src2, ITensorInfo *dst) -{ - configure_common(CLKernelLibrary::get().get_compile_context(), src1, src2, dst); -} - void ClElementwiseKernel::configure_common(const ClCompileContext &compile_context, ITensorInfo *src1, ITensorInfo *src2, ITensorInfo *dst) { // Configure kernel window auto win_config = validate_and_configure_window(*src1, *src2, *dst); ARM_COMPUTE_ERROR_THROW_ON(win_config.first); - _src1 = src1; - _src2 = src2; - _dst = dst; - std::string kernel_name = "elementwise_operation_" + name(); if(is_data_type_quantized(src1->data_type())) { diff --git a/src/core/gpu/cl/kernels/ClElementwiseKernel.h b/src/core/gpu/cl/kernels/ClElementwiseKernel.h index 7f55151a87..ab5c777ae6 100644 --- a/src/core/gpu/cl/kernels/ClElementwiseKernel.h +++ b/src/core/gpu/cl/kernels/ClElementwiseKernel.h @@ -44,7 +44,6 @@ namespace kernels class ClElementwiseKernel : public IClKernel { public: - /** Default constructor */ ClElementwiseKernel(); ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClElementwiseKernel); @@ -80,30 +79,14 @@ protected: /** Commmon configure function for element-wise operators with no additional options (e.g., Div, Min, Max, SquaredDiff) * */ - void configure_common(ITensorInfo *src1, ITensorInfo *src2, ITensorInfo *dst); - /** Commmon configure function for element-wise operators with no additional options (e.g., Div, Min, Max, SquaredDiff) - * - */ void configure_common(const ClCompileContext &compile_context, ITensorInfo *src1, ITensorInfo *src2, ITensorInfo *dst); ActivationLayerInfo _act_info{}; - -private: - const ITensorInfo *_src1 - { - nullptr - }; /**< Source tensor info 1 */ - const ITensorInfo *_src2 - { - nullptr - }; /**< Source tensor info 2 */ - ITensorInfo *_dst{ nullptr }; /**< Destination tensor info */ }; class ClLogicalBinaryKernel : public ClElementwiseKernel { public: - /** Default constructor */ ClLogicalBinaryKernel() = default; ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClLogicalBinaryKernel); /** Function to configure kernel @@ -115,12 +98,11 @@ public: * @param[in] dst Destination tensor info. Data types supported: same as @p src1. */ void configure(const ClCompileContext &compile_context, LogicalOperation op, ITensorInfo *src1, ITensorInfo *src2, ITensorInfo *dst); - /** Static function to check if the given configuration is valid for this kernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] op Logical binary operation to be executed. - * @param[in] src1 First source tensor info. Data types supported: U8. - * @param[in] src2 Second source tensor info. Data types supported: same as @p src1. - * @param[in] dst Destination tensor info. Data types supported: same as @p src1. + * Similar to @ref ClLogicalBinaryKernel::configure() + * + * @return a status */ static Status validate(LogicalOperation op, const ITensorInfo *src1, const ITensorInfo *src2, const ITensorInfo *dst); @@ -153,16 +135,11 @@ public: void configure(const ClCompileContext &compile_context, ArithmeticOperation op, ITensorInfo *input1, ITensorInfo *input2, ITensorInfo *output, const ConvertPolicy &policy, const ActivationLayerInfo &act_info = ActivationLayerInfo()); - /** Static function to check if given info will lead to a valid configuration of @ref ClSaturatedArithmeticKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] op Arithmetic operation to be executed. - * @param[in] input1 First tensor input info info. Data types supported: U8/QASYMM8/QASYMM8_SIGNED/S16/QSYMM16/F16/S32/F32. - * @param[in] input2 Second tensor input info info. Data types supported: Same as @p input1. - * @param[in] output Output tensor info info. Data types supported: Same as @p input1. - * @param[in] policy Policy to use to handle overflow. - * @param[in] act_info (Optional) Activation layer information in case of a fused activation. + * Similar to @ref ClSaturatedArithmeticKernel::configure() * - * @return a Status + * @return a status */ static Status validate(ArithmeticOperation op, const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output, const ConvertPolicy &policy, const ActivationLayerInfo &act_info = ActivationLayerInfo()); @@ -197,15 +174,11 @@ public: void configure(const ClCompileContext &compile_context, ArithmeticOperation op, ITensorInfo *src1, ITensorInfo *src2, ITensorInfo *dst, const ActivationLayerInfo &act_info = ActivationLayerInfo()); - /** Static function to check if given info will lead to a valid configuration of @ref ClArithmeticKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] op Arithmetic operation to be executed. - * @param[in] src1 First source tensor info. Data types supported: U8/QASYMM8/QASYMM8_SIGNED/S16/QSYMM16/F16/S32/F32. - * @param[in] src2 Second source tensor info. Data types supported: same as @p src1. - * @param[in] dst Destination tensor info. Data types supported: same as @p src1. - * @param[in] act_info (Optional) Activation layer information in case of a fused activation. + * Similar to @ref ClArithmeticKernel::configure() * - * @return a Status + * @return a status */ static Status validate(ArithmeticOperation op, const ITensorInfo *src1, const ITensorInfo *src2, const ITensorInfo *dst, const ActivationLayerInfo &act_info = ActivationLayerInfo()); diff --git a/src/core/gpu/cl/kernels/ClElementwiseUnaryKernel.h b/src/core/gpu/cl/kernels/ClElementwiseUnaryKernel.h index 225869b58b..64cc2f7afc 100644 --- a/src/core/gpu/cl/kernels/ClElementwiseUnaryKernel.h +++ b/src/core/gpu/cl/kernels/ClElementwiseUnaryKernel.h @@ -48,11 +48,9 @@ public: * @param[in] op Element wise unary operation to perform. */ void configure(const CLCompileContext &compile_context, const ITensorInfo *src, ITensorInfo *dst, const ElementWiseUnary &op); - /** Static function to check if given info will lead to a valid configuration of @ref ClElementWiseUnaryKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src First source tensor info. Data types supported: F16/F32. - * @param[in] dst Destination tensor info. Data types supported: same as @p src. - * @param[in] op Element wise unary operation to perform. + * Similar to @ref ClElementWiseUnaryKernel::configure() * * @return a status */ diff --git a/src/core/gpu/cl/kernels/ClFillKernel.cpp b/src/core/gpu/cl/kernels/ClFillKernel.cpp index 526a466a00..f213bf8e6a 100644 --- a/src/core/gpu/cl/kernels/ClFillKernel.cpp +++ b/src/core/gpu/cl/kernels/ClFillKernel.cpp @@ -47,13 +47,6 @@ ClFillKernel::ClFillKernel() _type = CLKernelType::ELEMENTWISE; } -void ClFillKernel::configure(ITensorInfo *tensor, - const PixelValue &constant_value, - Window *window) -{ - configure(CLKernelLibrary::get().get_compile_context(), tensor, constant_value, window); -} - void ClFillKernel::configure(const CLCompileContext &compile_context, ITensorInfo *tensor, const PixelValue &constant_value, Window *window) diff --git a/src/core/gpu/cl/kernels/ClFillKernel.h b/src/core/gpu/cl/kernels/ClFillKernel.h index 9542c20508..ecc2546e4a 100644 --- a/src/core/gpu/cl/kernels/ClFillKernel.h +++ b/src/core/gpu/cl/kernels/ClFillKernel.h @@ -42,24 +42,15 @@ public: ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClFillKernel); /** Initialise the kernel's tensor and filling value * - * @param[in,out] tensor Input tensor info. Supported data types: All. - * @param[in] constant_value The value used to fill the planes of the tensor - * @param[in] window Window to be used in case setting only part of a tensor. Default is nullptr. - */ - void configure(ITensorInfo *tensor, const PixelValue &constant_value, Window *window = nullptr); - /** Initialise the kernel's tensor and filling value - * * @param[in] compile_context The compile context to be used. * @param[in,out] tensor Input tensor info. Supported data types: All. * @param[in] constant_value The value used to fill the planes of the tensor * @param[in] window Window to be used in case setting only part of a tensor. Default is nullptr. */ void configure(const CLCompileContext &compile_context, ITensorInfo *tensor, const PixelValue &constant_value, Window *window = nullptr); - /** Static function to check if given info will lead to a valid configuration of @ref ClFillKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] tensor Source tensor info. Data types supported: All. - * @param[in] constant_value The value used to fill the planes of the tensor - * @param[in] window Window to be used in case setting only part of a tensor. Default is nullptr. + * Similar to @ref ClFillKernel::configure() * * @return a status */ @@ -74,4 +65,4 @@ private: } // namespace kernels } // namespace opencl } // namespace arm_compute -#endif /*ARM_COMPUTE_CLMEMSETRKERNEL_H */ +#endif /* ARM_COMPUTE_CL_FILL_KERNEL_H */ diff --git a/src/core/gpu/cl/kernels/ClFloorKernel.h b/src/core/gpu/cl/kernels/ClFloorKernel.h index 3bc648b7be..57c9906f2c 100644 --- a/src/core/gpu/cl/kernels/ClFloorKernel.h +++ b/src/core/gpu/cl/kernels/ClFloorKernel.h @@ -47,11 +47,9 @@ public: * @param[out] dst Destination tensor info. Same as @p src */ void configure(const ClCompileContext &compile_context, const ITensorInfo *src, ITensorInfo *dst); - - /** Static function to check if given info will lead to a valid configuration of @ref ClFloorKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src Source tensor info. Data type supported: F16/F32. - * @param[in] dst Destination tensor info. Same as @p src + * Similar to @ref ClFloorKernel::configure() * * @return a status */ diff --git a/src/core/gpu/cl/kernels/ClGemmLowpMatrixMultiplyNativeKernel.h b/src/core/gpu/cl/kernels/ClGemmLowpMatrixMultiplyNativeKernel.h index 491c3e44df..eaa125fbf2 100644 --- a/src/core/gpu/cl/kernels/ClGemmLowpMatrixMultiplyNativeKernel.h +++ b/src/core/gpu/cl/kernels/ClGemmLowpMatrixMultiplyNativeKernel.h @@ -78,4 +78,4 @@ private: } // namespace kernels } // namespace opencl } // namespace arm_compute -#endif /* ARM_COMPUTE_CL_GEMMLOWP_MATRIXMULTIPLY_NATIVE_KERNEL_H*/ +#endif /* ARM_COMPUTE_CL_GEMMLOWP_MATRIXMULTIPLY_NATIVE_KERNEL_H */ diff --git a/src/core/gpu/cl/kernels/ClGemmLowpMatrixMultiplyReshapedKernel.h b/src/core/gpu/cl/kernels/ClGemmLowpMatrixMultiplyReshapedKernel.h index b99dec33af..99cff011d1 100644 --- a/src/core/gpu/cl/kernels/ClGemmLowpMatrixMultiplyReshapedKernel.h +++ b/src/core/gpu/cl/kernels/ClGemmLowpMatrixMultiplyReshapedKernel.h @@ -87,4 +87,4 @@ private: } // namespace kernels } // namespace opencl } // namespace arm_compute -#endif /* ARM_COMPUTE_CL_GEMMLOWP_MATRIXMULTIPLY_RESHAPED_KERNEL_H*/ +#endif /* ARM_COMPUTE_CL_GEMMLOWP_MATRIXMULTIPLY_RESHAPED_KERNEL_H */ diff --git a/src/core/gpu/cl/kernels/ClGemmMatrixMultiplyNativeKernel.h b/src/core/gpu/cl/kernels/ClGemmMatrixMultiplyNativeKernel.h index c3bdc7589e..cd7bf278c2 100644 --- a/src/core/gpu/cl/kernels/ClGemmMatrixMultiplyNativeKernel.h +++ b/src/core/gpu/cl/kernels/ClGemmMatrixMultiplyNativeKernel.h @@ -85,4 +85,4 @@ private: } // namespace kernels } // namespace opencl } // namespace arm_compute -#endif /*ARM_COMPUTE_CL_GEMM_MATRIXMULTIPLY_NATIVE_KERNEL_H*/ +#endif /* ARM_COMPUTE_CL_GEMM_MATRIXMULTIPLY_NATIVE_KERNEL_H */ diff --git a/src/core/gpu/cl/kernels/ClHeightConcatenateKernel.h b/src/core/gpu/cl/kernels/ClHeightConcatenateKernel.h index 9a4380a5b7..0733078fc2 100644 --- a/src/core/gpu/cl/kernels/ClHeightConcatenateKernel.h +++ b/src/core/gpu/cl/kernels/ClHeightConcatenateKernel.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_CL_HEIGHT_CONCATENATE_LAYER_KERNEL_H -#define ARM_COMPUTE_CL_HEIGHT_CONCATENATE_LAYER_KERNEL_H +#ifndef ARM_COMPUTE_CL_HEIGHT_CONCATENATE_KERNEL_H +#define ARM_COMPUTE_CL_HEIGHT_CONCATENATE_KERNEL_H #include "src/core/common/Macros.h" #include "src/core/gpu/cl/ClCompileContext.h" @@ -40,7 +40,6 @@ namespace kernels class ClHeightConcatenateKernel : public IClKernel { public: - /** Default constructor */ ClHeightConcatenateKernel(); ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClHeightConcatenateKernel); /** Initialise the kernel's source and destination @@ -52,11 +51,9 @@ public: * */ void configure(const CLCompileContext &compile_context, ITensorInfo *src, unsigned int height_offset, ITensorInfo *dst); - /** Static function to check if given info will lead to a valid configuration of @ref ClHeightConcatenateKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src Source tensor info. Data types supported: All. - * @param[in] height_offset The starting offset on the Y axis for the dst tensor. - * @param[in] dst Destination tensor info. Data types supported: same as @p src. + * Similar to @ref ClHeightConcatenateKernel::configure() * * @return a status */ @@ -71,4 +68,4 @@ private: } // namespace kernels } // namespace opencl } // namespace arm_compute -#endif /* ARM_COMPUTE_CL_HEIGHT_CONCATENATE_LAYER_KERNEL_H */ +#endif /* ARM_COMPUTE_CL_HEIGHT_CONCATENATE_KERNEL_H */ diff --git a/src/core/gpu/cl/kernels/ClMulKernel.h b/src/core/gpu/cl/kernels/ClMulKernel.h index 9c70301d89..dec8dba61c 100644 --- a/src/core/gpu/cl/kernels/ClMulKernel.h +++ b/src/core/gpu/cl/kernels/ClMulKernel.h @@ -38,7 +38,6 @@ namespace kernels class ClMulKernel : public IClKernel { public: - /** Default constructor */ ClMulKernel(); ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClMulKernel); /** Initialise the kernel's src and dst. @@ -87,7 +86,6 @@ public: class ClComplexMulKernel : public ICLKernel { public: - /** Default constructor */ ClComplexMulKernel(); ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClComplexMulKernel); /** Initialise the kernel's src and dst. diff --git a/src/core/gpu/cl/kernels/ClPermuteKernel.h b/src/core/gpu/cl/kernels/ClPermuteKernel.h index 326110a27c..839e224ee4 100644 --- a/src/core/gpu/cl/kernels/ClPermuteKernel.h +++ b/src/core/gpu/cl/kernels/ClPermuteKernel.h @@ -41,7 +41,6 @@ namespace kernels class ClPermuteKernel : public IClKernel { public: - /** Default constructor */ ClPermuteKernel(); ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClPermuteKernel); /** Set the src and dst of the kernel. @@ -54,13 +53,9 @@ public: * @param[in] perm Permutation vector */ void configure(const CLCompileContext &compile_context, const ITensorInfo *src, ITensorInfo *dst, const PermutationVector &perm); - /** Static function to check if given info will lead to a valid configuration of @ref ClPermuteKernel + /** Static function to check if given info will lead to a valid configuration * - * @note Arbitrary permutation vectors are supported with rank not greater than 4 - * - * @param[in] src The src tensor info. Data types supported: All. - * @param[in] dst The dst tensor info. Data types supported: same as @p src. - * @param[in] perm Permutation vector + * Similar to @ref ClPermuteKernel::configure() * * @return a status */ @@ -75,4 +70,4 @@ private: } // namespace kernels } // namespace opencl } // namespace arm_compute -#endif /*ARM_COMPUTE_CL_PERMUTE_KERNEL_H */ +#endif /* ARM_COMPUTE_CL_PERMUTE_KERNEL_H */ diff --git a/src/core/gpu/cl/kernels/ClPool2dKernel.cpp b/src/core/gpu/cl/kernels/ClPool2dKernel.cpp index 9d5a24fdf2..e522814b6d 100644 --- a/src/core/gpu/cl/kernels/ClPool2dKernel.cpp +++ b/src/core/gpu/cl/kernels/ClPool2dKernel.cpp @@ -203,7 +203,6 @@ std::tuple<Status, Window, ClPoolingConfig> validate_and_configure_window(ITenso } // namespace ClPool2dKernel::ClPool2dKernel() - : _pool_info(), _data_layout(DataLayout::UNKNOWN), _border_size(0), _num_elems_processed_per_iteration(1) { _type = CLKernelType::POOL; } diff --git a/src/core/gpu/cl/kernels/ClPool2dKernel.h b/src/core/gpu/cl/kernels/ClPool2dKernel.h index 8ecb8eb7b7..ab8c56a857 100644 --- a/src/core/gpu/cl/kernels/ClPool2dKernel.h +++ b/src/core/gpu/cl/kernels/ClPool2dKernel.h @@ -38,7 +38,6 @@ namespace kernels class ClPool2dKernel : public IClKernel { public: - /** Default constructor */ ClPool2dKernel(); ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClPool2dKernel); @@ -65,10 +64,10 @@ public: BorderSize border_size() const override; public: - PoolingLayerInfo _pool_info; - DataLayout _data_layout; - BorderSize _border_size; - unsigned int _num_elems_processed_per_iteration; + PoolingLayerInfo _pool_info{}; + DataLayout _data_layout{ DataLayout::UNKNOWN }; + BorderSize _border_size{ 0 }; + unsigned int _num_elems_processed_per_iteration{ 1 }; }; } // namespace kernels } // namespace opencl diff --git a/src/core/gpu/cl/kernels/ClQuantizeKernel.h b/src/core/gpu/cl/kernels/ClQuantizeKernel.h index cd972987f5..1991a2fba8 100644 --- a/src/core/gpu/cl/kernels/ClQuantizeKernel.h +++ b/src/core/gpu/cl/kernels/ClQuantizeKernel.h @@ -41,7 +41,6 @@ namespace kernels class ClQuantizeKernel : public IClKernel { public: - /** Default constructor */ ClQuantizeKernel(); ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClQuantizeKernel); /** Set the input, output. diff --git a/src/core/gpu/cl/kernels/ClReshapeKernel.h b/src/core/gpu/cl/kernels/ClReshapeKernel.h index 3cd8369012..01e1ee84b9 100644 --- a/src/core/gpu/cl/kernels/ClReshapeKernel.h +++ b/src/core/gpu/cl/kernels/ClReshapeKernel.h @@ -47,11 +47,9 @@ public: * @param[out] dst Destination tensor info. Data type supported: Same as @p src */ void configure(const CLCompileContext &compile_context, const ITensorInfo *src, ITensorInfo *dst); - - /** Static function to check if given info will lead to a valid configuration of @ref ClReshapeKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src Source tensor info. Data type supported: All - * @param[in] dst Destination tensor info. Data type supported: Same as @p src + * Similar to @ref ClReshapeKernel::configure() * * @return a status */ @@ -63,4 +61,4 @@ public: } // namespace opencl } // namespace kernels } // namespace arm_compute -#endif /*ARM_COMPUTE_CL_RESHAPE_KERNEL_H */ +#endif /* ARM_COMPUTE_CL_RESHAPE_KERNEL_H */ diff --git a/src/core/gpu/cl/kernels/ClScaleKernel.h b/src/core/gpu/cl/kernels/ClScaleKernel.h index 826c4821b5..8333c7d6c0 100644 --- a/src/core/gpu/cl/kernels/ClScaleKernel.h +++ b/src/core/gpu/cl/kernels/ClScaleKernel.h @@ -31,8 +31,6 @@ namespace arm_compute { -class ICLTensor; - namespace opencl { namespace kernels @@ -41,10 +39,8 @@ namespace kernels class ClScaleKernel : public IClKernel { public: - /** Default constructor */ ClScaleKernel(); ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClScaleKernel); - /** Initialise the kernel's inputs, output and interpolation policy * * @param[in] compile_context The compile context to be used. @@ -54,13 +50,9 @@ public: * @param[in] info @ref ScaleKernelInfo Kernel descriptor to be used to configure. */ void configure(const CLCompileContext &compile_context, ITensorInfo *src, ITensorInfo *dst, const ScaleKernelInfo &info); - - /** Static function to check if given info will lead to a valid configuration of @ref ClScaleKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src Source tensor info. Data types supported: U8/QASYMM8/QASYMM8_SIGNED/S16/F16/F32 - * @param[in] dst Destination tensor info. Data types supported: Same as @p src - * All but the lowest two dimensions must be the same size as in the input tensor, i.e. scaling is only performed within the XY-plane. - * @param[in] info @ref ScaleKernelInfo Kernel descriptor to be used to validate + * Similar to @ref ClScaleKernel::configure() * * @return a status */ @@ -71,9 +63,9 @@ public: void run_op(ITensorPack &tensors, const Window &window, cl::CommandQueue &queue) override; private: - DataLayout _data_layout = DataLayout::UNKNOWN; + DataLayout _data_layout{ DataLayout::UNKNOWN }; }; } // namespace kernels } // namespace opencl } // namespace arm_compute -#endif /*ARM_COMPUTE_CLSCALEKERNEL_H */ +#endif /* ARM_COMPUTE_CL_SCALE_KERNEL_H */ diff --git a/src/core/gpu/cl/kernels/ClSoftmaxKernel.h b/src/core/gpu/cl/kernels/ClSoftmaxKernel.h index db1aca3b9b..a2ad02d6b7 100644 --- a/src/core/gpu/cl/kernels/ClSoftmaxKernel.h +++ b/src/core/gpu/cl/kernels/ClSoftmaxKernel.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_CLSOFTMAXLAYERKERNEL_H -#define ARM_COMPUTE_CLSOFTMAXLAYERKERNEL_H +#ifndef ARM_COMPUTE_CL_SOFTMAX_KERNEL_H +#define ARM_COMPUTE_CL_SOFTMAX_KERNEL_H #include "arm_compute/core/Error.h" #include "arm_compute/core/KernelDescriptors.h" @@ -50,7 +50,6 @@ public: /** Info for whether a parallel reduction will be run and the vector size of the execution. */ using ParallelReductionInfo = std::tuple<bool, unsigned int>; - /** Default constructor */ ClLogits1DMaxShiftExpSumKernel(); ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClLogits1DMaxShiftExpSumKernel); /** Configure the kernel using the given information about tensors @@ -63,12 +62,9 @@ public: * @param[in] info Contains information consumed by kernels for softmax described in @ref SoftmaxKernelInfo. */ void configure(const CLCompileContext &compile_context, const ITensorInfo &src, ITensorInfo &max, ITensorInfo &dst, ITensorInfo &sum, const SoftmaxKernelInfo &info); - /** Static function to check if given info will lead to a valid configuration of @ref ClLogits1DMaxShiftExpSumKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src Source tensor. Data types supported: QASYMM8/QASYMM8_SIGNED/F16/F32 - * @param[in] max Max values tensor. Data types supported: same as @p src - * @param[in] dst Destination tensor. Data types supported: same as @p src - * @param[in] sum Sum of 1D logits tensor. Data types supported: same as @p src + * Similar to @ref ClLogits1DMaxShiftExpSumKernel::configure() * * @return a status */ @@ -93,7 +89,6 @@ public: class ClLogits1DNormKernel : public IClKernel { public: - /** Default constructor */ ClLogits1DNormKernel(); ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClLogits1DNormKernel); @@ -106,12 +101,9 @@ public: * @param[in] info Contains information consumed by kernels for softmax described in @ref SoftmaxKernelInfo. */ void configure(const CLCompileContext &compile_context, const ITensorInfo &src, const ITensorInfo &sum, ITensorInfo &dst, const SoftmaxKernelInfo &info); - /** Static function to check if given info will lead to a valid configuration of @ref ClLogits1DNormKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src Source tensor. Data types supported: S32/F16/F32. If this kernel is used for log softmax, only F32/F16 is supported. - * @param[in] sum Sum tensor. Dimensions should be dim(input)-1. Data types supported: same as @p input - * @param[in] dst Destination tensor. Data types supported: QASYMM8 for S32 @p input, or same as @p input - * @param[in] info Contains information consumed by kernels for softmax described in @ref SoftmaxKernelInfo. + * Similar to @ref ClLogits1DNormKernel::configure() * * @return a status */ @@ -123,4 +115,4 @@ public: } // namespace kernels } // namespace opencl } // namespace arm_compute -#endif /*ARM_COMPUTE_CLSOFTMAXLAYERKERNEL_H */ +#endif /* ARM_COMPUTE_CL_SOFTMAX_KERNEL_H */ diff --git a/src/core/gpu/cl/kernels/ClTransposeKernel.h b/src/core/gpu/cl/kernels/ClTransposeKernel.h index 7d1226cc0d..c8379d44c7 100644 --- a/src/core/gpu/cl/kernels/ClTransposeKernel.h +++ b/src/core/gpu/cl/kernels/ClTransposeKernel.h @@ -47,10 +47,9 @@ public: * @param[in] dst The dst tensor info. Data types supported: Same as @p src */ void configure(const CLCompileContext &compile_context, const ITensorInfo *src, ITensorInfo *dst); - /** Static function to check if given info will lead to a valid configuration of @ref ClTransposeKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src The src tensor info. Data types supported: All. - * @param[in] dst The dst tensor info. Data types supported: same as @p src. + * Similar to @ref ClTransposeKernel::configure() * * @return a status */ @@ -62,4 +61,4 @@ public: } // namespace kernels } // namespace opencl } // namespace arm_compute -#endif /*ARM_COMPUTE_CL_TRANSPOSE_KERNEL_H */ +#endif /* ARM_COMPUTE_CL_TRANSPOSE_KERNEL_H */ diff --git a/src/core/gpu/cl/kernels/ClWidthConcatenate2TensorsKernel.h b/src/core/gpu/cl/kernels/ClWidthConcatenate2TensorsKernel.h index 56202bad2e..15e0757aec 100644 --- a/src/core/gpu/cl/kernels/ClWidthConcatenate2TensorsKernel.h +++ b/src/core/gpu/cl/kernels/ClWidthConcatenate2TensorsKernel.h @@ -40,7 +40,6 @@ namespace kernels class ClWidthConcatenate2TensorsKernel : public IClKernel { public: - /** Default constructor */ ClWidthConcatenate2TensorsKernel(); ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClWidthConcatenate2TensorsKernel); /** Initialise the kernel's sources and destination @@ -51,11 +50,9 @@ public: * @param[out] dst Destination tensor info. Data types supported: Same as @p src1. */ void configure(const CLCompileContext &compile_context, ITensorInfo *src1, ITensorInfo *src2, ITensorInfo *dst); - /** Static function to check if given info will lead to a valid configuration of @ref ClWidthConcatenate2TensorsKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src1 First tensor info. Data types supported: All. - * @param[in] src2 Second tensor info. Data types supported: same as @p src1 - * @param[in] dst Destination tensor info. Data types supported: Same as @p src1. + * Similar to @ref ClWidthConcatenate2TensorsKernel::configure() * * @return a status */ diff --git a/src/core/gpu/cl/kernels/ClWidthConcatenate4TensorsKernel.h b/src/core/gpu/cl/kernels/ClWidthConcatenate4TensorsKernel.h index 19bda65902..1e3f47f7fb 100644 --- a/src/core/gpu/cl/kernels/ClWidthConcatenate4TensorsKernel.h +++ b/src/core/gpu/cl/kernels/ClWidthConcatenate4TensorsKernel.h @@ -41,7 +41,6 @@ namespace kernels class ClWidthConcatenate4TensorsKernel : public IClKernel { public: - /** Default constructor */ ClWidthConcatenate4TensorsKernel(); ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClWidthConcatenate4TensorsKernel); /** Initialise the kernel's sources and destination @@ -54,13 +53,9 @@ public: * @param[out] dst Destination tensor info. Data types supported: same as @p src1. */ void configure(const CLCompileContext &compile_context, ITensorInfo *src1, ITensorInfo *src2, ITensorInfo *src3, ITensorInfo *src4, ITensorInfo *dst); - /** Static function to check if given info will lead to a valid configuration of @ref ClWidthConcatenate4TensorsKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src1 First tensor info. Data types supported: All. - * @param[in] src2 Second tensor info. Data types supported: same as @p src1 - * @param[in] src3 Third tensor info. Data types supported: same as @p src1 - * @param[in] src4 Fourth tensor info. Data types supported: same as @p src1 - * @param[in] dst Destination tensor info. Data types supported: same as @p src1. + * Similar to @ref ClWidthConcatenate4TensorsKernel::configure() * * @return a status */ diff --git a/src/core/gpu/cl/kernels/ClWidthConcatenateKernel.h b/src/core/gpu/cl/kernels/ClWidthConcatenateKernel.h index 6bc8e57a08..300c4beb30 100644 --- a/src/core/gpu/cl/kernels/ClWidthConcatenateKernel.h +++ b/src/core/gpu/cl/kernels/ClWidthConcatenateKernel.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_CL_WIDTH_CONCATENATE_LAYER_KERNEL_H -#define ARM_COMPUTE_CL_WIDTH_CONCATENATE_LAYER_KERNEL_H +#ifndef ARM_COMPUTE_CL_WIDTH_CONCATENATE_KERNEL_H +#define ARM_COMPUTE_CL_WIDTH_CONCATENATE_KERNEL_H #include "src/core/common/Macros.h" #include "src/core/gpu/cl/ClCompileContext.h" @@ -40,7 +40,6 @@ namespace kernels class ClWidthConcatenateKernel : public IClKernel { public: - /** Default constructor */ ClWidthConcatenateKernel(); ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClWidthConcatenateKernel); /** Initialise the kernel's source and destination @@ -52,11 +51,9 @@ public: * */ void configure(const CLCompileContext &compile_context, ITensorInfo *src, unsigned int width_offset, ITensorInfo *dst); - /** Static function to check if given info will lead to a valid configuration of @ref ClWidthConcatenateKernel + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src Source tensor info. Data types supported: All. - * @param[in] width_offset The offset on the X axis. - * @param[in] dst Destination tensor info. Data types supported: same as @p src. + * Similar to @ref ClWidthConcatenateKernel::configure() * * @return a status */ @@ -68,4 +65,4 @@ public: } // namespace kernels } // namespace opencl } // namespace arm_compute -#endif /* ARM_COMPUTE_CL_WIDTH_CONCATENATE_LAYER_KERNEL_H */ +#endif /* ARM_COMPUTE_CL_WIDTH_CONCATENATE_KERNEL_H */ diff --git a/src/core/gpu/cl/kernels/ClWinogradFilterTransformKernel.h b/src/core/gpu/cl/kernels/ClWinogradFilterTransformKernel.h index 13200dc419..145954fbb1 100644 --- a/src/core/gpu/cl/kernels/ClWinogradFilterTransformKernel.h +++ b/src/core/gpu/cl/kernels/ClWinogradFilterTransformKernel.h @@ -39,7 +39,6 @@ namespace kernels class ClWinogradFilterTransformKernel : public IClKernel { public: - /** Default constructor */ ClWinogradFilterTransformKernel(); ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClWinogradFilterTransformKernel); /** Set the input and output tensor. @@ -75,4 +74,4 @@ public: } // namespace kernels } // namespace opencl } // namespace arm_compute -#endif /*ARM_COMPUTE_CL_WINOGRAD_FILTER_TRANSFORM_KERNEL_H */ +#endif /* ARM_COMPUTE_CL_WINOGRAD_FILTER_TRANSFORM_KERNEL_H */ diff --git a/src/core/gpu/cl/kernels/ClWinogradInputTransformKernel.cpp b/src/core/gpu/cl/kernels/ClWinogradInputTransformKernel.cpp index 62db2282e0..538d8ae602 100644 --- a/src/core/gpu/cl/kernels/ClWinogradInputTransformKernel.cpp +++ b/src/core/gpu/cl/kernels/ClWinogradInputTransformKernel.cpp @@ -101,7 +101,6 @@ std::pair<Status, Window> validate_and_configure_window(ITensorInfo *input, ITen } // namespace ClWinogradInputTransformKernel::ClWinogradInputTransformKernel() - : _border_size(0), _data_layout(DataLayout::UNKNOWN), _num_tiles_x(0), _num_tiles_y(0), _step_z(1) { _type = CLKernelType::WINOGRAD; } diff --git a/src/core/gpu/cl/kernels/ClWinogradInputTransformKernel.h b/src/core/gpu/cl/kernels/ClWinogradInputTransformKernel.h index 76b45279a4..40fc2f387a 100644 --- a/src/core/gpu/cl/kernels/ClWinogradInputTransformKernel.h +++ b/src/core/gpu/cl/kernels/ClWinogradInputTransformKernel.h @@ -39,7 +39,6 @@ namespace kernels class ClWinogradInputTransformKernel : public IClKernel { public: - /** Default constructor */ ClWinogradInputTransformKernel(); ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClWinogradInputTransformKernel); /** Set the input and output of the kernel. @@ -76,13 +75,13 @@ public: private: using WinogradKey = std::pair<std::pair<int, int>, std::pair<int, int>>; - BorderSize _border_size; - DataLayout _data_layout; - int _num_tiles_x; - int _num_tiles_y; - unsigned int _step_z; + BorderSize _border_size{ 0 }; + DataLayout _data_layout{ DataLayout::UNKNOWN }; + int _num_tiles_x{ 0 }; + int _num_tiles_y{ 0 }; + unsigned int _step_z{ 1 }; }; } // namespace kernels } // namespace opencl } // namespace arm_compute -#endif /*ARM_COMPUTE_CL_WINOGRAD_INPUT_TRANSFORM_KERNEL_H */ +#endif /* ARM_COMPUTE_CL_WINOGRAD_INPUT_TRANSFORM_KERNEL_H */ diff --git a/src/core/gpu/cl/kernels/ClWinogradOutputTransformKernel.h b/src/core/gpu/cl/kernels/ClWinogradOutputTransformKernel.h index 2948d3f181..22b7f079c1 100644 --- a/src/core/gpu/cl/kernels/ClWinogradOutputTransformKernel.h +++ b/src/core/gpu/cl/kernels/ClWinogradOutputTransformKernel.h @@ -39,7 +39,6 @@ namespace kernels class ClWinogradOutputTransformKernel : public IClKernel { public: - /** Default constructor */ ClWinogradOutputTransformKernel(); ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(ClWinogradOutputTransformKernel); /** Set the input and output tensor. @@ -64,7 +63,6 @@ public: */ void configure(const ClCompileContext &compile_context, ITensorInfo *src, ITensorInfo *bias, ITensorInfo *dst, const WinogradInfo &winograd_info, const ActivationLayerInfo &act_info = ActivationLayerInfo()); - /** Static function to check if given info will lead to a valid configuration * * Similar to ClWinogradOutputTransformKernel::configure() @@ -84,4 +82,4 @@ private: } // namespace kernels } // namespace opencl } // namespace arm_compute -#endif /*ARM_COMPUTE_CL_WINOGRAD_OUTPUT_TRANSFORM_KERNEL_H */ +#endif /* ARM_COMPUTE_CL_WINOGRAD_OUTPUT_TRANSFORM_KERNEL_H */ |