Merge branch 'add_timer' of https://github.com/guru4elephant/Paddle into add_timer

test=develop
6 years ago · 2df1d80767
parent ab2abfc5b2 d16d975372
commit 2df1d80767
1 changed files with 2 additions and 0 deletions
--- a/paddle/fluid/framework/executor_thread_worker.cc
+++ b/paddle/fluid/framework/executor_thread_worker.cc
@ -365,10 +365,12 @@ void AsyncExecutorThreadWorker::SetPSlibPtr(
    std::shared_ptr<paddle::distributed::PSlib> pslib_ptr) {
  _pslib_ptr = pslib_ptr;
 }
 void AsyncExecutorThreadWorker::SetPullDenseThread(
    std::shared_ptr<DensePullThread> dpt) {
  _pull_dense_thread = dpt;
 }
 void AsyncExecutorThreadWorker::TrainOneNetwork() {
  PrepareParams();