-
Notifications
You must be signed in to change notification settings - Fork 5.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Async GRPC sendrecv #7133
Merged
Merged
Async GRPC sendrecv #7133
Changes from all commits
Commits
Show all changes
39 commits
Select commit
Hold shift + click to select a range
0a22ddb
init
gongweibao 7aed2d0
modify send
gongweibao 1078965
before clean
gongweibao b833c24
add grpc async client
gongweibao 4944e0e
add grpc client cc
gongweibao 2effdf6
add grpc_server
gongweibao cfabd23
async update
gongweibao ebd5a58
check
gongweibao f92005f
compile ok
gongweibao 83232c7
fix by helin comments
gongweibao 46f23cf
refactor client
gongweibao 4d6a55b
test
gongweibao 4982c7d
reconstruct grpc_client
gongweibao a969b93
clean code
gongweibao a5308bf
fix by wuyi comments
gongweibao 44debaf
clean some code
gongweibao 15900a2
modify rpclient
gongweibao c4705c9
fix some bugs
gongweibao 126c118
rm wait of proto
gongweibao ed3bf64
fix confict
gongweibao e33b936
fix client bugs
gongweibao 47bff2f
clean some code
gongweibao 5bb69a8
modify
gongweibao 9543e2a
clean some code
gongweibao d39efbc
clean some code
gongweibao b86a2b5
server core
gongweibao ac1deb2
test ok
gongweibao cd9dd1a
fix some bugs
gongweibao 0a401ad
fix logical bug
gongweibao 9061334
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
gongweibao b686112
follow by wuyi comments
gongweibao 43a278b
server core
gongweibao 44f9571
test ok
gongweibao 6e8b210
fix by comments
gongweibao 165cddd
fix by comments
gongweibao 09e7c82
clean code
gongweibao a831898
follow by comments
gongweibao 2669ad7
resolve conflict
gongweibao 8256a30
rm print
gongweibao File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
grpc_library(sendrecvop_grpc SRCS recv_impl.cc send_impl.cc PROTO send_recv.proto DEPS lod_tensor selected_rows) | ||
grpc_library(sendrecvop_grpc SRCS sendrecvop_utils.cc grpc_client.cc grpc_server.cc PROTO send_recv.proto DEPS lod_tensor selected_rows) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,147 @@ | ||
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. */ | ||
|
||
#include "grpc_client.h" | ||
namespace paddle { | ||
namespace operators { | ||
namespace detail { | ||
|
||
bool RPCClient::AsyncSendVariable(const std::string& ep, | ||
const platform::DeviceContext& ctx, | ||
const framework::Scope& scope, | ||
const std::string& var_name, | ||
int64_t time_out) { | ||
sendrecv::VariableMessage req; | ||
auto* var = scope.FindVar(var_name); | ||
SerializeToMessage(var_name, var, ctx, &req); | ||
|
||
// varhandle | ||
VarHandle var_h; | ||
var_h.ep = ep; | ||
var_h.scope = &scope; | ||
var_h.name = var_name; | ||
var_h.ctx = &ctx; | ||
|
||
// stub context | ||
auto ch = GetChannel(ep); | ||
SendProcessor* s = new SendProcessor(ch); | ||
s->Prepare(var_h, time_out); | ||
s->response_call_back_ = NULL; | ||
|
||
auto rpc = s->stub_->AsyncSendVariable(s->context_.get(), req, &cq_); | ||
rpc->Finish(&s->reply_, &s->status_, (void*)s); | ||
|
||
req_count_++; | ||
|
||
return true; | ||
} | ||
|
||
void ProcGetResponse(const VarHandle& var_h, | ||
const sendrecv::VariableMessage& ret_msg) { | ||
auto* outvar = var_h.scope->FindVar(var_h.name); | ||
|
||
std::istringstream iss(ret_msg.serialized()); | ||
DeserializeFromMessage(ret_msg, *var_h.ctx, outvar); | ||
} | ||
|
||
bool RPCClient::AsyncGetVariable(const std::string& ep, | ||
const platform::DeviceContext& ctx, | ||
const framework::Scope& scope, | ||
const std::string& var_name, | ||
int64_t time_out) { | ||
sendrecv::VariableMessage req; | ||
req.set_varname(var_name); | ||
|
||
auto* var = scope.FindVar(var_name); | ||
SerializeToMessage(var_name, var, ctx, &req); | ||
|
||
// varhandle | ||
VarHandle var_h; | ||
var_h.ep = ep; | ||
var_h.scope = &scope; | ||
var_h.name = var_name; | ||
var_h.ctx = &ctx; | ||
|
||
// stub context | ||
auto ch = GetChannel(ep); | ||
GetProcessor* s = new GetProcessor(ch); | ||
s->Prepare(var_h, time_out); | ||
s->response_call_back_ = ProcGetResponse; | ||
|
||
auto rpc = s->stub_->AsyncGetVariable(s->context_.get(), req, &cq_); | ||
rpc->Finish(&s->reply_, &s->status_, (void*)s); | ||
|
||
req_count_++; | ||
|
||
return true; | ||
} | ||
|
||
bool RPCClient::wait() { | ||
bool ok = true; | ||
|
||
while (true) { | ||
if (req_count_ <= 0) { | ||
break; | ||
} | ||
|
||
if (!Proceed()) { | ||
LOG(ERROR) << "Get meets CompletionQueue error"; | ||
return false; | ||
} | ||
} | ||
|
||
return ok; | ||
} | ||
|
||
bool RPCClient::Proceed() { | ||
void* tag = NULL; | ||
bool ok = false; | ||
|
||
// request counts. | ||
if (!cq_.Next(&tag, &ok)) { | ||
return false; | ||
} | ||
req_count_--; | ||
|
||
GPR_ASSERT(ok); | ||
PADDLE_ENFORCE(tag); | ||
|
||
// TODO(gongwb): add more retries. | ||
ClientBase* c = static_cast<ClientBase*>(tag); | ||
if (!c->status_.ok()) { | ||
delete c; | ||
return true; | ||
} | ||
|
||
c->Process(); | ||
delete c; | ||
return true; | ||
} | ||
|
||
std::shared_ptr<grpc::Channel> RPCClient::GetChannel(const std::string& ep) { | ||
auto it = channels_.find(ep); | ||
if (it != channels_.end()) { | ||
return it->second; | ||
} | ||
|
||
auto ch = std::shared_ptr<grpc::Channel>( | ||
grpc::CreateChannel(ep, grpc::InsecureChannelCredentials())); | ||
|
||
channels_[ep] = ch; | ||
return ch; | ||
} | ||
|
||
} // namespace detail | ||
} // namespace operators | ||
} // namespace paddle |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,147 @@ | ||
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. */ | ||
|
||
#pragma once | ||
|
||
#include <grpc++/grpc++.h> | ||
#include <grpc/support/log.h> | ||
#include <time.h> | ||
#include <chrono> | ||
#include <ctime> | ||
#include <functional> | ||
#include <iostream> | ||
#include <map> | ||
#include <string> | ||
#include <vector> | ||
|
||
#include "paddle/framework/data_type.h" | ||
#include "paddle/framework/lod_tensor.h" | ||
#include "paddle/framework/scope.h" | ||
#include "paddle/framework/selected_rows.h" | ||
#include "paddle/operators/detail/sendrecvop_utils.h" | ||
#include "paddle/operators/detail/simple_block_queue.h" | ||
|
||
namespace paddle { | ||
namespace operators { | ||
namespace detail { | ||
|
||
struct VarHandle { | ||
std::string ep; | ||
const platform::DeviceContext* ctx; | ||
const framework::Scope* scope; | ||
std::string name; | ||
|
||
std::string String() const { | ||
std::ostringstream s; | ||
s << "name:[" << name << "] ep:[" << ep << "]"; | ||
return s.str(); | ||
} | ||
}; | ||
|
||
void ProcGetResponse(const VarHandle& var_h, | ||
const sendrecv::VariableMessage& msg); | ||
|
||
class ClientBase { | ||
public: | ||
explicit ClientBase(std::shared_ptr<grpc::Channel> ch) { | ||
stub_ = sendrecv::SendRecvService::NewStub(ch); | ||
context_ = NULL; | ||
} | ||
|
||
virtual ~ClientBase() {} | ||
|
||
virtual void Prepare(const VarHandle& var_info, int64_t time_out) { | ||
context_.reset(new grpc::ClientContext()); | ||
var_h_ = var_info; | ||
|
||
std::chrono::system_clock::time_point deadline = | ||
std::chrono::system_clock::now() + std::chrono::milliseconds(time_out); | ||
|
||
context_->set_deadline(deadline); | ||
} | ||
|
||
virtual void Process() = 0; | ||
|
||
std::unique_ptr<sendrecv::SendRecvService::Stub> stub_; | ||
std::unique_ptr<grpc::ClientContext> context_; | ||
grpc::Status status_; | ||
VarHandle var_h_; | ||
}; | ||
|
||
typedef std::function<void(const VarHandle&, const sendrecv::VoidMessage&)> | ||
RequestSendCallBack; | ||
|
||
class SendProcessor : public ClientBase { | ||
public: | ||
explicit SendProcessor(std::shared_ptr<grpc::Channel> ch) : ClientBase(ch) {} | ||
|
||
virtual ~SendProcessor() {} | ||
|
||
virtual void Process() { | ||
if (response_call_back_) { | ||
response_call_back_(var_h_, reply_); | ||
} | ||
} | ||
|
||
sendrecv::VoidMessage reply_; | ||
RequestSendCallBack response_call_back_ = NULL; | ||
}; | ||
|
||
typedef std::function<void(const VarHandle&, const sendrecv::VariableMessage&)> | ||
RequestGetCallBack; | ||
|
||
class GetProcessor : public ClientBase { | ||
public: | ||
explicit GetProcessor(std::shared_ptr<grpc::Channel> ch) : ClientBase(ch) {} | ||
|
||
virtual ~GetProcessor() {} | ||
|
||
virtual void Process() { | ||
if (response_call_back_) { | ||
response_call_back_(var_h_, reply_); | ||
} | ||
} | ||
|
||
sendrecv::VariableMessage reply_; | ||
RequestGetCallBack response_call_back_ = ProcGetResponse; | ||
}; | ||
|
||
class RPCClient { | ||
public: | ||
bool AsyncSendVariable(const std::string& ep, | ||
const platform::DeviceContext& ctx, | ||
const framework::Scope& scope, | ||
const std::string& var_name, | ||
int64_t time_out = 600 * 1000); | ||
|
||
bool AsyncGetVariable(const std::string& ep, | ||
const platform::DeviceContext& ctx, | ||
const framework::Scope& scope, | ||
const std::string& var_name, | ||
int64_t time_out = 600 * 1000); | ||
bool wait(); | ||
|
||
private: | ||
bool Proceed(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. By There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. |
||
std::shared_ptr<grpc::Channel> GetChannel(const std::string& ep); | ||
|
||
private: | ||
grpc::CompletionQueue cq_; | ||
std::map<std::string, std::shared_ptr<grpc::Channel>> channels_; | ||
int64_t req_count_ = 0; | ||
}; | ||
|
||
} // namespace detail | ||
} // namespace operators | ||
} // namespace paddle |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think
std::unique_ptr<SendProcessor> s(new SendProcessor(ch));
is a better way.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The memory should not be released and should transformed to Completion queue.