Remove deprecated Trainer::update_epoch

It was deprecated in clab#695.
tetsuok · Sep 3, 2017 · 4569924 · 4569924
1 parent 87df341
commit 4569924
Show file tree

Hide file tree

Showing 18 changed files with 17 additions and 18 deletions.
diff --git a/examples/cpp/embed-cl/train_embed-cl.cc b/examples/cpp/embed-cl/train_embed-cl.cc
@@ -156,7 +156,7 @@ int main(int argc, char** argv) {
     for (unsigned i = 0; i < report_every_i; ++i) {
       if (si == training.size()) {
         si = 0;
-        if (first) { first = false; } else { sgd->update_epoch(); }
+        if (first) { first = false; }
         cerr << "**SHUFFLE\n";
         random_shuffle(order.begin(), order.end());
       }

diff --git a/examples/cpp/encdec/train_encdec.cc b/examples/cpp/encdec/train_encdec.cc
@@ -164,7 +164,7 @@ int main(int argc, char** argv) {
   // Run for the given number of epochs (or indefinitely if params.NUM_EPOCHS is negative)
   while (epoch < params.NUM_EPOCHS || params.NUM_EPOCHS < 0) {
     // Update the optimizer
-    if (first) { first = false; } else { adam->update_epoch(); }
+    if (first) { first = false; }
     // Reshuffle the dataset
     cerr << "**SHUFFLE\n";
     random_shuffle(order.begin(), order.end());

diff --git a/examples/cpp/imdb/train_imdb.cc b/examples/cpp/imdb/train_imdb.cc
@@ -265,7 +265,7 @@ int main(int argc, char** argv) {
     for (unsigned i = 0; i < report_every_i; ++i) {
       if (si == training.size()) {
         si = 0;
-        if (first) { first = false; } else { sgd->update_epoch(); }
+        if (first) { first = false; }
         cerr << "**SHUFFLE\n";
         shuffle(order.begin(), order.end(), *rndeng);
       }

diff --git a/examples/cpp/mlc/train_mlc.cc b/examples/cpp/mlc/train_mlc.cc
@@ -145,7 +145,7 @@ int main(int argc, char** argv) {
     for (unsigned i = 0; i < report_every_i; ++i) {
       if (si == train.size()) {
         si = 0;
-        if (first) { first = false; } else { sgd.update_epoch(); }
+        if (first) { first = false; }
         cerr << "**SHUFFLE\n";
         shuffle(order.begin(), order.end(), *rndeng);
       }

diff --git a/examples/cpp/mnist/train_mnist.cc b/examples/cpp/mnist/train_mnist.cc
@@ -88,7 +88,7 @@ int main(int argc, char** argv) {
   // Run for the given number of epochs (or indefinitely if params.NUM_EPOCHS is negative)
   while (epoch < params.NUM_EPOCHS || params.NUM_EPOCHS < 0) {
     // Update the optimizer
-    if (first) { first = false; } else { adam.update_epoch(); }
+    if (first) { first = false; }
     // Reshuffle the dataset
     cerr << "**SHUFFLE\n";
     random_shuffle(order.begin(), order.end());

diff --git a/examples/cpp/poisson-regression/train_poisson-regression.cc b/examples/cpp/poisson-regression/train_poisson-regression.cc
@@ -159,7 +159,7 @@ int main(int argc, char** argv) {
     for (unsigned i = 0; i < report_every_i; ++i) {
       if (si == training.size()) {
         si = 0;
-        if (first) { first = false; } else { sgd->update_epoch(); }
+        if (first) { first = false; }
         cerr << "**SHUFFLE\n";
         shuffle(order.begin(), order.end(), *rndeng);
       }

diff --git a/examples/cpp/rnnlm-aevb/train_rnnlm-aevb.cc b/examples/cpp/rnnlm-aevb/train_rnnlm-aevb.cc
@@ -206,7 +206,7 @@ int main(int argc, char** argv) {
     for (unsigned i = 0; i < report_every_i; ++i) {
       if (si == training.size()) {
         si = 0;
-        if (first) { first = false; } else { sgd->update_epoch(); }
+        if (first) { first = false; }
         cerr << "**SHUFFLE\n";
         shuffle(order.begin(), order.end(), *rndeng);
       }

diff --git a/examples/cpp/rnnlm-batch/train_rnnlm-batch.cc b/examples/cpp/rnnlm-batch/train_rnnlm-batch.cc
@@ -160,7 +160,7 @@ int main(int argc, char** argv) {
   // Run for the given number of epochs (or indefinitely if params.NUM_EPOCHS is negative)
   while (epoch < params.NUM_EPOCHS || params.NUM_EPOCHS < 0) {
     // Update the optimizer
-    if (first) { first = false; } else { adam->update_epoch(); }
+    if (first) { first = false; }
     // Reshuffle the dataset
     cerr << "**SHUFFLE\n";
     random_shuffle(order.begin(), order.end());

diff --git a/examples/cpp/rnnlm-cfsm/train_rnnlm-cfsm.cc b/examples/cpp/rnnlm-cfsm/train_rnnlm-cfsm.cc
@@ -169,7 +169,7 @@ int main(int argc, char** argv) {
     for (unsigned i = 0; i < report_every_i; ++i) {
       if (si == training.size()) {
         si = 0;
-        if (first) { first = false; } else { sgd->update_epoch(); }
+        if (first) { first = false; }
         cerr << "**SHUFFLE\n";
         shuffle(order.begin(), order.end(), *rndeng);
       }

diff --git a/examples/cpp/rnnlm-final-batch/train_rnnlm-final-batch.cc b/examples/cpp/rnnlm-final-batch/train_rnnlm-final-batch.cc
@@ -219,7 +219,7 @@ int main(int argc, char** argv) {
     for (unsigned i = 0; i < report_every_i; ++i, ++si) {
       if (si == order.size()) {
         si = 0;
-        if (first) { first = false; } else { sgd->update_epoch(); }
+        if (first) { first = false; }
         cerr << "**SHUFFLE\n";
         shuffle(order.begin(), order.end(), *rndeng);
       }

diff --git a/examples/cpp/rnnlm-givenbag/rnnlm-givenbag.cc b/examples/cpp/rnnlm-givenbag/rnnlm-givenbag.cc
@@ -191,7 +191,7 @@ int main(int argc, char** argv) {
     for (unsigned i = 0; i < report_every_i; ++i) {
       if (si == training.size()) {
         si = 0;
-        if (first) { first = false; } else { sgd->update_epoch(); }
+        if (first) { first = false; }
         cerr << "**SHUFFLE\n";
         shuffle(order.begin(), order.end(), *rndeng);
       }

diff --git a/examples/cpp/rnnlm/train_rnnlm.cc b/examples/cpp/rnnlm/train_rnnlm.cc
@@ -265,7 +265,7 @@ int main(int argc, char** argv) {
       for (unsigned i = 0; i < report_every_i; ++i) {
         if (si == training.size()) {
           si = 0;
-          if (first) { first = false; } else { sgd->update_epoch(); }
+          if (first) { first = false; }
           cerr << "**SHUFFLE\n";
           completed_epoch++;
           if (eta_decay_onset_epoch && completed_epoch >= (int)eta_decay_onset_epoch)

diff --git a/examples/cpp/segrnn-sup/train_segrnn-sup.cc b/examples/cpp/segrnn-sup/train_segrnn-sup.cc
@@ -1105,7 +1105,7 @@ int main(int argc, char** argv) {
       for (unsigned i = 0; i < report_every_i; ++i) {
         if (si == training.size()) {
           si = 0;
-          if (first) { first = false; } else { sgd->update_epoch(); }
+          if (first) { first = false; }
           cerr << "**SHUFFLE\n";
           shuffle(order.begin(), order.end(), *rndeng);
         }

diff --git a/examples/cpp/skiprnnlm/train_skiprnnlm.cc b/examples/cpp/skiprnnlm/train_skiprnnlm.cc
@@ -153,7 +153,7 @@ int main(int argc, char** argv) {
         for (unsigned i = 0; i < report_every_i; ++i) {
             if (si == training.size()) {
                 si = 0;
-                if (first) { first = false; } else { sgd->update_epoch(); }
+                if (first) { first = false; }
                 LOG(INFO) << "**SHUFFLE\n";
                 shuffle(order.begin(), order.end(), *rndeng);
             }

diff --git a/examples/cpp/tag-bilstm/train_tag-bilstm.cc b/examples/cpp/tag-bilstm/train_tag-bilstm.cc
@@ -215,7 +215,7 @@ int main(int argc, char** argv) {
     for (unsigned i = 0; i < report_every_i; ++i) {
       if (si == training.size()) {
         si = 0;
-        if (first) { first = false; } else { sgd->update_epoch(); }
+        if (first) { first = false; }
         cerr << "**SHUFFLE\n";
         shuffle(order.begin(), order.end(), *rndeng);
       }

diff --git a/examples/cpp/textcat/train_textcat.cc b/examples/cpp/textcat/train_textcat.cc
@@ -262,7 +262,7 @@ int main(int argc, char** argv) {
     for (unsigned i = 0; i < report_every_i; ++i) {
       if (si == training.size()) {
         si = 0;
-        if (first) { first = false; } else { sgd->update_epoch(); }
+        if (first) { first = false; }
         cerr << "**SHUFFLE\n";
         shuffle(order.begin(), order.end(), *rndeng);
       }

diff --git a/examples/cpp/tok-embed/train_tok-embed.cc b/examples/cpp/tok-embed/train_tok-embed.cc
@@ -274,7 +274,7 @@ int main(int argc, char** argv) {
     for (unsigned i = 0; i < report_every_i; ++i) {
       if (si == training.size()) {
         si = 0;
-        if (first) { first = false; } else { sgd->update_epoch(); }
+        if (first) { first = false; }
         cerr << "**SHUFFLE\n";
         shuffle(order.begin(), order.end(), *rndeng);
       }

diff --git a/examples/cpp/xor-xent/train_xor-xent.cc b/examples/cpp/xor-xent/train_xor-xent.cc
@@ -60,7 +60,6 @@ int main(int argc, char** argv) {
       cg.backward(loss_expr);
       sgd.update();
     }
-    sgd.update_epoch();
     loss /= 4;
     cerr << "E = " << loss << endl;
   }