提交 608e112a 编写于 作者: Z ZhenWang

Revert "fix no neon bugs."

This reverts commit 0a6079cc.
上级 0a6079cc
...@@ -96,8 +96,7 @@ void PoolCompute(const PoolParam<CPU> &param) { ...@@ -96,8 +96,7 @@ void PoolCompute(const PoolParam<CPU> &param) {
paddings[1] == 0) { paddings[1] == 0) {
#if __ARM_NEON #if __ARM_NEON
#if __aarch64__ #if __aarch64__
PoolBasic<float, float>(pooling_type, ksize, strides, paddings, in_x, PoolBasic<float, float>(pooling_type, ksize, strides, paddings, in_x, out);
out);
#else #else
/// todo: fix bug in Pool2x2 /// todo: fix bug in Pool2x2
if (pooling_type == "max") { if (pooling_type == "max") {
...@@ -107,8 +106,7 @@ void PoolCompute(const PoolParam<CPU> &param) { ...@@ -107,8 +106,7 @@ void PoolCompute(const PoolParam<CPU> &param) {
} }
#endif #endif
#else #else
PoolBasic<float, float>(pooling_type, ksize, strides, paddings, in_x, PoolBasic<float, float>(pooling_type, ksize, strides, paddings, in_x, out);
out);
#endif // __ARM_NEON #endif // __ARM_NEON
} else { } else {
......
...@@ -202,7 +202,6 @@ int main(int argc, char *argv[]) { ...@@ -202,7 +202,6 @@ int main(int argc, char *argv[]) {
int in_channels = atoi(argv[1]); int in_channels = atoi(argv[1]);
int in_height = atoi(argv[2]); int in_height = atoi(argv[2]);
int in_width = atoi(argv[3]); int in_width = atoi(argv[3]);
#if __ARM_NEON
// kernel = 3, pad = 1, stride = 1 // kernel = 3, pad = 1, stride = 1
LOG(paddle_mobile::kLOG_INFO) LOG(paddle_mobile::kLOG_INFO)
<< "float, ceil_mode=false, pooling_type=max, kernel=3, pad=1, stride=1"; << "float, ceil_mode=false, pooling_type=max, kernel=3, pad=1, stride=1";
...@@ -213,7 +212,6 @@ int main(int argc, char *argv[]) { ...@@ -213,7 +212,6 @@ int main(int argc, char *argv[]) {
<< "float, ceil_mode=false, pooling_type=max, kernel=3, pad=0, stride=2"; << "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, paddle_mobile::TestPoolOp<float, 0, 0, 3, 0, 2>(in_channels, in_height,
in_width); in_width);
#endif
// kernel = 3, pad = 0, stride = 1 // kernel = 3, pad = 0, stride = 1
LOG(paddle_mobile::kLOG_INFO) LOG(paddle_mobile::kLOG_INFO)
<< "int8_t, ceil_mode=false, pooling_type=max, kernel=3, pad=0, stride=1"; << "int8_t, ceil_mode=false, pooling_type=max, kernel=3, pad=0, stride=1";
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册