From 63e33f38dbb41b4a514c57a87f7313ad174a0f83 Mon Sep 17 00:00:00 2001
From: ZhenWang <wangzhen31@baidu.com>
Date: Tue, 4 Dec 2018 13:01:27 +0800
Subject: [PATCH] fix no neon bugs.

---
 src/operators/kernel/central-arm-func/pool_arm_func.h | 6 ++++--
 test/operators/test_pool_op.cpp                       | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/operators/kernel/central-arm-func/pool_arm_func.h b/src/operators/kernel/central-arm-func/pool_arm_func.h
index 95149732ca..15a2ebc65e 100644
--- a/src/operators/kernel/central-arm-func/pool_arm_func.h
+++ b/src/operators/kernel/central-arm-func/pool_arm_func.h
@@ -96,7 +96,8 @@ void PoolCompute(const PoolParam<CPU> &param) {
                paddings[1] == 0) {
 #if __ARM_NEON
 #if __aarch64__
-      PoolBasic<float, float>(pooling_type, ksize, strides, paddings, in_x, out);
+      PoolBasic<float, float>(pooling_type, ksize, strides, paddings, in_x,
+                              out);
 #else
       /// todo: fix bug in Pool2x2
       if (pooling_type == "max") {
@@ -106,7 +107,8 @@ void PoolCompute(const PoolParam<CPU> &param) {
       }
 #endif
 #else
-      PoolBasic<float, float>(pooling_type, ksize, strides, paddings, in_x, out);
+      PoolBasic<float, float>(pooling_type, ksize, strides, paddings, in_x,
+                              out);
 #endif  // __ARM_NEON
 
     } else {
diff --git a/test/operators/test_pool_op.cpp b/test/operators/test_pool_op.cpp
index 48bf00c2ac..5784ac0654 100644
--- a/test/operators/test_pool_op.cpp
+++ b/test/operators/test_pool_op.cpp
@@ -202,6 +202,7 @@ int main(int argc, char *argv[]) {
   int in_channels = atoi(argv[1]);
   int in_height = atoi(argv[2]);
   int in_width = atoi(argv[3]);
+#if __ARM_NEON
   // kernel = 3, pad = 1, stride = 1
   LOG(paddle_mobile::kLOG_INFO)
       << "float, ceil_mode=false, pooling_type=max, kernel=3, pad=1, stride=1";
@@ -212,6 +213,7 @@ int main(int argc, char *argv[]) {
       << "float, ceil_mode=false, pooling_type=max, kernel=3, pad=0, stride=2";
   paddle_mobile::TestPoolOp<float, 0, 0, 3, 0, 2>(in_channels, in_height,
                                                   in_width);
+#endif
   // kernel = 3, pad = 0, stride = 1
   LOG(paddle_mobile::kLOG_INFO)
       << "int8_t, ceil_mode=false, pooling_type=max, kernel=3, pad=0, stride=1";
-- 
GitLab