Skip to content

P
Paddle

PaddlePaddle / Paddle
大约 1 年 前同步成功

通知 2298
Star 20931
Fork 5422
P
Paddle

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 6f20a383 编写于 作者: W wangxiaoning 提交者： GitHub
浏览文件
操作

[code style fix] cpplint code style fix (#49554) 

* fix graph_brpc_server.h code style
* fix ps_local_client.h
* fix ps_local_client.cc
上级 ac9c7e4d
隐藏空白更改
内联 并排
Showing with 93 addition and 89 deletion
paddle/fluid/distributed/ps/service/graph_brpc_server.h
浏览文件 @ 6f20a383
......@@ -63,97 +63,98 @@ class GraphBrpcService;
typedef int32_t (GraphBrpcService::*serviceFunc)(
Table *table,
const PsRequestMessage &request,
PsResponseMessage &response,
PsResponseMessage &response, // NOLINT
brpc::Controller *cntl);
class GraphBrpcService : public PsBaseService {
public:
virtual int32_t Initialize() override;
int32_t Initialize() override;
virtual void service(::google::protobuf::RpcController *controller,
const PsRequestMessage *request,
PsResponseMessage *response,
::google::protobuf::Closure *done) override;
void service(::google::protobuf::RpcController *controller,
const PsRequestMessage *request,
PsResponseMessage *response,
::google::protobuf::Closure *done) override;
protected:
std::unordered_map<int32_t, serviceFunc> _service_handler_map;
int32_t InitializeShardInfo();
int32_t pull_graph_list(Table *table,
const PsRequestMessage &request,
PsResponseMessage &response,
PsResponseMessage &response, // NOLINT
brpc::Controller *cntl);
int32_t graph_random_sample_neighbors(Table *table,
const PsRequestMessage &request,
PsResponseMessage &response,
PsResponseMessage &response, // NOLINT
brpc::Controller *cntl);
int32_t graph_random_sample_nodes(Table *table,
const PsRequestMessage &request,
PsResponseMessage &response,
PsResponseMessage &response, // NOLINT
brpc::Controller *cntl);
int32_t graph_get_node_feat(Table *table,
const PsRequestMessage &request,
PsResponseMessage &response,
PsResponseMessage &response, // NOLINT
brpc::Controller *cntl);
int32_t graph_set_node_feat(Table *table,
const PsRequestMessage &request,
PsResponseMessage &response,
PsResponseMessage &response, // NOLINT
brpc::Controller *cntl);
int32_t clear_nodes(Table *table,
const PsRequestMessage &request,
PsResponseMessage &response,
PsResponseMessage &response, // NOLINT
brpc::Controller *cntl);
int32_t add_graph_node(Table *table,
const PsRequestMessage &request,
PsResponseMessage &response,
PsResponseMessage &response, // NOLINT
brpc::Controller *cntl);
int32_t remove_graph_node(Table *table,
const PsRequestMessage &request,
PsResponseMessage &response,
PsResponseMessage &response, // NOLINT
brpc::Controller *cntl);
int32_t Barrier(Table *table,
const PsRequestMessage &request,
PsResponseMessage &response,
PsResponseMessage &response, // NOLINT
brpc::Controller *cntl);
int32_t LoadOneTable(Table *table,
const PsRequestMessage &request,
PsResponseMessage &response,
PsResponseMessage &response, // NOLINT
brpc::Controller *cntl);
int32_t LoadAllTable(Table *table,
const PsRequestMessage &request,
PsResponseMessage &response,
PsResponseMessage &response, // NOLINT
brpc::Controller *cntl);
int32_t StopServer(Table *table,
const PsRequestMessage &request,
PsResponseMessage &response,
PsResponseMessage &response, // NOLINT
brpc::Controller *cntl);
int32_t StartProfiler(Table *table,
const PsRequestMessage &request,
PsResponseMessage &response,
PsResponseMessage &response, // NOLINT
brpc::Controller *cntl);
int32_t StopProfiler(Table *table,
const PsRequestMessage &request,
PsResponseMessage &response,
PsResponseMessage &response, // NOLINT
brpc::Controller *cntl);
int32_t PrintTableStat(Table *table,
const PsRequestMessage &request,
PsResponseMessage &response,
PsResponseMessage &response, // NOLINT
brpc::Controller *cntl);
int32_t sample_neighbors_across_multi_servers(Table *table,
const PsRequestMessage &request,
PsResponseMessage &response,
brpc::Controller *cntl);
int32_t sample_neighbors_across_multi_servers(
Table *table,
const PsRequestMessage &request,
PsResponseMessage &response, // NOLINT
brpc::Controller *cntl);
int32_t use_neighbors_sample_cache(Table *table,
const PsRequestMessage &request,
PsResponseMessage &response,
PsResponseMessage &response, // NOLINT
brpc::Controller *cntl);
int32_t load_graph_split_config(Table *table,
const PsRequestMessage &request,
PsResponseMessage &response,
PsResponseMessage &response, // NOLINT
brpc::Controller *cntl);
private:
......
paddle/fluid/distributed/ps/service/ps_local_client.cc
浏览文件 @ 6f20a383
......@@ -16,7 +16,7 @@
#include "paddle/fluid/distributed/ps/table/table.h"
//#define pslib_debug_dense_compress
// #define pslib_debug_dense_compress
namespace paddle {
namespace distributed {
......@@ -36,13 +36,13 @@ int32_t PsLocalClient::Initialize() {
::std::future<int32_t> PsLocalClient::Shrink(uint32_t table_id,
const std::string threshold) {
// TODO
// TODO // NOLINT
return done();
}
::std::future<int32_t> PsLocalClient::Load(const std::string& epoch,
const std::string& mode) {
// TODO
// TODO // NOLINT
for (auto& it : _table_map) {
Load(it.first, epoch, mode);
}
......@@ -51,7 +51,7 @@ int32_t PsLocalClient::Initialize() {
::std::future<int32_t> PsLocalClient::Load(uint32_t table_id,
const std::string& epoch,
const std::string& mode) {
// TODO
// TODO // NOLINT
auto* table_ptr = GetTable(table_id);
table_ptr->Load(epoch, mode);
return done();
......@@ -59,7 +59,7 @@ int32_t PsLocalClient::Initialize() {
::std::future<int32_t> PsLocalClient::Save(const std::string& epoch,
const std::string& mode) {
// TODO
// TODO // NOLINT
for (auto& it : _table_map) {
Save(it.first, epoch, mode);
}
......@@ -68,7 +68,7 @@ int32_t PsLocalClient::Initialize() {
::std::future<int32_t> PsLocalClient::Save(uint32_t table_id,
const std::string& epoch,
const std::string& mode) {
// TODO
// TODO // NOLINT
auto* table_ptr = GetTable(table_id);
table_ptr->Flush();
table_ptr->Save(epoch, mode);
......@@ -76,11 +76,11 @@ int32_t PsLocalClient::Initialize() {
}
::std::future<int32_t> PsLocalClient::Clear() {
// TODO
// TODO // NOLINT
return done();
}
::std::future<int32_t> PsLocalClient::Clear(uint32_t table_id) {
// TODO
// TODO // NOLINT
return done();
}
......@@ -125,8 +125,10 @@ int32_t PsLocalClient::Initialize() {
while (shard_buffer_remain > 0 && region_idx < region_num) {
auto& region = regions[region_idx];
if (region.size - region_data_idx >= shard_buffer_remain) {
memcpy((void*)(region.data + region_data_idx),
(uint8_t*)(void*)(region_buffer.data()) + index,
memcpy(reinterpret_cast<void*>(region.data + region_data_idx),
reinterpret_cast<uint8_t*>(
reinterpret_cast<void*>(region_buffer.data())) +
index,
shard_buffer_remain);
region_data_idx += shard_buffer_remain;
shard_buffer_remain = 0;
......@@ -134,8 +136,10 @@ int32_t PsLocalClient::Initialize() {
++region_idx;
region_data_idx = 0;
} else {
memcpy((void*)(region.data + region_data_idx),
(uint8_t*)(void*)(region_buffer.data()) + index,
memcpy(reinterpret_cast<void*>(region.data + region_data_idx),
reinterpret_cast<uint8_t*>(
reinterpret_cast<void*>(region_buffer.data())) +
index,
region.size - region_data_idx);
shard_buffer_remain -= (region.size - region_data_idx);
index += (region.size - region_data_idx);
......@@ -230,7 +234,7 @@ int32_t PsLocalClient::Initialize() {
return done();
}
//::std::future<int32_t> PsLocalClient::PullSparse(float** select_values,
// ::std::future<int32_t> PsLocalClient::PullSparse(float** select_values,
// size_t table_id,
// const uint64_t* keys,
// size_t num) {
......@@ -271,7 +275,7 @@ int32_t PsLocalClient::Initialize() {
// std::make_shared<CostTimer>("pslib_downpour_client_pull_sparse");
// auto local_timer =
// std::make_shared<CostTimer>("pslib_downpour_client_pull_sparse_local");
//将key拆分到各shard请求，并记录原始对应value指针
// 将key拆分到各shard请求，并记录原始对应value指针
auto* table_ptr = GetTable(table_id);
TableContext table_context;
......
paddle/fluid/distributed/ps/service/ps_local_client.h
浏览文件 @ 6f20a383
......@@ -32,26 +32,26 @@ class PsLocalClient : public PSClient {
return 0;
}
virtual ::std::future<int32_t> Shrink(uint32_t table_id,
const std::string threshold) override;
virtual ::std::future<int32_t> Load(const std::string& epoch,
const std::string& mode) override;
virtual ::std::future<int32_t> Load(uint32_t table_id,
const std::string& epoch,
const std::string& mode) override;
virtual ::std::future<int32_t> Save(const std::string& epoch,
const std::string& mode) override;
virtual ::std::future<int32_t> Save(uint32_t table_id,
const std::string& epoch,
const std::string& mode) override;
virtual ::std::future<int32_t> Clear() override;
virtual ::std::future<int32_t> Clear(uint32_t table_id) override;
virtual ::std::future<int32_t> StopServer() override;
virtual void FinalizeWorker() override {}
::std::future<int32_t> Shrink(uint32_t table_id,
const std::string threshold) override;
::std::future<int32_t> Load(const std::string& epoch,
const std::string& mode) override;
::std::future<int32_t> Load(uint32_t table_id,
const std::string& epoch,
const std::string& mode) override;
::std::future<int32_t> Save(const std::string& epoch,
const std::string& mode) override;
::std::future<int32_t> Save(uint32_t table_id,
const std::string& epoch,
const std::string& mode) override;
::std::future<int32_t> Clear() override;
::std::future<int32_t> Clear(uint32_t table_id) override;
::std::future<int32_t> StopServer() override;
void FinalizeWorker() override {}
virtual ::std::future<int32_t> PullDense(Region* regions,
size_t region_num,
size_t table_id);
......@@ -102,7 +102,7 @@ class PsLocalClient : public PSClient {
prom.set_value(0);
return fut;
};
}
virtual std::future<int32_t> StopProfiler() {
std::promise<int32_t> prom;
......@@ -147,8 +147,9 @@ class PsLocalClient : public PSClient {
return 0;
}
virtual ::std::future<int32_t> SendClient2ClientMsg(
int msg_type, int to_client_id, const std::string& msg) override {
::std::future<int32_t> SendClient2ClientMsg(int msg_type,
int to_client_id,
const std::string& msg) override {
std::promise<int32_t> prom;
std::future<int32_t> fut = prom.get_future();
prom.set_value(0);
......@@ -157,25 +158,23 @@ class PsLocalClient : public PSClient {
}
virtual size_t GetServerNums() { return 1; }
virtual std::future<int32_t> PushDenseRawGradient(int table_id,
float* total_send_data,
size_t total_send_data_size,
void* callback) override;
virtual std::future<int32_t> PushSparseRawGradient(
size_t table_id,
const uint64_t* keys,
const float** update_values,
size_t num,
void* callback) override;
virtual std::future<int32_t> PushSparseRawGradientPartial(
size_t table_id,
const uint64_t* keys,
const float** update_values,
uint32_t num,
void* done,
int pserver_idx) override {
std::future<int32_t> PushDenseRawGradient(int table_id,
float* total_send_data,
size_t total_send_data_size,
void* callback) override;
std::future<int32_t> PushSparseRawGradient(size_t table_id,
const uint64_t* keys,
const float** update_values,
size_t num,
void* callback) override;
std::future<int32_t> PushSparseRawGradientPartial(size_t table_id,
const uint64_t* keys,
const float** update_values,
uint32_t num,
void* done,
int pserver_idx) override {
std::promise<int32_t> prom;
std::future<int32_t> fut = prom.get_future();
prom.set_value(0);
......@@ -183,11 +182,11 @@ class PsLocalClient : public PSClient {
return fut;
}
virtual std::future<int32_t> PushSparseParam(size_t table_id,
const uint64_t* keys,
const float** update_values,
size_t num,
void* done) override {
std::future<int32_t> PushSparseParam(size_t table_id,
const uint64_t* keys,
const float** update_values,
size_t num,
void* done) override {
std::promise<int32_t> prom;
std::future<int32_t> fut = prom.get_future();
prom.set_value(0);
......@@ -196,7 +195,7 @@ class PsLocalClient : public PSClient {
}
private:
virtual int32_t Initialize() override;
int32_t Initialize() override;
std::future<int32_t> done() {
std::shared_ptr<std::promise<int32_t>> prom =
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或