From 22aacbfd6c19cf8145134910d8c89497f84b15df Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Wed, 21 Dec 2016 16:33:01 +0800
Subject: [PATCH] Add const to GradientMachine::eval

---
 paddle/gserver/gradientmachines/GradientMachine.h            | 2 +-
 paddle/gserver/gradientmachines/MultiGradientMachine.cpp     | 2 +-
 paddle/gserver/gradientmachines/MultiGradientMachine.h       | 2 +-
 paddle/gserver/gradientmachines/MultiNetwork.cpp             | 2 +-
 paddle/gserver/gradientmachines/MultiNetwork.h               | 2 +-
 paddle/gserver/gradientmachines/NeuralNetwork.cpp            | 2 +-
 paddle/gserver/gradientmachines/NeuralNetwork.h              | 2 +-
 paddle/gserver/gradientmachines/RecurrentGradientMachine.cpp | 2 +-
 paddle/gserver/gradientmachines/RecurrentGradientMachine.h   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/paddle/gserver/gradientmachines/GradientMachine.h b/paddle/gserver/gradientmachines/GradientMachine.h
index 579eca71d4..873b89e3fc 100644
--- a/paddle/gserver/gradientmachines/GradientMachine.h
+++ b/paddle/gserver/gradientmachines/GradientMachine.h
@@ -186,7 +186,7 @@ public:
   /**
    * evaluate using the given evaluator
    */
-  virtual void eval(Evaluator* evaluator) = 0;
+  virtual void eval(Evaluator* evaluator) const = 0;
 
   std::vector<ParameterPtr>& getParameters() { return parameters_; }
 
diff --git a/paddle/gserver/gradientmachines/MultiGradientMachine.cpp b/paddle/gserver/gradientmachines/MultiGradientMachine.cpp
index 88c098b355..a34316c57a 100644
--- a/paddle/gserver/gradientmachines/MultiGradientMachine.cpp
+++ b/paddle/gserver/gradientmachines/MultiGradientMachine.cpp
@@ -331,7 +331,7 @@ Evaluator* MultiGradientMachine::makeEvaluator() {
   return threads_[0]->getGradientMachine()->makeEvaluator();
 }
 
-void MultiGradientMachine::eval(Evaluator* evaluator) {
+void MultiGradientMachine::eval(Evaluator* evaluator) const {
   for (auto& thread : threads_) {
     SetDevice device(thread->getDeviceId());
     thread->getGradientMachine()->eval(evaluator);
diff --git a/paddle/gserver/gradientmachines/MultiGradientMachine.h b/paddle/gserver/gradientmachines/MultiGradientMachine.h
index 5f9855c4be..f2b074e393 100644
--- a/paddle/gserver/gradientmachines/MultiGradientMachine.h
+++ b/paddle/gserver/gradientmachines/MultiGradientMachine.h
@@ -195,7 +195,7 @@ public:
 
   virtual Evaluator* makeEvaluator();
 
-  virtual void eval(Evaluator* evaluator);
+  virtual void eval(Evaluator* evaluator) const;
 
   bool useGpu() const { return useGpu_; }
 
diff --git a/paddle/gserver/gradientmachines/MultiNetwork.cpp b/paddle/gserver/gradientmachines/MultiNetwork.cpp
index 6eb3d8db96..33100c842b 100644
--- a/paddle/gserver/gradientmachines/MultiNetwork.cpp
+++ b/paddle/gserver/gradientmachines/MultiNetwork.cpp
@@ -181,6 +181,6 @@ Evaluator* MultiNetwork::makeEvaluator() {
   return multiCombinedEvaluator;
 }
 
-void MultiNetwork::eval(Evaluator* evaluator) { evaluator->eval(*this); }
+void MultiNetwork::eval(Evaluator* evaluator) const { evaluator->eval(*this); }
 
 }  // namespace paddle
diff --git a/paddle/gserver/gradientmachines/MultiNetwork.h b/paddle/gserver/gradientmachines/MultiNetwork.h
index 89fbf32b4f..93b8b5d2ba 100644
--- a/paddle/gserver/gradientmachines/MultiNetwork.h
+++ b/paddle/gserver/gradientmachines/MultiNetwork.h
@@ -48,7 +48,7 @@ public:
 
   virtual Evaluator* makeEvaluator();
 
-  virtual void eval(Evaluator* evaluator);
+  virtual void eval(Evaluator* evaluator) const;
 
   const std::vector<std::unique_ptr<NeuralNetwork>>& getSubNetworks() const {
     return subNetworks_;
diff --git a/paddle/gserver/gradientmachines/NeuralNetwork.cpp b/paddle/gserver/gradientmachines/NeuralNetwork.cpp
index ee36a87b9d..98d0bcac79 100644
--- a/paddle/gserver/gradientmachines/NeuralNetwork.cpp
+++ b/paddle/gserver/gradientmachines/NeuralNetwork.cpp
@@ -383,7 +383,7 @@ Evaluator* NeuralNetwork::makeEvaluator() {
   return combinedEvaluator;
 }
 
-void NeuralNetwork::eval(Evaluator* evaluator) { evaluator->eval(*this); }
+void NeuralNetwork::eval(Evaluator* evaluator) const { evaluator->eval(*this); }
 
 void NeuralNetwork::setOutputGrad(const std::vector<Argument>& args) {
   CHECK_GE(outputLayers_.size(), args.size());
diff --git a/paddle/gserver/gradientmachines/NeuralNetwork.h b/paddle/gserver/gradientmachines/NeuralNetwork.h
index 384ca88f47..3a07e0bc9f 100644
--- a/paddle/gserver/gradientmachines/NeuralNetwork.h
+++ b/paddle/gserver/gradientmachines/NeuralNetwork.h
@@ -98,7 +98,7 @@ public:
 
   virtual Evaluator* makeEvaluator();
 
-  virtual void eval(Evaluator* evaluator);
+  virtual void eval(Evaluator* evaluator) const;
   virtual void resetState();
   virtual void setOutputGrad(const std::vector<Argument>& args);
 
diff --git a/paddle/gserver/gradientmachines/RecurrentGradientMachine.cpp b/paddle/gserver/gradientmachines/RecurrentGradientMachine.cpp
index 8f68b3d66b..a9a9f4f903 100644
--- a/paddle/gserver/gradientmachines/RecurrentGradientMachine.cpp
+++ b/paddle/gserver/gradientmachines/RecurrentGradientMachine.cpp
@@ -593,7 +593,7 @@ void RecurrentGradientMachine::forwardBackward(
   LOG(FATAL) << "should not use this function";
 }
 
-void RecurrentGradientMachine::eval(Evaluator* evaluator) {
+void RecurrentGradientMachine::eval(Evaluator* evaluator) const {
   // call printers frame by frame
   for (int i = 0; i < maxSequenceLength_; ++i) {
     LOG(INFO) << "Recurrent Layer Group eval frame " << i << " begin";
diff --git a/paddle/gserver/gradientmachines/RecurrentGradientMachine.h b/paddle/gserver/gradientmachines/RecurrentGradientMachine.h
index db7d8aff6d..910ca4376b 100644
--- a/paddle/gserver/gradientmachines/RecurrentGradientMachine.h
+++ b/paddle/gserver/gradientmachines/RecurrentGradientMachine.h
@@ -63,7 +63,7 @@ public:
                        const UpdateCallback& callback);
 
   virtual void resetState() {}
-  virtual void eval(Evaluator* evaluator);
+  virtual void eval(Evaluator* evaluator) const;
 
   const std::vector<int>& getParameterIds() { return parameterIds_; }
 
-- 
GitLab