diff --git a/CMakeLists.txt b/CMakeLists.txt index e4cb9180f6ab6dd62265bd07c9f643a5e07be1e7..8c388d8b2a6374c68aecf86b215c8e8462b13c2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,9 +7,9 @@ option(DEBUGING "enable debug mode" ON) option(USE_EXCEPTION "use std exception" OFF) option(LOG_PROFILE "log profile" OFF) # select the platform to build -option(CPU "armv7 with neon" OFF) +option(CPU "armv7 with neon" ON) option(MALI_GPU "mali gpu" OFF) -option(FPGA "fpga" ON) +option(FPGA "fpga" OFF) file(GLOB_RECURSE PADDLE_MOBILE_CC src/*.cc src/*.cpp src/*.c src/*.mm) file(GLOB_RECURSE PADDLE_MOBILE_H src/*.h) diff --git a/src/operators/math/gemm.cpp b/src/operators/math/gemm.cpp index 38e596c3ef8706a2598befa96108b7252b908cca..e3966d3290fac1d736bfa778635e2f943dfd9398 100644 --- a/src/operators/math/gemm.cpp +++ b/src/operators/math/gemm.cpp @@ -734,7 +734,7 @@ void InnerKernelWithBnAdd(int mc, int nc, float alpha, const float *a, #endif } } - // WriteWithBnAddRelu(mc, nc, c, C, ldc, new_scale, new_bias, bias); + WriteWithBnAddRelu(mc, nc, c, C, ldc, new_scale, new_bias, bias); } void InnerKernelWithPRelu(int mc, int nc, const float *a, const float *b, @@ -2985,6 +2985,8 @@ void WriteWithBn(int mc, int nc, float *c, float *C, int ldc, float *new_scale, void WriteWithBnRelu(int mc, int nc, float *c, float *C, int ldc, float *new_scale, float *new_bias) {} +void WriteWithBnAddRelu(int mc, int nc, float *c, float *C, int ldc, + float *new_scale, float *new_bias, float *bias1) {} #endif // __ARM_NEON