From 5a62451b78712b7f73486f0b7759f458a6f3ca6d Mon Sep 17 00:00:00 2001 From: ZhenWang Date: Tue, 4 Dec 2018 13:49:06 +0800 Subject: [PATCH] Revert "fix no neon bugs." This reverts commit 0a6079cc24a8f2bfd6bd5925164ba5660e2f4a00. --- src/operators/kernel/central-arm-func/pool_arm_func.h | 6 ++---- test/operators/test_pool_op.cpp | 2 -- 2 files changed, 2 insertions(+), 6 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 15a2ebc65e..95149732ca 100644 --- a/src/operators/kernel/central-arm-func/pool_arm_func.h +++ b/src/operators/kernel/central-arm-func/pool_arm_func.h @@ -96,8 +96,7 @@ void PoolCompute(const PoolParam ¶m) { paddings[1] == 0) { #if __ARM_NEON #if __aarch64__ - PoolBasic(pooling_type, ksize, strides, paddings, in_x, - out); + PoolBasic(pooling_type, ksize, strides, paddings, in_x, out); #else /// todo: fix bug in Pool2x2 if (pooling_type == "max") { @@ -107,8 +106,7 @@ void PoolCompute(const PoolParam ¶m) { } #endif #else - PoolBasic(pooling_type, ksize, strides, paddings, in_x, - out); + PoolBasic(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 5784ac0654..48bf00c2ac 100644 --- a/test/operators/test_pool_op.cpp +++ b/test/operators/test_pool_op.cpp @@ -202,7 +202,6 @@ 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"; @@ -213,7 +212,6 @@ int main(int argc, char *argv[]) { << "float, ceil_mode=false, pooling_type=max, kernel=3, pad=0, stride=2"; paddle_mobile::TestPoolOp(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