returnn 1.20230411.132032__tar.gz → 1.20230411.133415__tar.gz

{returnn-1.20230411.132032/returnn.egg-info → returnn-1.20230411.133415}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: returnn
-Version: 1.20230411.132032
+Version: 1.20230411.133415
 Summary: The RWTH extensible training framework for universal recurrent neural networks
 Home-page: https://github.com/rwth-i6/returnn/
 Author: Albert Zeyer

returnn-1.20230411.133415/_setup_info_generated.py

@@ -0,0 +1,2 @@
+version = '1.20230411.133415'
+long_version = '1.20230411.133415+git.9593d64'

{returnn-1.20230411.132032 → returnn-1.20230411.133415}/demos/demo-iter-dataset.py

@@ -36,10 +36,10 @@ def iterate_epochs():
     """
     Iterate through epochs.
     """
-    start_epoch, start_batch = EngineBase.get_train_start_epoch_batch(config)
+    start_epoch = EngineBase.get_train_start_epoch(config)
     final_epoch = EngineBase.config_get_final_epoch(config)
 
-    print("Starting with epoch %i, batch %i." % (start_epoch, start_batch), file=log.v3)
+    print("Starting with epoch %i." % (start_epoch,), file=log.v3)
     print("Final epoch is: %i" % final_epoch, file=log.v3)
 
     recurrent_net = "lstm" in config.value("hidden_type", "")  # good enough...

{returnn-1.20230411.132032 → returnn-1.20230411.133415}/returnn/engine/base.py

@@ -4,9 +4,9 @@ Provides :class:`EngineBase`.
 
 from __future__ import annotations
 
+from typing import Optional
 import os
 import sys
-from typing import Optional
 
 from returnn.config import Config, get_global_config
 from returnn.learning_rate_control import load_learning_rate_control_from_config, LearningRateControl
@@ -164,35 +164,27 @@ class EngineBase(object):
         return epoch_model
 
     @classmethod
-    def get_train_start_epoch_batch(cls, config):
+    def get_train_start_epoch(cls, config: Config) -> int:
         """
         We will always automatically determine the best start (epoch,batch) tuple
         based on existing model files.
         This ensures that the files are present and enforces that there are
         no old outdated files which should be ignored.
         Note that epochs start at idx 1 and batches at idx 0.
-        :type config: returnn.config.Config
-        :returns (epoch,batch)
-        :rtype (int,int)
+
+        :param config:
+        :return: epoch
         """
         start_batch_mode = config.value("start_batch", "auto")
-        if start_batch_mode == "auto":
-            start_batch_config = None
-        else:
-            start_batch_config = int(start_batch_mode)
+        if start_batch_mode != "auto":
+            raise Exception(f"custom start_batch {start_batch_mode!r} not supported")
         last_epoch, _ = cls.get_epoch_model(config)
         if last_epoch is None:
             start_epoch = 1
-            start_batch = start_batch_config or 0
-        elif start_batch_config is not None:
-            # We specified a start batch. Stay in the same epoch, use that start batch.
-            start_epoch = last_epoch
-            start_batch = start_batch_config
         else:
             # Start with next epoch.
             start_epoch = last_epoch + 1
-            start_batch = 0
-        return start_epoch, start_batch
+        return start_epoch
 
     @classmethod
     def epoch_model_filename(cls, model_filename, epoch, is_pretrain):

{returnn-1.20230411.132032 → returnn-1.20230411.133415}/returnn/sprint/interface.py

@@ -355,8 +355,8 @@ def getSegmentList(corpusName, segmentList, **kwargs):
     sprintDataset.use_multiple_epochs()
 
     finalEpoch = get_final_epoch()
-    startEpoch, startSegmentIdx = Engine.get_train_start_epoch_batch(config)
-    print("Sprint: Starting with epoch %i, segment-idx %s." % (startEpoch, startSegmentIdx))
+    startEpoch = Engine.get_train_start_epoch(config)
+    print("Sprint: Starting with epoch %i." % (startEpoch,))
     print("Final epoch is: %i" % finalEpoch)
 
     # Loop over multiple epochs. Epochs start at 1.

{returnn-1.20230411.132032 → returnn-1.20230411.133415}/returnn/tf/engine.py

@@ -1105,7 +1105,7 @@ class Engine(EngineBase):
         if config.has("eval_datasets"):
             for dataset_name, dataset_opts in config.typed_value("eval_datasets", {}).items():
                 self.eval_datasets[dataset_name] = init_dataset(dataset_opts, default_kwargs={"name": dataset_name})
-        self.start_epoch, self.start_batch = self.get_train_start_epoch_batch(config)
+        self.start_epoch = self.get_train_start_epoch(config)
         self.batch_size = config.typed_value("batch_size", 1)
         self.shuffle_batches = config.bool("shuffle_batches", False)
         self.update_batch_size = config.int("update_batch_size", 0)
@@ -1577,7 +1577,7 @@ class Engine(EngineBase):
         """
         Does the whole training, i.e. the loop over all the epochs.
         """
-        print("start training at epoch %i and step %i" % (self.start_epoch, self.start_batch), file=log.v3)
+        print("start training at epoch %i" % (self.start_epoch,), file=log.v3)
         print("using batch size: %r, max seqs: %i" % (self.batch_size, self.max_seqs), file=log.v4)
         print("learning rate control:", self.learning_rate_control, file=log.v4)
         print("pretrain:", self.pretrain, file=log.v4)

{returnn-1.20230411.132032 → returnn-1.20230411.133415}/returnn/torch/engine.py

@@ -90,7 +90,7 @@ class Engine(EngineBase):
         for dataset_name, dataset in self.eval_datasets.items():
             self._eval_dataloaders[dataset_name] = self._create_data_loader(dataset)
 
-        self._start_epoch, _ = self.get_train_start_epoch_batch(self.config)
+        self._start_epoch = self.get_train_start_epoch(self.config)
         self._final_epoch = self.config_get_final_epoch(self.config)
 
         self._load_model(epoch=self._start_epoch)

{returnn-1.20230411.132032 → returnn-1.20230411.133415/returnn.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: returnn
-Version: 1.20230411.132032
+Version: 1.20230411.133415
 Summary: The RWTH extensible training framework for universal recurrent neural networks
 Home-page: https://github.com/rwth-i6/returnn/
 Author: Albert Zeyer

returnn-1.20230411.132032/_setup_info_generated.py

@@ -1,2 +0,0 @@
-version = '1.20230411.132032'
-long_version = '1.20230411.132032+git.a9faea2'