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/NEON/kernels/NEDepthConcatenateKernel.h b/arm_compute/core/NEON/kernels/NEDepthConcatenateLayerKernel.h
similarity index 85%
rename from arm_compute/core/NEON/kernels/NEDepthConcatenateKernel.h
rename to arm_compute/core/NEON/kernels/NEDepthConcatenateLayerKernel.h
index 784dfc3..6029873 100644
--- a/arm_compute/core/NEON/kernels/NEDepthConcatenateKernel.h
+++ b/arm_compute/core/NEON/kernels/NEDepthConcatenateLayerKernel.h
@@ -34,21 +34,21 @@
/** Interface for the depth concatenate kernel.
* The input tensor will be concatenated into the output tensor.
*/
-class NEDepthConcatenateKernel : public INEKernel
+class NEDepthConcatenateLayerKernel : public INEKernel
{
public:
/** Default constructor */
- NEDepthConcatenateKernel();
+ NEDepthConcatenateLayerKernel();
/** Prevent instances of this class from being copied (As this class contains pointers) */
- NEDepthConcatenateKernel(const NEDepthConcatenateKernel &) = delete;
+ NEDepthConcatenateLayerKernel(const NEDepthConcatenateLayerKernel &) = delete;
/** Prevent instances of this class from being copied (As this class contains pointers) */
- NEDepthConcatenateKernel &operator=(const NEDepthConcatenateKernel &) = delete;
+ NEDepthConcatenateLayerKernel &operator=(const NEDepthConcatenateLayerKernel &) = delete;
/** Allow instances of this class to be moved */
- NEDepthConcatenateKernel(NEDepthConcatenateKernel &&) = default;
+ NEDepthConcatenateLayerKernel(NEDepthConcatenateLayerKernel &&) = default;
/** Allow instances of this class to be moved */
- NEDepthConcatenateKernel &operator=(NEDepthConcatenateKernel &&) = default;
+ NEDepthConcatenateLayerKernel &operator=(NEDepthConcatenateLayerKernel &&) = default;
/** Default destructor */
- ~NEDepthConcatenateKernel() = default;
+ ~NEDepthConcatenateLayerKernel() = 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/NEON/kernels/NEDepthConvertKernel.h b/arm_compute/core/NEON/kernels/NEDepthConvertLayerKernel.h
similarity index 89%
rename from arm_compute/core/NEON/kernels/NEDepthConvertKernel.h
rename to arm_compute/core/NEON/kernels/NEDepthConvertLayerKernel.h
index 332406f..af51ded 100644
--- a/arm_compute/core/NEON/kernels/NEDepthConvertKernel.h
+++ b/arm_compute/core/NEON/kernels/NEDepthConvertLayerKernel.h
@@ -34,19 +34,19 @@
class ITensor;
/** Depth conversion kernel */
-class NEDepthConvertKernel : public INEKernel
+class NEDepthConvertLayerKernel : public INEKernel
{
public:
/** Default constructor*/
- NEDepthConvertKernel();
+ NEDepthConvertLayerKernel();
/** Prevent instances of this class from being copied (As this class contains pointers) */
- NEDepthConvertKernel(const NEDepthConvertKernel &) = delete;
+ NEDepthConvertLayerKernel(const NEDepthConvertLayerKernel &) = delete;
/** Default move constructor */
- NEDepthConvertKernel(NEDepthConvertKernel &&) = default;
+ NEDepthConvertLayerKernel(NEDepthConvertLayerKernel &&) = default;
/** Prevent instances of this class from being copied (As this class contains pointers) */
- NEDepthConvertKernel &operator=(const NEDepthConvertKernel &) = delete;
+ NEDepthConvertLayerKernel &operator=(const NEDepthConvertLayerKernel &) = delete;
/** Default move assignment operator */
- NEDepthConvertKernel &operator=(NEDepthConvertKernel &&) = default;
+ NEDepthConvertLayerKernel &operator=(NEDepthConvertLayerKernel &&) = default;
/** Set the input and output of the kernel
*
* Valid conversions Input -> Output :
diff --git a/arm_compute/core/NEON/kernels/NEDepthwiseConvolution3x3Kernel.h b/arm_compute/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.h
similarity index 84%
rename from arm_compute/core/NEON/kernels/NEDepthwiseConvolution3x3Kernel.h
rename to arm_compute/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.h
index a32a06b..b8f01cb 100644
--- a/arm_compute/core/NEON/kernels/NEDepthwiseConvolution3x3Kernel.h
+++ b/arm_compute/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.h
@@ -32,19 +32,19 @@
/** Interface for the kernel to run a 3x3 depthwise convolution on a tensor.
*/
-class NEDepthwiseConvolution3x3Kernel : public INEKernel
+class NEDepthwiseConvolutionLayer3x3Kernel : public INEKernel
{
public:
/** Default constructor */
- NEDepthwiseConvolution3x3Kernel();
+ NEDepthwiseConvolutionLayer3x3Kernel();
/** Prevent instances of this class from being copied (As this class contains pointers) */
- NEDepthwiseConvolution3x3Kernel(const NEDepthwiseConvolution3x3Kernel &) = delete;
+ NEDepthwiseConvolutionLayer3x3Kernel(const NEDepthwiseConvolutionLayer3x3Kernel &) = delete;
/** Prevent instances of this class from being copied (As this class contains pointers) */
- NEDepthwiseConvolution3x3Kernel &operator=(const NEDepthwiseConvolution3x3Kernel &) = delete;
+ NEDepthwiseConvolutionLayer3x3Kernel &operator=(const NEDepthwiseConvolutionLayer3x3Kernel &) = delete;
/** Default Move Constructor. */
- NEDepthwiseConvolution3x3Kernel(NEDepthwiseConvolution3x3Kernel &&) = default;
+ NEDepthwiseConvolutionLayer3x3Kernel(NEDepthwiseConvolutionLayer3x3Kernel &&) = default;
/** Default move assignment operator. */
- NEDepthwiseConvolution3x3Kernel &operator=(NEDepthwiseConvolution3x3Kernel &&) = default;
+ NEDepthwiseConvolutionLayer3x3Kernel &operator=(NEDepthwiseConvolutionLayer3x3Kernel &&) = default;
/** Initialize the function's source, destination, conv and border_size.
*
* @param[in] input Source tensor. DataType supported: F32.
diff --git a/arm_compute/core/NEON/kernels/NEL2NormalizeKernel.h b/arm_compute/core/NEON/kernels/NEL2NormalizeLayerKernel.h
similarity index 86%
rename from arm_compute/core/NEON/kernels/NEL2NormalizeKernel.h
rename to arm_compute/core/NEON/kernels/NEL2NormalizeLayerKernel.h
index fbbe4be..7aa5116 100644
--- a/arm_compute/core/NEON/kernels/NEL2NormalizeKernel.h
+++ b/arm_compute/core/NEON/kernels/NEL2NormalizeLayerKernel.h
@@ -31,21 +31,21 @@
class ITensor;
/** Interface for performing a L2 normalize on a given axis given the square sum of it in this axis */
-class NEL2NormalizeKernel : public INEKernel
+class NEL2NormalizeLayerKernel : public INEKernel
{
public:
/** Default constructor */
- NEL2NormalizeKernel();
+ NEL2NormalizeLayerKernel();
/** Prevent instances of this class from being copied (As this class contains pointers) */
- NEL2NormalizeKernel(const NEL2NormalizeKernel &) = delete;
+ NEL2NormalizeLayerKernel(const NEL2NormalizeLayerKernel &) = delete;
/** Prevent instances of this class from being copied (As this class contains pointers) */
- NEL2NormalizeKernel &operator=(const NEL2NormalizeKernel &) = delete;
+ NEL2NormalizeLayerKernel &operator=(const NEL2NormalizeLayerKernel &) = delete;
/** Allow instances of this class to be moved */
- NEL2NormalizeKernel(NEL2NormalizeKernel &&) = default;
+ NEL2NormalizeLayerKernel(NEL2NormalizeLayerKernel &&) = default;
/** Allow instances of this class to be moved */
- NEL2NormalizeKernel &operator=(NEL2NormalizeKernel &&) = default;
+ NEL2NormalizeLayerKernel &operator=(NEL2NormalizeLayerKernel &&) = default;
/** Default destructor */
- ~NEL2NormalizeKernel() = default;
+ ~NEL2NormalizeLayerKernel() = default;
/** Set the input and output tensors.
*
* @param[in] input Source tensor. Data types supported: F32.