From 6ef60de6f1cb4552b2ecb0b02e6282072b062b3a Mon Sep 17 00:00:00 2001
From: "yi.wu" <yi.wu@baifendian.com>
Date: Sat, 12 May 2018 00:05:43 +0800
Subject: [PATCH] update

---
 .clang_format.hook                                | 2 +-
 paddle/fluid/operators/detail/sendrecvop_utils.cc | 2 +-
 paddle/fluid/operators/gen_nccl_id_op.cc          | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.clang_format.hook b/.clang_format.hook
index 1d928216867..edec286b773 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/sendrecvop_utils.cc b/paddle/fluid/operators/detail/sendrecvop_utils.cc
index f3ac1499475..07c43554bc6 100644
--- a/paddle/fluid/operators/detail/sendrecvop_utils.cc
+++ b/paddle/fluid/operators/detail/sendrecvop_utils.cc
@@ -162,7 +162,7 @@ void SerializeToByteBuffer(const std::string& name, framework::Variable* var,
   if (var->IsType<ncclUniqueId>()) {
     e.WriteVarlengthBeginning(VarMsg::kSerializedFieldNumber,
                               NCCL_UNIQUE_ID_BYTES);
-    ncclUniqueId& uid = var->Get<ncclUniqueId>();
+    const ncclUniqueId& uid = var->Get<ncclUniqueId>();
     e.WriteRawBytes(std::string(uid.internal, NCCL_UNIQUE_ID_BYTES));
 
     // for serialize NCCL_ID
diff --git a/paddle/fluid/operators/gen_nccl_id_op.cc b/paddle/fluid/operators/gen_nccl_id_op.cc
index 77cd4a460aa..6d50bd13e8a 100644
--- a/paddle/fluid/operators/gen_nccl_id_op.cc
+++ b/paddle/fluid/operators/gen_nccl_id_op.cc
@@ -23,6 +23,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/threadpool.h"
 #include "paddle/fluid/operators/detail/grpc_client.h"
 #include "paddle/fluid/operators/detail/grpc_server.h"
+#include "paddle/fluid/platform/nccl_helper.h"
 
 namespace paddle {
 namespace operators {
-- 
GitLab