Rename pooling implementation folder to pool2d

Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: I82a298e059a92d82095186d120e4934a8eeb4e3e
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5854
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

10 files changed, 17 insertions, 17 deletions

diff --git a/Android.bp b/Android.bp
index ec57abd92b..a4e3d94b1b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -319,11 +319,11 @@ cc_library_static {
         "src/core/cpu/kernels/floor/neon/fp32.cpp",
         "src/core/cpu/kernels/internal/CpuDepthwiseConv2dAssemblyWrapperKernel.cpp",
         "src/core/cpu/kernels/internal/CpuPool2dAssemblyWrapperKernel.cpp",
-        "src/core/cpu/kernels/pooling/neon/fp16.cpp",
-        "src/core/cpu/kernels/pooling/neon/fp32.cpp",
-        "src/core/cpu/kernels/pooling/neon/nchw/all.cpp",
-        "src/core/cpu/kernels/pooling/neon/qasymm8.cpp",
-        "src/core/cpu/kernels/pooling/neon/qasymm8_signed.cpp",
+        "src/core/cpu/kernels/pool2d/neon/fp16.cpp",
+        "src/core/cpu/kernels/pool2d/neon/fp32.cpp",
+        "src/core/cpu/kernels/pool2d/neon/nchw/all.cpp",
+        "src/core/cpu/kernels/pool2d/neon/qasymm8.cpp",
+        "src/core/cpu/kernels/pool2d/neon/qasymm8_signed.cpp",
         "src/core/cpu/kernels/scale/neon/fp16.cpp",
         "src/core/cpu/kernels/scale/neon/integer.cpp",
         "src/core/cpu/kernels/scale/neon/qasymm8.cpp",
diff --git a/filelist.json b/filelist.json
index 454d0fdca7..13c6ecb927 100644
--- a/filelist.json
+++ b/filelist.json
@@ -1468,19 +1468,19 @@
           ],
           "neon": {
             "nchw": [
-              "src/core/cpu/kernels/pooling/neon/nchw/all.cpp"
+              "src/core/cpu/kernels/pool2d/neon/nchw/all.cpp"
             ],
             "fp32": [
-              "src/core/cpu/kernels/pooling/neon/fp32.cpp"
+              "src/core/cpu/kernels/pool2d/neon/fp32.cpp"
             ],
             "fp16": [
-              "src/core/cpu/kernels/pooling/neon/fp16.cpp"
+              "src/core/cpu/kernels/pool2d/neon/fp16.cpp"
             ],
             "qasymm8": [
-              "src/core/cpu/kernels/pooling/neon/qasymm8.cpp"
+              "src/core/cpu/kernels/pool2d/neon/qasymm8.cpp"
             ],
             "qasymm8_signed": [
-              "src/core/cpu/kernels/pooling/neon/qasymm8_signed.cpp"
+              "src/core/cpu/kernels/pool2d/neon/qasymm8_signed.cpp"
             ],
             "estate64": [
               "src/core/NEON/kernels/arm_conv/pooling/kernels/a64_fp16_nhwc_avg_3x3_s1_output2x2_depthfirst/generic.cpp",
diff --git a/src/core/cpu/kernels/CpuPool2dKernel.cpp b/src/core/cpu/kernels/CpuPool2dKernel.cpp
index e6f5890685..bfde2dfa80 100644
--- a/src/core/cpu/kernels/CpuPool2dKernel.cpp
+++ b/src/core/cpu/kernels/CpuPool2dKernel.cpp
@@ -34,7 +34,7 @@
 #include "src/core/NEON/NEFixedPoint.h"
 #include "src/core/NEON/NEMath.h"
 #include "src/core/common/Registrars.h"
-#include "src/core/cpu/kernels/pooling/neon/list.h"
+#include "src/core/cpu/kernels/pool2d/neon/list.h"
 #include "src/core/helpers/AutoConfiguration.h"
 #include "src/core/helpers/WindowHelpers.h"
 #include "support/ToolchainSupport.h"
diff --git a/src/core/cpu/kernels/pooling/neon/fp16.cpp b/src/core/cpu/kernels/pool2d/neon/fp16.cpp
index 0aae7b8a57..d21e153f25 100644
--- a/src/core/cpu/kernels/pooling/neon/fp16.cpp
+++ b/src/core/cpu/kernels/pool2d/neon/fp16.cpp
@@ -26,7 +26,7 @@
 #include "arm_compute/core/Types.h"
 #include "arm_compute/core/utils/misc/Traits.h"
 #include "src/core/NEON/wrapper/intrinsics/intrinsics.h"
-#include "src/core/cpu/kernels/pooling/neon/list.h"
+#include "src/core/cpu/kernels/pool2d/neon/list.h"
 #include "src/core/helpers/WindowHelpers.h"
 
 #if defined(__ARM_FEATURE_FP16_VECTOR_ARITHMETIC) && defined(ENABLE_FP16_KERNELS)
diff --git a/src/core/cpu/kernels/pooling/neon/fp32.cpp b/src/core/cpu/kernels/pool2d/neon/fp32.cpp
index 4e41fdec7f..c82cad0ffd 100644
--- a/src/core/cpu/kernels/pooling/neon/fp32.cpp
+++ b/src/core/cpu/kernels/pool2d/neon/fp32.cpp
@@ -26,7 +26,7 @@
 #include "arm_compute/core/Types.h"
 #include "arm_compute/core/utils/misc/Traits.h"
 #include "src/core/NEON/wrapper/intrinsics/intrinsics.h"
-#include "src/core/cpu/kernels/pooling/neon/list.h"
+#include "src/core/cpu/kernels/pool2d/neon/list.h"
 #include "src/core/helpers/WindowHelpers.h"
 
 namespace arm_compute
diff --git a/src/core/cpu/kernels/pooling/neon/list.h b/src/core/cpu/kernels/pool2d/neon/list.h
index bec1536f61..f1e23d43cf 100644
--- a/src/core/cpu/kernels/pooling/neon/list.h
+++ b/src/core/cpu/kernels/pool2d/neon/list.h
@@ -27,7 +27,7 @@
 #include "arm_compute/core/Types.h"
 #include "arm_compute/core/utils/misc/Traits.h"
 #include "src/core/NEON/wrapper/wrapper.h"
-#include "src/core/cpu/kernels/pooling/neon/quantized.h"
+#include "src/core/cpu/kernels/pool2d/neon/quantized.h"
 #include <arm_neon.h>
 
 namespace arm_compute
diff --git a/src/core/cpu/kernels/pooling/neon/nchw/all.cpp b/src/core/cpu/kernels/pool2d/neon/nchw/all.cpp
index 80eac684aa..bece438989 100644
--- a/src/core/cpu/kernels/pooling/neon/nchw/all.cpp
+++ b/src/core/cpu/kernels/pool2d/neon/nchw/all.cpp
@@ -26,7 +26,7 @@
 #include "arm_compute/core/Types.h"
 #include "arm_compute/core/utils/misc/Traits.h"
 #include "src/core/NEON/wrapper/intrinsics/intrinsics.h"
-#include "src/core/cpu/kernels/pooling/neon/list.h"
+#include "src/core/cpu/kernels/pool2d/neon/list.h"
 #include "src/core/helpers/WindowHelpers.h"
 
 #ifdef ENABLE_NCHW_KERNELS
diff --git a/src/core/cpu/kernels/pooling/neon/qasymm8.cpp b/src/core/cpu/kernels/pool2d/neon/qasymm8.cpp
index af62ede13f..4020e9e3fc 100644
--- a/src/core/cpu/kernels/pooling/neon/qasymm8.cpp
+++ b/src/core/cpu/kernels/pool2d/neon/qasymm8.cpp
@@ -26,7 +26,7 @@
 #include "arm_compute/core/Types.h"
 #include "arm_compute/core/utils/misc/Traits.h"
 #include "src/core/NEON/wrapper/intrinsics/intrinsics.h"
-#include "src/core/cpu/kernels/pooling/neon/list.h"
+#include "src/core/cpu/kernels/pool2d/neon/list.h"
 #include "src/core/helpers/WindowHelpers.h"
 
 namespace arm_compute
diff --git a/src/core/cpu/kernels/pooling/neon/qasymm8_signed.cpp b/src/core/cpu/kernels/pool2d/neon/qasymm8_signed.cpp
index 2c4b095225..a899427484 100644
--- a/src/core/cpu/kernels/pooling/neon/qasymm8_signed.cpp
+++ b/src/core/cpu/kernels/pool2d/neon/qasymm8_signed.cpp
@@ -26,7 +26,7 @@
 #include "arm_compute/core/Types.h"
 #include "arm_compute/core/utils/misc/Traits.h"
 #include "src/core/NEON/wrapper/intrinsics/intrinsics.h"
-#include "src/core/cpu/kernels/pooling/neon/list.h"
+#include "src/core/cpu/kernels/pool2d/neon/list.h"
 #include "src/core/helpers/WindowHelpers.h"
 
 namespace arm_compute
diff --git a/src/core/cpu/kernels/pooling/neon/quantized.h b/src/core/cpu/kernels/pool2d/neon/quantized.h
index a16960a205..a16960a205 100644
--- a/src/core/cpu/kernels/pooling/neon/quantized.h
+++ b/src/core/cpu/kernels/pool2d/neon/quantized.h