COMPMID-692 Consistent names for the interfaces
Change-Id: I4b1f3f0da9ff5342c7de7083736fe91871d14e5b
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/110351
Tested-by: BSG Visual Compute Jenkins server to access repositories on http://mpd-gerrit.cambridge.arm.com <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
diff --git a/arm_compute/core/CL/CLKernels.h b/arm_compute/core/CL/CLKernels.h
index 1ffbad9..9da0e5a 100644
--- a/arm_compute/core/CL/CLKernels.h
+++ b/arm_compute/core/CL/CLKernels.h
@@ -42,9 +42,9 @@
#include "arm_compute/core/CL/kernels/CLCol2ImKernel.h"
#include "arm_compute/core/CL/kernels/CLColorConvertKernel.h"
#include "arm_compute/core/CL/kernels/CLConvolutionKernel.h"
-#include "arm_compute/core/CL/kernels/CLDepthConcatenateKernel.h"
-#include "arm_compute/core/CL/kernels/CLDepthConvertKernel.h"
-#include "arm_compute/core/CL/kernels/CLDepthwiseConvolution3x3Kernel.h"
+#include "arm_compute/core/CL/kernels/CLDepthConcatenateLayerKernel.h"
+#include "arm_compute/core/CL/kernels/CLDepthConvertLayerKernel.h"
+#include "arm_compute/core/CL/kernels/CLDepthwiseConvolutionLayer3x3Kernel.h"
#include "arm_compute/core/CL/kernels/CLDepthwiseIm2ColKernel.h"
#include "arm_compute/core/CL/kernels/CLDepthwiseVectorToTensorKernel.h"
#include "arm_compute/core/CL/kernels/CLDepthwiseWeightsReshapeKernel.h"
@@ -76,7 +76,7 @@
#include "arm_compute/core/CL/kernels/CLHistogramKernel.h"
#include "arm_compute/core/CL/kernels/CLIm2ColKernel.h"
#include "arm_compute/core/CL/kernels/CLIntegralImageKernel.h"
-#include "arm_compute/core/CL/kernels/CLL2NormalizeKernel.h"
+#include "arm_compute/core/CL/kernels/CLL2NormalizeLayerKernel.h"
#include "arm_compute/core/CL/kernels/CLLKTrackerKernel.h"
#include "arm_compute/core/CL/kernels/CLLocallyConnectedMatrixMultiplyKernel.h"
#include "arm_compute/core/CL/kernels/CLMagnitudePhaseKernel.h"
diff --git a/arm_compute/core/CL/kernels/CLDepthConcatenateKernel.h b/arm_compute/core/CL/kernels/CLDepthConcatenateLayerKernel.h
similarity index 85%
rename from arm_compute/core/CL/kernels/CLDepthConcatenateKernel.h
rename to arm_compute/core/CL/kernels/CLDepthConcatenateLayerKernel.h
index 2833d8e..467bdfa 100644
--- a/arm_compute/core/CL/kernels/CLDepthConcatenateKernel.h
+++ b/arm_compute/core/CL/kernels/CLDepthConcatenateLayerKernel.h
@@ -35,21 +35,21 @@
/** Interface for the depth concatenate kernel.
* The input tensor will be concatenated into the output tensor.
*/
-class CLDepthConcatenateKernel : public ICLKernel
+class CLDepthConcatenateLayerKernel : public ICLKernel
{
public:
/** Default constructor */
- CLDepthConcatenateKernel();
+ CLDepthConcatenateLayerKernel();
/** Prevent instances of this class from being copied (As this class contains pointers) */
- CLDepthConcatenateKernel(const CLDepthConcatenateKernel &) = delete;
+ CLDepthConcatenateLayerKernel(const CLDepthConcatenateLayerKernel &) = delete;
/** Prevent instances of this class from being copied (As this class contains pointers) */
- CLDepthConcatenateKernel &operator=(const CLDepthConcatenateKernel &) = delete;
+ CLDepthConcatenateLayerKernel &operator=(const CLDepthConcatenateLayerKernel &) = delete;
/** Allow instances of this class to be moved */
- CLDepthConcatenateKernel(CLDepthConcatenateKernel &&) = default;
+ CLDepthConcatenateLayerKernel(CLDepthConcatenateLayerKernel &&) = default;
/** Allow instances of this class to be moved */
- CLDepthConcatenateKernel &operator=(CLDepthConcatenateKernel &&) = default;
+ CLDepthConcatenateLayerKernel &operator=(CLDepthConcatenateLayerKernel &&) = default;
/** Default destructor */
- ~CLDepthConcatenateKernel() = default;
+ ~CLDepthConcatenateLayerKernel() = default;
/** Initialise the kernel's inputs and output
*
* @param[in] input Input tensor. Data types supported: QS8/QS16/F16/F32.
diff --git a/arm_compute/core/CL/kernels/CLDepthConvertKernel.h b/arm_compute/core/CL/kernels/CLDepthConvertLayerKernel.h
similarity index 97%
rename from arm_compute/core/CL/kernels/CLDepthConvertKernel.h
rename to arm_compute/core/CL/kernels/CLDepthConvertLayerKernel.h
index da70bff..3a6310d 100644
--- a/arm_compute/core/CL/kernels/CLDepthConvertKernel.h
+++ b/arm_compute/core/CL/kernels/CLDepthConvertLayerKernel.h
@@ -36,7 +36,7 @@
/** Interface for the depth conversion kernel.
*
*/
-class CLDepthConvertKernel : public ICLSimple2DKernel
+class CLDepthConvertLayerKernel : public ICLSimple2DKernel
{
public:
/** Set the input and output of the kernel.
diff --git a/arm_compute/core/CL/kernels/CLDepthwiseConvolution3x3Kernel.h b/arm_compute/core/CL/kernels/CLDepthwiseConvolutionLayer3x3Kernel.h
similarity index 85%
rename from arm_compute/core/CL/kernels/CLDepthwiseConvolution3x3Kernel.h
rename to arm_compute/core/CL/kernels/CLDepthwiseConvolutionLayer3x3Kernel.h
index f9689a4..eb62465 100644
--- a/arm_compute/core/CL/kernels/CLDepthwiseConvolution3x3Kernel.h
+++ b/arm_compute/core/CL/kernels/CLDepthwiseConvolutionLayer3x3Kernel.h
@@ -32,19 +32,19 @@
/** Interface for the kernel to run a 3x3 depthwise convolution on a tensor.
*/
-class CLDepthwiseConvolution3x3Kernel : public ICLKernel
+class CLDepthwiseConvolutionLayer3x3Kernel : public ICLKernel
{
public:
/** Default constructor */
- CLDepthwiseConvolution3x3Kernel();
+ CLDepthwiseConvolutionLayer3x3Kernel();
/** Prevent instances of this class from being copied (As this class contains pointers) */
- CLDepthwiseConvolution3x3Kernel(const CLDepthwiseConvolution3x3Kernel &) = delete;
+ CLDepthwiseConvolutionLayer3x3Kernel(const CLDepthwiseConvolutionLayer3x3Kernel &) = delete;
/** Prevent instances of this class from being copied (As this class contains pointers) */
- CLDepthwiseConvolution3x3Kernel &operator=(const CLDepthwiseConvolution3x3Kernel &) = delete;
+ CLDepthwiseConvolutionLayer3x3Kernel &operator=(const CLDepthwiseConvolutionLayer3x3Kernel &) = delete;
/** Default Move Constructor. */
- CLDepthwiseConvolution3x3Kernel(CLDepthwiseConvolution3x3Kernel &&) = default;
+ CLDepthwiseConvolutionLayer3x3Kernel(CLDepthwiseConvolutionLayer3x3Kernel &&) = default;
/** Default move assignment operator. */
- CLDepthwiseConvolution3x3Kernel &operator=(CLDepthwiseConvolution3x3Kernel &&) = default;
+ CLDepthwiseConvolutionLayer3x3Kernel &operator=(CLDepthwiseConvolutionLayer3x3Kernel &&) = default;
/** Initialize the function's source, destination, conv and border_size.
*
* @param[in] input Source tensor. DataType supported: QASYMM8/F32.
diff --git a/arm_compute/core/CL/kernels/CLL2NormalizeKernel.h b/arm_compute/core/CL/kernels/CLL2NormalizeLayerKernel.h
similarity index 86%
rename from arm_compute/core/CL/kernels/CLL2NormalizeKernel.h
rename to arm_compute/core/CL/kernels/CLL2NormalizeLayerKernel.h
index 2056b4e..f7d7171 100644
--- a/arm_compute/core/CL/kernels/CLL2NormalizeKernel.h
+++ b/arm_compute/core/CL/kernels/CLL2NormalizeLayerKernel.h
@@ -32,21 +32,21 @@
class ICLTensor;
/** Interface for the reduction operation kernel */
-class CLL2NormalizeKernel : public ICLKernel
+class CLL2NormalizeLayerKernel : public ICLKernel
{
public:
/** Default constructor */
- CLL2NormalizeKernel();
+ CLL2NormalizeLayerKernel();
/** Prevent instances of this class from being copied (As this class contains pointers) */
- CLL2NormalizeKernel(const CLL2NormalizeKernel &) = delete;
+ CLL2NormalizeLayerKernel(const CLL2NormalizeLayerKernel &) = delete;
/** Prevent instances of this class from being copied (As this class contains pointers) */
- CLL2NormalizeKernel &operator=(const CLL2NormalizeKernel &) = delete;
+ CLL2NormalizeLayerKernel &operator=(const CLL2NormalizeLayerKernel &) = delete;
/** Allow instances of this class to be moved */
- CLL2NormalizeKernel(CLL2NormalizeKernel &&) = default;
+ CLL2NormalizeLayerKernel(CLL2NormalizeLayerKernel &&) = default;
/** Allow instances of this class to be moved */
- CLL2NormalizeKernel &operator=(CLL2NormalizeKernel &&) = default;
+ CLL2NormalizeLayerKernel &operator=(CLL2NormalizeLayerKernel &&) = default;
/** Default destructor */
- ~CLL2NormalizeKernel() = default;
+ ~CLL2NormalizeLayerKernel() = default;
/** Set the input and output tensors.
*