Merge pull request #1017 from zhangyang0701/develop

correct mistakes for FPGA track #1016

src/fpga/api.cpp

@@ -311,6 +311,8 @@ int get_aligned_filter_num(int num) {
 
 void format_filter(framework::Tensor *filter_tensor, float max_value,
                    int group_num) {
+  filter_tensor->scale[0] = float(max_value / 127.0);
+  filter_tensor->scale[1] = float(127.0 / max_value);
   auto dims = filter_tensor->dims();
   auto num = dims[0], channel = dims[1], height = dims[2], width = dims[3];
   auto data_ptr = filter_tensor->data<float>();

src/io/executor.cpp

@@ -676,11 +676,11 @@ std::shared_ptr<framework::Tensor> Executor<Dtype, P>::FetchResult(int id) {
       to_predict_program_->Block(0);
   auto &ops = ops_of_block_[*to_predict_block.get()];
 
-  PADDLE_MOBILE_ENFORCE(id < ops.size(), "Index out of range");
-  auto last_op = id < 0 ? ops[ops.size() - 1] : ops[id];
-  auto output_map = last_op->Outputs();
-  std::vector<std::string> out_keys = last_op->GetOutKeys();
-  PADDLE_MOBILE_ENFORCE(!out_keys.empty(), "the last op contains no output");
+  PADDLE_MOBILE_ENFORCE(id < (int)ops.size(), "Index out of range");
+  auto op = id < 0 ? ops[ops.size() - 1] : ops[id];
+  auto output_map = op->Outputs();
+  std::vector<std::string> out_keys = op->GetOutKeys();
+  PADDLE_MOBILE_ENFORCE(!out_keys.empty(), "this op contains no output");
   auto *output_tensor = framework::GetVarValue<framework::LoDTensor>(
       out_keys[0], output_map, *(program_.scope));
   return std::make_shared<framework::Tensor>(framework::Tensor(*output_tensor));

src/operators/feed_op.h

@@ -50,8 +50,8 @@ class FeedOp : public framework::OperatorBase<DeviceType> {
 
   void RunImpl() const {
     auto input = (Tensor *)const_cast<LoDTensor *>(param_.InputX());
-    auto input_ptr = input->data<float>();
     fpga::format_image(input);
+    auto input_ptr = input->data<float>();
     Tensor *output = param_.Out();
     auto output_ptr = output->data<float>();
 

src/operators/kernel/fpga/concat_kernel.cpp

@@ -47,7 +47,7 @@ bool ConcatKernel<FPGA, float>::Init(ConcatParam<FPGA> *param) {
   concatArgs.image_num = (uint32_t)image_num;
   concatArgs.images_in = images_in;
   concatArgs.scales_in = scales_in;
-  concatArgs.image_out = (half *)out->mutable_data<float>();
+  concatArgs.image_out = (half *)out->data<float>();
   concatArgs.scale_out = out->scale;
   concatArgs.channel_num = channel_num;
   concatArgs.height = (uint32_t)height;

src/operators/kernel/fpga/softmax_kernel.cpp

@@ -39,8 +39,8 @@ bool SoftmaxKernel<FPGA, float>::Init(SoftmaxParam<FPGA> *param) {
   args.image.height = 1;
   args.image.width = 1;
   args.image.channels = (uint32_t)input->dims()[1];
-  args.output.address = float_input->mutable_data<float>();
-
+  args.output.address = float_input->data<float>();
+  args.output.scale_address = float_input->scale;
   param->SetFloatInput(float_input);
   param->SetFpgaArgs(args);
   return true;