From 08f0306d7a3f93ad982b40fc06aee96fcfdd161e Mon Sep 17 00:00:00 2001
From: tensor-tang <tangjian03@baidu.com>
Date: Wed, 29 May 2019 10:59:05 +0800
Subject: [PATCH] [lite] fix fc bias and enable armv7 fc (#17695)

---
 cmake/cross_compiling/android.cmake                       | 3 ++-
 paddle/fluid/lite/core/cpu_info.cc                        | 2 +-
 paddle/fluid/lite/core/cpu_info.h                         | 6 +++---
 paddle/fluid/lite/core/mir/runtime_context_assign_pass.cc | 2 +-
 paddle/fluid/lite/kernels/arm/CMakeLists.txt              | 2 +-
 paddle/fluid/lite/kernels/arm/fc_compute_test.cc          | 8 +++-----
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/cmake/cross_compiling/android.cmake b/cmake/cross_compiling/android.cmake
index a12ecdccc1..dedfad8c7a 100644
--- a/cmake/cross_compiling/android.cmake
+++ b/cmake/cross_compiling/android.cmake
@@ -45,7 +45,8 @@ if (NOT ANDROID_ARCH_ABI IN_LIST ANDROID_ARCH_ABI_LIST)
 endif()
 
 if(ANDROID_ARCH_ABI STREQUAL "armeabi-v7a")
-    message(STATUS "NEON is enabled on arm-v7a")
+    set(CMAKE_ANDROID_ARM_NEON ON)
+    message(STATUS "NEON is enabled on arm-v7a with softfp")
 endif()
 
 set(ANDROID_STL_TYPE_LITS "gnustl_static" "c++_static")
diff --git a/paddle/fluid/lite/core/cpu_info.cc b/paddle/fluid/lite/core/cpu_info.cc
index 0336c2d7ac..8c2c427777 100644
--- a/paddle/fluid/lite/core/cpu_info.cc
+++ b/paddle/fluid/lite/core/cpu_info.cc
@@ -20,7 +20,7 @@ namespace lite {
 
 #ifdef LITE_WITH_ARM
 
-void DeviceInfo::get_info(DeviceInfo* dev) {
+void DeviceInfo::InitInternal(DeviceInfo* dev) {
   set_default_cache(dev);
   dev->compute_core_num_ = arm_get_cpucount();
   dev->max_memory_ = arm_get_meminfo();
diff --git a/paddle/fluid/lite/core/cpu_info.h b/paddle/fluid/lite/core/cpu_info.h
index 23a996f80e..bf603024bc 100644
--- a/paddle/fluid/lite/core/cpu_info.h
+++ b/paddle/fluid/lite/core/cpu_info.h
@@ -85,14 +85,14 @@ class DeviceInfo {
     return *x;
   }
 
-  static void init_info() {
+  static void Init() {
     auto& info = Global();
-    get_info(&info);
+    InitInternal(&info);
   }
 
  private:
   DeviceInfo() = default;
-  static void get_info(DeviceInfo* dev);
+  static void InitInternal(DeviceInfo* dev);
 };
 
 size_t arm_get_meminfo();
diff --git a/paddle/fluid/lite/core/mir/runtime_context_assign_pass.cc b/paddle/fluid/lite/core/mir/runtime_context_assign_pass.cc
index 1852fc2fcb..ecca00e33c 100644
--- a/paddle/fluid/lite/core/mir/runtime_context_assign_pass.cc
+++ b/paddle/fluid/lite/core/mir/runtime_context_assign_pass.cc
@@ -64,7 +64,7 @@ class RuntimeContextAssignPass : public StmtPass {
 
 #ifdef LITE_WITH_ARM
   std::unique_ptr<KernelContext> NewARMContext() {
-    DeviceInfo::init_info();
+    DeviceInfo::Init();
     std::unique_ptr<KernelContext> ctx(new KernelContext);
     ctx->As<ARMContext>();
     return ctx;
diff --git a/paddle/fluid/lite/kernels/arm/CMakeLists.txt b/paddle/fluid/lite/kernels/arm/CMakeLists.txt
index 75dc9fe43a..ebdd42443e 100644
--- a/paddle/fluid/lite/kernels/arm/CMakeLists.txt
+++ b/paddle/fluid/lite/kernels/arm/CMakeLists.txt
@@ -9,7 +9,7 @@ cc_library(relu_compute_arm SRCS relu_compute.cc DEPS ${lite_kernel_deps})
 cc_library(mul_compute_arm SRCS mul_compute.cc DEPS ${lite_kernel_deps} eigen3)
 cc_library(scale_compute_arm SRCS scale_compute.cc DEPS ${lite_kernel_deps} eigen3)
 
-lite_cc_test(test_fc_compute_arm SRCS fc_compute_test.cc DEPS fc_compute_arm eigen3)
+lite_cc_test(test_fc_compute_arm SRCS fc_compute_test.cc DEPS fc_compute_arm math_arm)
 
 set(arm_kernels
     fc_compute_arm
diff --git a/paddle/fluid/lite/kernels/arm/fc_compute_test.cc b/paddle/fluid/lite/kernels/arm/fc_compute_test.cc
index 1949a3a1eb..2e85fccf7d 100644
--- a/paddle/fluid/lite/kernels/arm/fc_compute_test.cc
+++ b/paddle/fluid/lite/kernels/arm/fc_compute_test.cc
@@ -61,8 +61,6 @@ TEST(fc_arm, compare_test) {
     b_data[i] = static_cast<float>(i);
   }
 
-  // TODO(TJ): enable bias soon
-  b_data = nullptr;
   lite::arm::math::fc_compute_eigen(x_data, batch_size, 3,  //
                                     w_data, 3, 4,           //
                                     b_data, ref_data);
@@ -74,11 +72,11 @@ TEST(fc_arm, compare_test) {
   param.in_num_col_dims = 1;
   param.input = &x;
   param.w = &w;
-  param.bias = nullptr;
+  param.bias = &b;
   param.output = &out;
   param.in_mat_dims = x.dims();
 
-  DeviceInfo::init_info();
+  DeviceInfo::Init();
   std::unique_ptr<KernelContext> ctx(new KernelContext);
   ctx->As<ARMContext>();
   fc.SetParam(param);
@@ -136,7 +134,7 @@ TEST(fc_arm, num_col_dims) {
 
   std::unique_ptr<KernelContext> ctx(new KernelContext);
   ctx->As<ARMContext>();
-  DeviceInfo::init_info();
+  DeviceInfo::Init();
 
   fc.SetParam(param);
   fc.SetContext(std::move(ctx));
-- 
GitLab