fix predictor interfaces.

odashi · Apr 21, 2017 · 72a3f92 · 72a3f92
1 parent e733504
commit 72a3f92
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/nmtkit/binary_code_predictor.cc b/nmtkit/binary_code_predictor.cc
@@ -25,14 +25,17 @@ BinaryCodePredictor::BinaryCodePredictor(
 , loss_type_(loss_type)
 , converter_({input_size, ecc->getNumBits(bc->getNumBits())}, model) {}
 
-void BinaryCodePredictor::prepare(dynet::ComputationGraph * cg) {
+void BinaryCodePredictor::prepare(
+    dynet::ComputationGraph * cg,
+    const bool /* is_training */) {
   converter_.prepare(cg);
 }
 
 DE::Expression BinaryCodePredictor::computeLoss(
     const DE::Expression & input,
     const vector<unsigned> & target_ids,
-    dynet::ComputationGraph * cg) {
+    dynet::ComputationGraph * cg,
+    const bool /* is_training */) {
   const unsigned batch_size = target_ids.size();
 
   // Retrieves target bits.

diff --git a/nmtkit/binary_code_predictor.h b/nmtkit/binary_code_predictor.h
@@ -44,12 +44,15 @@ class BinaryCodePredictor : public Predictor {
 
   ~BinaryCodePredictor() override {}
 
-  void prepare(dynet::ComputationGraph * cg) override;
+  void prepare(
+      dynet::ComputationGraph * cg,
+      const bool is_training) override;
 
   dynet::expr::Expression computeLoss(
       const dynet::expr::Expression & input,
       const std::vector<unsigned> & target_ids,
-      dynet::ComputationGraph * cg) override;
+      dynet::ComputationGraph * cg,
+      const bool is_training) override;
 
   std::vector<Predictor::Result> predictKBest(
       const dynet::expr::Expression & input,

diff --git a/nmtkit/hybrid_predictor.cc b/nmtkit/hybrid_predictor.cc
@@ -33,14 +33,17 @@ HybridPredictor::HybridPredictor(
 , converter_(
     {input_size, softmax_size + ecc->getNumBits(bc->getNumBits())}, model) {}
 
-void HybridPredictor::prepare(dynet::ComputationGraph * cg) {
+void HybridPredictor::prepare(
+    dynet::ComputationGraph * cg,
+    const bool /* is_training */) {
   converter_.prepare(cg);
 }
 
 DE::Expression HybridPredictor::computeLoss(
     const DE::Expression & input,
     const vector<unsigned> & target_ids,
-    dynet::ComputationGraph * cg) {
+    dynet::ComputationGraph * cg,
+    const bool /* is_training */) {
   const unsigned batch_size = target_ids.size();
 
   // Calculates inner variables.

diff --git a/nmtkit/hybrid_predictor.h b/nmtkit/hybrid_predictor.h
@@ -50,12 +50,15 @@ class HybridPredictor : public Predictor {
 
   ~HybridPredictor() override {}
 
-  void prepare(dynet::ComputationGraph * cg) override;
+  void prepare(
+      dynet::ComputationGraph * cg,
+      const bool is_training) override;
 
   dynet::expr::Expression computeLoss(
       const dynet::expr::Expression & input,
       const std::vector<unsigned> & target_ids,
-      dynet::ComputationGraph * cg) override;
+      dynet::ComputationGraph * cg,
+      const bool is_training) override;
 
   std::vector<Predictor::Result> predictKBest(
       const dynet::expr::Expression & input,