Merge branch 'develop' into add_high_api_for_paddle_mobile

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:

src/operators/kernel/fpga/fc_relu_kernel.cpp

@@ -41,7 +41,6 @@ bool FusionFcReluKernel<FPGA, float>::Init(FusionFcReluParam *param) {
 
   fpga::ConvArgs convArgs;
   convArgs.relu_enabled = relu_enabled;
-  convArgs.bias_address = (void *)input_z_ptr;
   convArgs.filter_address = (void *)input_y_ptr;
   convArgs.filter_num = out->dims()[1];
   convArgs.group_num = 1;

src/operators/kernel/fpga/fusion_fc_kernel.cpp

@@ -41,7 +41,6 @@ bool FusionFcKernel<FPGA, float>::Init(FusionFcParam *param) {
 
   fpga::ConvArgs convArgs;
   convArgs.relu_enabled = relu_enabled;
-  convArgs.bias_address = (void *)input_z_ptr;
   convArgs.filter_address = (void *)input_y_ptr;
   convArgs.filter_num = out->dims()[1];
   convArgs.group_num = 1;