Skip to content

Fix grpc short connection #8409

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 12, 2018
Merged

Fix grpc short connection #8409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions paddle/fluid/operators/listen_and_serv_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ class ListenAndServOp : public framework::OperatorBase {
return string::Sprintf("%s.trainer_%d", varname, grads_counter_[varname]++);
}

void Run(const framework::Scope &scope,
const platform::Place &dev_place) const override {
void RunImpl(const framework::Scope &scope,
const platform::Place &dev_place) const override {
platform::DeviceContextPool &pool = platform::DeviceContextPool::Instance();
auto &dev_ctx = *pool.Get(dev_place);
framework::Scope &recv_scope = scope.NewScope();
Expand Down
4 changes: 2 additions & 2 deletions paddle/fluid/operators/recv_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class RecvOp : public framework::OperatorBase {
const framework::AttributeMap& attrs)
: OperatorBase(type, inputs, outputs, attrs) {}

void Run(const framework::Scope& scope,
const platform::Place& place) const override {
void RunImpl(const framework::Scope& scope,
const platform::Place& place) const override {
auto outs = Outputs("Out");
std::vector<std::string> epmap = Attr<std::vector<std::string>>("epmap");

Expand Down
4 changes: 2 additions & 2 deletions paddle/fluid/operators/send_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ class SendOp : public framework::OperatorBase {
const framework::AttributeMap& attrs)
: OperatorBase(type, inputs, outputs, attrs) {}

void Run(const framework::Scope& scope,
const platform::Place& place) const override {
void RunImpl(const framework::Scope& scope,
const platform::Place& place) const override {
auto ins = Inputs("X");
auto outs = Outputs("Out");
std::vector<std::string> epmap = Attr<std::vector<std::string>>("epmap");
Expand Down
11 changes: 3 additions & 8 deletions python/paddle/v2/fluid/distribute_transpiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ def split_dense_variable(var_list,
block_size += dim1 - remains
# update split_count after aligning
split_count = int(math.ceil(var_numel / float(block_size)))
print("###split var ", var.name, var.shape, block_size, split_count)
for block_id in xrange(split_count):
curr_block_size = min(block_size, var_numel - (
(block_id) * block_size))
Expand Down Expand Up @@ -207,7 +206,7 @@ def transpile(self,

rpc_client_var = program.global_block().create_var(
name="RPC_CLIENT_VAR",
psersistable=True,
persistable=True,
dtype='float32', # dtype and shape is not used in fact
shape=[0])

Expand Down Expand Up @@ -256,15 +255,13 @@ def _create_vars_from_blocklist(self, program, block_list):
splited_shape = [rows]
if len(orig_shape) >= 2:
splited_shape.extend(orig_shape[1:])
print("###splited: ", size, rows, splited_shape)
var = program.global_block().create_var(
name="%s.block%d" % (varname, i),
psersistable=False,
persistable=False,
dtype=orig_var.dtype,
type=orig_var.type,
shape=splited_shape) # flattend splited var
var_mapping[varname].append(var)
print("###created split var ", var)
return var_mapping

def _clone_var(self, block, var):
Expand Down Expand Up @@ -322,7 +319,7 @@ def _create_var_for_trainers(self, block, var, trainers):
for i in xrange(trainers):
var_each = block.create_var(
name="%s.trainer_%d" % (var.name, i),
psersistable=var.persistable,
persistable=var.persistable,
dtype=var.dtype,
type=var.type,
shape=var.shape)
Expand Down Expand Up @@ -531,8 +528,6 @@ def get_pserver_program(self, endpoint):
"""
# step5
pserver_program = Program()
print("param mapping on pserver: #### ",
self.param_grad_ep_mapping[endpoint]["params"])
for v in self.param_grad_ep_mapping[endpoint]["params"]:
self._clone_var(pserver_program.global_block(), v)
for v in self.param_grad_ep_mapping[endpoint]["grads"]:
Expand Down