Skip to content

Commit 5a0c659

Browse files
committed
revert RequestGetHandler
1 parent 8422076 commit 5a0c659

File tree

1 file changed

+14
-18
lines changed

1 file changed

+14
-18
lines changed

paddle/fluid/operators/distributed/request_handler_impl.cc

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -100,25 +100,21 @@ bool RequestGetHandler::Handle(const std::string& varname,
100100
}
101101
} else {
102102
if (varname != FETCH_BARRIER_MESSAGE && varname != COMPLETE_MESSAGE) {
103-
PADDLE_THROW(
104-
"async mode should not send FETCH_BARRIER_MESSAGE or "
105-
"COMPLETE_MESSAGE");
106-
}
107-
108-
if (enable_dc_asgd_) {
109-
// NOTE: the format is determined by distributed_transpiler.py
110-
std::string param_bak_name =
111-
string::Sprintf("%s.trainer_%d_bak", varname, trainer_id);
112-
VLOG(3) << "getting " << param_bak_name << " trainer_id " << trainer_id;
113-
auto var = scope_->FindVar(varname);
114-
auto t_orig = var->Get<framework::LoDTensor>();
115-
auto param_bak = scope_->Var(param_bak_name);
116-
auto t = param_bak->GetMutable<framework::LoDTensor>();
117-
t->mutable_data(dev_ctx_->GetPlace(), t_orig.type());
118-
VLOG(3) << "copying " << varname << " to " << param_bak_name;
119-
framework::TensorCopy(t_orig, dev_ctx_->GetPlace(), t);
103+
if (enable_dc_asgd_) {
104+
// NOTE: the format is determined by distributed_transpiler.py
105+
std::string param_bak_name =
106+
string::Sprintf("%s.trainer_%d_bak", varname, trainer_id);
107+
VLOG(3) << "getting " << param_bak_name << " trainer_id " << trainer_id;
108+
auto var = scope_->FindVar(varname);
109+
auto t_orig = var->Get<framework::LoDTensor>();
110+
auto param_bak = scope_->Var(param_bak_name);
111+
auto t = param_bak->GetMutable<framework::LoDTensor>();
112+
t->mutable_data(dev_ctx_->GetPlace(), t_orig.type());
113+
VLOG(3) << "copying " << varname << " to " << param_bak_name;
114+
framework::TensorCopy(t_orig, dev_ctx_->GetPlace(), t);
115+
}
116+
*outvar = scope_->FindVar(varname);
120117
}
121-
*outvar = scope_->FindVar(varname);
122118
}
123119
return true;
124120
}

0 commit comments

Comments
 (0)