From bb815d4364eaaf6c4053fc6c2259ebfa559bca90 Mon Sep 17 00:00:00 2001
From: "yi.wu" <yi.wu@baifendian.com>
Date: Fri, 23 Mar 2018 19:13:25 +0800
Subject: [PATCH] update
---
.clang_format.hook | 2 +-
paddle/fluid/operators/detail/grpc_server.h | 3 +--
paddle/fluid/operators/listen_and_serv_op.cc | 10 ++++------
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/.clang_format.hook b/.clang_format.hook
index 1d92821686..edec286b77 100755
--- a/.clang_format.hook
+++ b/.clang_format.hook
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
-readonly VERSION="3.8"
+readonly VERSION="7.0"
version=$(clang-format -version)
diff --git a/paddle/fluid/operators/detail/grpc_server.h b/paddle/fluid/operators/detail/grpc_server.h
index 787e1506e2..10e6dd45a9 100644
--- a/paddle/fluid/operators/detail/grpc_server.h
+++ b/paddle/fluid/operators/detail/grpc_server.h
@@ -22,11 +22,10 @@ limitations under the License. */
#include "paddle/fluid/framework/selected_rows.h"
#include "paddle/fluid/framework/var_type.h"
#include "paddle/fluid/operators/detail/grpc_service.h"
-#include "paddle/fluid/operators/detail/grpc_service.h"
#include "paddle/fluid/operators/detail/send_recv.grpc.pb.h"
#include "paddle/fluid/operators/detail/send_recv.pb.h"
-#include "paddle/fluid/operators/detail/simple_block_queue.h"
#include "paddle/fluid/operators/detail/sendrecvop_utils.h"
+#include "paddle/fluid/operators/detail/simple_block_queue.h"
namespace paddle {
namespace operators {
diff --git a/paddle/fluid/operators/listen_and_serv_op.cc b/paddle/fluid/operators/listen_and_serv_op.cc
index 9c788108e2..08b83375dd 100644
--- a/paddle/fluid/operators/listen_and_serv_op.cc
+++ b/paddle/fluid/operators/listen_and_serv_op.cc
@@ -143,12 +143,11 @@ class ListenAndServOp : public framework::OperatorBase {
std::vector<std::future<void>> fs;
// block0 contains only listen_and_serv op, start run from block1.
for (int blkid = 1; blkid < num_blocks - 1; ++blkid) {
- fs.push_back(framework::Async(
- [&executor, &program, &recv_scope, blkid]() {
+ fs.push_back(
+ framework::Async([&executor, &program, &recv_scope, blkid]() {
int run_block = blkid; // thread local
try {
- executor.Run(*program, &recv_scope, run_block,
- false, false);
+ executor.Run(*program, &recv_scope, run_block, false, false);
} catch (std::exception &e) {
LOG(ERROR) << "run sub program error " << e.what();
}
@@ -158,8 +157,7 @@ class ListenAndServOp : public framework::OperatorBase {
// Run global block at final step, or block1 if there are only 2 blocks
if (num_blocks >= 2) {
try {
- executor.Run(*program, &recv_scope, num_blocks - 1,
- false, false);
+ executor.Run(*program, &recv_scope, num_blocks - 1, false, false);
} catch (std::exception &e) {
LOG(ERROR) << "run sub program error " << e.what();
}