aboutsummaryrefslogtreecommitdiff
path: root/src/runtime/cpu/operators/CpuDepthwiseConv2d.h
diff options
context:
space:
mode:
authorGeorgios Pinitas <georgios.pinitas@arm.com>2021-07-02 09:01:49 +0100
committerGeorgios Pinitas <georgios.pinitas@arm.com>2021-07-02 15:47:11 +0000
commit2eb5d16b839cbc28c6cb7f0de7a0bf15290b425a (patch)
tree523d495c3a4c07d87b337c45a81afa06c9b1f495 /src/runtime/cpu/operators/CpuDepthwiseConv2d.h
parent4dfc5538948c196def6d2e3305fe8051a5df3f15 (diff)
downloadComputeLibrary-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/runtime/cpu/operators/CpuDepthwiseConv2d.h')
-rw-r--r--src/runtime/cpu/operators/CpuDepthwiseConv2d.h21
1 files changed, 9 insertions, 12 deletions
diff --git a/src/runtime/cpu/operators/CpuDepthwiseConv2d.h b/src/runtime/cpu/operators/CpuDepthwiseConv2d.h
index ae9f894aab..dd4839b28a 100644
--- a/src/runtime/cpu/operators/CpuDepthwiseConv2d.h
+++ b/src/runtime/cpu/operators/CpuDepthwiseConv2d.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_DEPTHWISECONV2D_H
-#define ARM_COMPUTE_CPU_DEPTHWISECONV2D_H
+#ifndef ARM_COMPUTE_CPU_DEPTHWISE_CONV2D_H
+#define ARM_COMPUTE_CPU_DEPTHWISE_CONV2D_H
#include "arm_compute/core/ITensorInfo.h"
#include "arm_compute/core/experimental/Types.h"
@@ -45,7 +45,7 @@ class CpuDepthwiseConv2d : public ICpuOperator
{
public:
/** Default constructor */
- CpuDepthwiseConv2d();
+ CpuDepthwiseConv2d() = default;
/** Initialize the function's source, destination, weights and convolution information.
*
* @param[in, out] src Source tensor info. Data type supported: QASYMM8/QASYMM8_SIGNED/F16/F32
@@ -57,7 +57,6 @@ public:
* @param[in] info Depthwise convolution meta-data.
*/
void configure(ITensorInfo *src, const ITensorInfo *weights, const ITensorInfo *biases, ITensorInfo *dst, const ConvolutionInfo &info);
-
/** Static function to check if given info will lead to a valid configuration
*
* Similar to CpuDepthwiseConv2d::configure()
@@ -65,7 +64,6 @@ public:
* @return a status
*/
static Status validate(const ITensorInfo *src, const ITensorInfo *weights, const ITensorInfo *biases, const ITensorInfo *dst, const ConvolutionInfo &info);
-
/** Static function to choose the best depthwise convolution function for @ref CpuDepthwiseConv2d
*
* @param[in] src Source tensor info. Data type supported: QASYMM8/QASYMM8_SIGNED/F16/F32
@@ -100,7 +98,7 @@ private:
{
public:
/** Default constructor */
- CpuDepthwiseConv2dOptimizedInternal();
+ CpuDepthwiseConv2dOptimizedInternal() = default;
/** Prevent instances of this class from being copied (As this class contains pointers) */
CpuDepthwiseConv2dOptimizedInternal(const CpuDepthwiseConv2dOptimizedInternal &) = delete;
/** Default move constructor */
@@ -121,7 +119,6 @@ private:
* @param[in] info Depthwise convolution meta-data.
*/
void configure(ITensorInfo *src, const ITensorInfo *weights, const ITensorInfo *biases, ITensorInfo *dst, const ConvolutionInfo &info);
-
/** Static function to check if given info will lead to a valid configuration
*
* Similar to CpuDepthwiseConv2dOptimizedInternal::configure()
@@ -157,7 +154,7 @@ private:
{
public:
/** Default constructor */
- CpuDepthwiseConv2dGeneric();
+ CpuDepthwiseConv2dGeneric() = default;
/** Prevent instances of this class from being copied (As this class contains pointers) */
CpuDepthwiseConv2dGeneric(const CpuDepthwiseConv2dGeneric &) = delete;
/** Default move constructor */
@@ -203,10 +200,10 @@ private:
bool _is_activationlayer_enabled{ false };
};
- DepthwiseConvolutionFunction _depth_conv_func;
- CpuDepthwiseConv2dOptimizedInternal _func_optimized;
- CpuDepthwiseConv2dGeneric _func_generic;
+ DepthwiseConvolutionFunction _depth_conv_func{ DepthwiseConvolutionFunction::GENERIC };
+ CpuDepthwiseConv2dOptimizedInternal _func_optimized{};
+ CpuDepthwiseConv2dGeneric _func_generic{};
};
} // namespace cpu
} // namespace arm_compute
-#endif /* ARM_COMPUTE_CPU_DEPTHWISECONV2D_H */
+#endif /* ARM_COMPUTE_CPU_DEPTHWISE_CONV2D_H */