fix conflicts

Author: tensor-tang

paddle/fluid/inference/analysis/analyzer_lac_tester.cc

@@ -192,7 +192,7 @@ void TestLACPrediction(const std::string &model_path,
         sum += timer.toc();
       }
     }
-    PrintTime(sum, batch_size, repeat);
+    PrintTime(batch_size, repeat, 1, 0, sum / batch_size);
     return;
   }
   timer.tic();

paddle/fluid/inference/api/helper.h

@@ -124,9 +124,11 @@ std::string DescribeTensor(const PaddleTensor &tensor) {
 
 void PrintTime(int batch_size, int repeat, int num_threads, int tid,
                double latency) {
+  LOG(INFO) << "=====================================";
   LOG(INFO) << "batch_size: " << batch_size << ", repeat: " << repeat
             << ", threads: " << num_threads << ", thread id: " << tid
             << ", latency: " << latency << "ms";
+  LOG(INFO) << "=====================================";
 }
 
 }  // namespace inference