Port MaxUnpoolingLayer kernel and add KernelSelect vaidation test

Resolves COMPMID-4958
Change-Id: Ibed5155f2e3ece46635f6ea9617bf11cefc402b1
Signed-off-by: Dana Zlotnik <dana.zlotnik@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7028
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>

7 files changed, 15 insertions, 15 deletions

diff --git a/src/cpu/kernels/maxunpool/generic/neon/fp16.cpp b/src/cpu/kernels/maxunpool/generic/neon/fp16.cpp
index d43503aa2f..e81ff92311 100644
--- a/src/cpu/kernels/maxunpool/generic/neon/fp16.cpp
+++ b/src/cpu/kernels/maxunpool/generic/neon/fp16.cpp
@@ -27,9 +27,9 @@ namespace arm_compute
 {
 namespace cpu
 {
-void neon_fp16_maxunpooling(const ITensor *input, ITensor *output, const ITensor *indices, const Window &window)
+void neon_fp16_maxunpooling(const ITensor *input, const ITensor *indices, ITensor *output, const Window &window)
 {
-    return max_unpooling<float16_t>(input, output, indices, window);
+    return max_unpooling<float16_t>(input, indices, output, window);
 }
 } // namespace cpu
 } // namespace arm_compute
diff --git a/src/cpu/kernels/maxunpool/generic/neon/fp32.cpp b/src/cpu/kernels/maxunpool/generic/neon/fp32.cpp
index 2f96e86695..ba0d7851a9 100644
--- a/src/cpu/kernels/maxunpool/generic/neon/fp32.cpp
+++ b/src/cpu/kernels/maxunpool/generic/neon/fp32.cpp
@@ -26,9 +26,9 @@ namespace arm_compute
 {
 namespace cpu
 {
-void neon_fp32_maxunpooling(const ITensor *input, ITensor *output, const ITensor *indices, const Window &window)
+void neon_fp32_maxunpooling(const ITensor *input, const ITensor *indices, ITensor *output, const Window &window)
 {
-    return max_unpooling<float>(input, output, indices, window);
+    return max_unpooling<float>(input, indices, output, window);
 }
 } // namespace cpu
 } // namespace arm_compute
diff --git a/src/cpu/kernels/maxunpool/generic/neon/impl.cpp b/src/cpu/kernels/maxunpool/generic/neon/impl.cpp
index 8bbc8d128f..77e3b8594a 100644
--- a/src/cpu/kernels/maxunpool/generic/neon/impl.cpp
+++ b/src/cpu/kernels/maxunpool/generic/neon/impl.cpp
@@ -29,7 +29,7 @@ class Window;
 namespace cpu
 {
 template <typename T>
-void max_unpooling(const ITensor *input, ITensor *output, const ITensor *indices, const Window &window)
+void max_unpooling(const ITensor *input, const ITensor *indices, ITensor *output, const Window &window)
 {
     Iterator  input_itr(input, window);
     Iterator  indices_itr(indices, window);
@@ -43,12 +43,12 @@ void max_unpooling(const ITensor *input, ITensor *output, const ITensor *indices
     },
     input_itr, indices_itr);
 }
-template void max_unpooling<float>(const ITensor *input, ITensor *output, const ITensor *indices, const Window &window);
-template void max_unpooling<int8_t>(const ITensor *input, ITensor *output, const ITensor *indices, const Window &window);
-template void max_unpooling<uint8_t>(const ITensor *input, ITensor *output, const ITensor *indices, const Window &window);
+template void max_unpooling<float>(const ITensor *input, const ITensor *indices, ITensor *output, const Window &window);
+template void max_unpooling<int8_t>(const ITensor *input, const ITensor *indices, ITensor *output, const Window &window);
+template void max_unpooling<uint8_t>(const ITensor *input, const ITensor *indices, ITensor *output, const Window &window);
 
 #if defined(__ARM_FEATURE_FP16_VECTOR_ARITHMETIC) && defined(ENABLE_FP16_KERNELS)
-template void max_unpooling<float16_t>(const ITensor *input, ITensor *output, const ITensor *indices, const Window &window);
+template void max_unpooling<float16_t>(const ITensor *input, const ITensor *indices, ITensor *output, const Window &window);
 #endif //defined(__ARM_FEATURE_FP16_VECTOR_ARITHMETIC) && defined(ENABLE_FP16_KERNELS)
 } // namespace cpu
 } // namespace arm_compute
diff --git a/src/cpu/kernels/maxunpool/generic/neon/impl.h b/src/cpu/kernels/maxunpool/generic/neon/impl.h
index 6a14c66b33..3fea9cfcf3 100644
--- a/src/cpu/kernels/maxunpool/generic/neon/impl.h
+++ b/src/cpu/kernels/maxunpool/generic/neon/impl.h
@@ -33,7 +33,7 @@ class Window;
 namespace cpu
 {
 template <typename T>
-void max_unpooling(const ITensor *input, ITensor *output, const ITensor *indices, const Window &window);
+void max_unpooling(const ITensor *input, const ITensor *indices, ITensor *output, const Window &window);
 } // namespace cpu
 } // namespace arm_compute
 #endif //define SRC_CORE_SVE_KERNELS_MAXUNPOOLING_IMPL_H
diff --git a/src/cpu/kernels/maxunpool/generic/neon/qasymm8.cpp b/src/cpu/kernels/maxunpool/generic/neon/qasymm8.cpp
index b6d0f48fda..53e601bba6 100644
--- a/src/cpu/kernels/maxunpool/generic/neon/qasymm8.cpp
+++ b/src/cpu/kernels/maxunpool/generic/neon/qasymm8.cpp
@@ -26,9 +26,9 @@ namespace arm_compute
 {
 namespace cpu
 {
-void neon_qs8_maxunpooling(const ITensor *input, ITensor *output, const ITensor *indices, const Window &window)
+void neon_qs8_maxunpooling(const ITensor *input, const ITensor *indices, ITensor *output, const Window &window)
 {
-    return max_unpooling<int8_t>(input, output, indices, window);
+    return max_unpooling<int8_t>(input, indices, output, window);
 }
 } // namespace cpu
 } // namespace arm_compute
diff --git a/src/cpu/kernels/maxunpool/generic/neon/qasymm8_signed.cpp b/src/cpu/kernels/maxunpool/generic/neon/qasymm8_signed.cpp
index 79f3013805..a3c346fba7 100644
--- a/src/cpu/kernels/maxunpool/generic/neon/qasymm8_signed.cpp
+++ b/src/cpu/kernels/maxunpool/generic/neon/qasymm8_signed.cpp
@@ -26,9 +26,9 @@ namespace arm_compute
 {
 namespace cpu
 {
-void neon_qu8_maxunpooling(const ITensor *input, ITensor *output, const ITensor *indices, const Window &window)
+void neon_qu8_maxunpooling(const ITensor *input, const ITensor *indices, ITensor *output, const Window &window)
 {
-    return max_unpooling<uint8_t>(input, output, indices, window);
+    return max_unpooling<uint8_t>(input, indices, output, window);
 }
 } // namespace cpu
 } // namespace arm_compute
diff --git a/src/cpu/kernels/maxunpool/list.h b/src/cpu/kernels/maxunpool/list.h
index 0f9bb499d3..2c4fe940d9 100644
--- a/src/cpu/kernels/maxunpool/list.h
+++ b/src/cpu/kernels/maxunpool/list.h
@@ -28,7 +28,7 @@ namespace arm_compute
 namespace cpu
 {
 #define DECLARE_MAXUNPOOL_KERNEL(func_name) \
-    void func_name(const ITensor *input, ITensor *output, const ITensor *indices, const Window &window)
+    void func_name(const ITensor *input, const ITensor *indices, ITensor *output, const Window &window)
 DECLARE_MAXUNPOOL_KERNEL(neon_fp32_maxunpooling);
 DECLARE_MAXUNPOOL_KERNEL(neon_fp16_maxunpooling);
 DECLARE_MAXUNPOOL_KERNEL(neon_qs8_maxunpooling);