Merge branch 'fix/resumeTrainingKeras' into devel

- closes #1150 - fixes #1138
tqdm · May 3, 2021 · 9aea3ae · 9aea3ae
2 parents d9372a2 + 74ec622
commit 9aea3ae
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/tests/tests_keras.py b/tests/tests_keras.py
@@ -38,9 +38,7 @@ def test_keras(capsys):
                 desc="training",
                 data_size=len(x),
                 batch_size=batch_size,
-                verbose=0,
-            )],
-    )
+                verbose=0)])
     _, res = capsys.readouterr()
     assert "training: " in res
     assert "{epochs}/{epochs}".format(epochs=epochs) in res
@@ -59,9 +57,7 @@ def test_keras(capsys):
                 desc="training",
                 data_size=len(x),
                 batch_size=batch_size,
-                verbose=2,
-            )],
-    )
+                verbose=2)])
     _, res = capsys.readouterr()
     assert "training: " in res
     assert "{epochs}/{epochs}".format(epochs=epochs) in res
@@ -74,9 +70,24 @@ def test_keras(capsys):
         epochs=epochs,
         batch_size=batch_size,
         verbose=False,
-        callbacks=[TqdmCallback(desc="training", verbose=2)],
-    )
+        callbacks=[TqdmCallback(desc="training", verbose=2)])
     _, res = capsys.readouterr()
     assert "training: " in res
     assert "{epochs}/{epochs}".format(epochs=epochs) in res
     assert "{batches}/{batches}".format(batches=batches) in res
+
+    # continue training (start from epoch != 0)
+    initial_epoch = 3
+    model.fit(
+        x,
+        x,
+        initial_epoch=initial_epoch,
+        epochs=epochs,
+        batch_size=batch_size,
+        verbose=False,
+        callbacks=[TqdmCallback(desc="training", verbose=0,
+                                miniters=1, mininterval=0, maxinterval=0)])
+    _, res = capsys.readouterr()
+    assert "training: " in res
+    assert "{epochs}/{epochs}".format(epochs=initial_epoch - 1) not in res
+    assert "{epochs}/{epochs}".format(epochs=epochs) in res
diff --git a/tqdm/keras.py b/tqdm/keras.py
@@ -69,10 +69,13 @@ def __init__(self, epochs=None, data_size=None, batch_size=None, verbose=1,
     def on_train_begin(self, *_, **__):
         params = self.params.get
         auto_total = params('epochs', params('nb_epoch', None))
-        if auto_total is not None:
+        if auto_total is not None and auto_total != self.epoch_bar.total:
             self.epoch_bar.reset(total=auto_total)
 
-    def on_epoch_begin(self, *_, **__):
+    def on_epoch_begin(self, epoch, *_, **__):
+        if self.epoch_bar.n < epoch:
+            ebar = self.epoch_bar
+            ebar.n = ebar.last_print_n = ebar.initial = epoch
         if self.verbose:
             params = self.params.get
             total = params('samples', params(