Merge remote-tracking branch 'upstream/develop' into develop

# Conflicts:
#	src/io/paddle_mobile.h

src/io/paddle_mobile.h

@@ -48,6 +48,9 @@ class PaddleMobile {
   bool Load(const std::string &model_path, const std::string &para_path,
             bool optimize = false, bool quantification = false,
             int batch_size = 1);
+    /*
+     * @b 设置线程数, 当 cmake 中开启 openmp 时生效
+     * */
   void SetThreadNum(int num);
 
   /*

src/operators/kernel/central-arm-func/pool_arm_func.h

@@ -77,11 +77,15 @@ void PoolCompute(const PoolParam &param) {
 
   } else if (ksize[0] == 2 && ksize[0] == ksize[1]) {
 #if __ARM_NEON
+#if __aarch64__
+    PoolBasic(pooling_type, ksize, strides, paddings, in_x, out);
+#else
     if (pooling_type == "max") {
       math::Pool2x2Max(strides, paddings, in_x, out);
     } else if (pooling_type == "avg") {
       math::Pool2x2Avg(strides, paddings, in_x, out);
     }
+#endif
 #else
     PoolBasic(pooling_type, ksize, strides, paddings, in_x, out);
 #endif  // __ARM_NEON