diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ccf73763c08a748b53027d7f4a0f254774a1843..cb2292482553c706172778f555d7a5d827e28ec5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,9 +6,10 @@ option(USE_OPENMP "openmp support" OFF) option(USE_EXCEPTION "use std exception" ON) option(LOG_PROFILE "log profile" ON) # select the platform to build -option(CPU "armv7 with neon" ON) +option(CPU "armv7 with neon" OFF) option(MALI_GPU "mali gpu" OFF) -option(FPGA "fpga" OFF) +option(FPGA "fpga" ON) +SET(FPGA ON) 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/framework/tensor.h b/src/framework/tensor.h index 364f79cc84b5a3f4c2aa1838961eb092a9b842f0..797fcf5bffbe5e738fe352d1ca84602f0e5d86a0 100644 --- a/src/framework/tensor.h +++ b/src/framework/tensor.h @@ -257,10 +257,12 @@ class Tensor { struct FPGAArgs { float scale; - inline const float *scale_pointer() const { return &scale; } + inline float *scale_pointer() { return &scale; } }; - const struct FPGAArgs fpga_args() const { return fpgaArgs_; } + struct FPGAArgs fpga_args() const { + return fpgaArgs_; + } #endif private: diff --git a/src/operators/kernel/fpga/fusion_fc_kernel.cpp b/src/operators/kernel/fpga/fusion_fc_kernel.cpp index 9443270342a681199cd2cfe068a13d806cb606f9..9c28a450720e434a84ab1056be248d7793d7799f 100644 --- a/src/operators/kernel/fpga/fusion_fc_kernel.cpp +++ b/src/operators/kernel/fpga/fusion_fc_kernel.cpp @@ -41,7 +41,7 @@ bool FusionFcKernel::Init(FusionFcParam *param) { fpga::ConvArgs convArgs; convArgs.relu_enabled = relu_enabled; - convArgs.bias_address = (void *)input_z_ptr; + convArgs.sb_address = (void *)bs_ptr; convArgs.filter_address = (void *)input_y_ptr; convArgs.filter_num = out->dims()[1]; convArgs.group_num = 1;