use GradientMachine::start and finish

PaddlePaddle · Jun 26, 2017 · 9f05a0f · 9f05a0f
1 parent 55684af
commit 9f05a0f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/paddle/gserver/gradientmachines/MultiGradientMachine.cpp b/paddle/gserver/gradientmachines/MultiGradientMachine.cpp
@@ -166,12 +166,16 @@ MultiGradientMachine::MultiGradientMachine(const ModelConfig& config,
 
   outArgStream_ = HPPL_STREAM_1;
 
+  start();
+}
+
+void MultiGradientMachine::start() {
   for (auto& thread : threads_) {
     thread->start();
   }
 }
 
-MultiGradientMachine::~MultiGradientMachine() {
+void MultiGradientMachine::finish() {
   for (auto& thread : threads_) {
     thread->stop();
   }
@@ -445,14 +449,18 @@ TrainerThread::TrainerThread(const ModelConfig& config,
 
   gradStream_ = HPPL_STREAM_2;
   valueStream_ = HPPL_STREAM_3;
-  stopping_ = false;
+  stopping_ = true;
   updateCounter_ = 0;
   parameterUpdated_ = false;
 }
 
 TrainerThread::~TrainerThread() { stop(); }
 
 void TrainerThread::start() {
+  if (!stopping_) return;
+
+  stopping_ = false;
+
   gradientMachine_->start();
 
   computeThread_.reset(new std::thread([this]() { computeThread(); }));

diff --git a/paddle/gserver/gradientmachines/MultiGradientMachine.h b/paddle/gserver/gradientmachines/MultiGradientMachine.h
@@ -176,7 +176,9 @@ class MultiGradientMachine : public GradientMachine {
 
   explicit MultiGradientMachine(const ModelConfig& config, bool useGpu);
 
-  virtual ~MultiGradientMachine();
+  virtual void start();
+
+  virtual void finish();
 
   virtual void prefetch(const std::vector<Argument>& inArgs);