returnn 1.20241218.180627__tar.gz → 1.20241219.123408__tar.gz

{returnn-1.20241218.180627/returnn.egg-info → returnn-1.20241219.123408}/PKG-INFO

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

returnn-1.20241219.123408/_setup_info_generated.py

@@ -0,0 +1,2 @@
+version = '1.20241219.123408'
+long_version = '1.20241219.123408+git.037d844'

{returnn-1.20241218.180627 → returnn-1.20241219.123408}/returnn/__main__.py

@@ -577,16 +577,16 @@ def execute_main_task():
                 assert data, "set forward_data"
             else:
                 data = init_dataset(config.opt_typed_value("forward_data"))
-            # engine.epoch is usually the epoch of the loaded checkpoint,
-            # or what EngineBase.get_epoch_model will return.
-            # You can have both load and load_epoch, where load points to the checkpoint,
-            # and load_epoch is some other epoch, which you will get here for the dataset.
-            data.init_seq_order(epoch=engine.epoch or 1)
             forward_callback = config.typed_value("forward_callback")
             assert forward_callback, "no forward_callback specified"
             if callable(forward_callback):
                 forward_callback = forward_callback()
             allow_skipping_seqs = config.bool("allow_skipping_seqs_in_forward", False)
+            # engine.epoch is usually the epoch of the loaded checkpoint,
+            # or what EngineBase.get_epoch_model will return.
+            # You can have both load and load_epoch, where load points to the checkpoint,
+            # and load_epoch is some other epoch, which you will get here for the dataset.
+            # data.init_seq_order will be called inside. (Maybe the dataset is first moved to a subproc.)
             engine.forward_with_callback(
                 dataset=data, callback=forward_callback, allow_skipping_seqs=allow_skipping_seqs
             )

{returnn-1.20241218.180627 → returnn-1.20241219.123408}/returnn/torch/engine.py

@@ -1169,15 +1169,20 @@ class Engine(EngineBase):
         self._maybe_reset_dev_memory_caches()
         self._reset_dev_memory_stats()
 
-        if dataset.supports_seq_order_sorting():
-            # We can sort it. Sort it in reverse to make sure that we have enough memory right at the beginning.
-            print("Dataset supports sorting, i.e. it will be sorted for optimal performance.", file=log.v3)
-            dataset.seq_ordering = "sorted_reverse"
-        else:
-            print(
-                "Dataset does not support sorting, i.e. it will not be sorted for optimal performance.",
-                file=log.v3,
-            )
+        if dataset_init_epoch:
+            if not self.config.bool("sort_dataset", True):
+                pass
+            elif dataset.seq_ordering == "sorted_reverse":
+                pass
+            elif dataset.supports_seq_order_sorting():
+                # We can sort it. Sort it in reverse to make sure that we have enough memory right at the beginning.
+                print("Dataset supports sorting, i.e. it will be sorted for optimal performance.", file=log.v3)
+                dataset.seq_ordering = "sorted_reverse"
+            else:
+                print(
+                    "Dataset does not support sorting, i.e. it will not be sorted for optimal performance.",
+                    file=log.v3,
+                )
 
         if allow_skipping_seqs:
             # Dangerous! If you enable this, you could lose sequences,

{returnn-1.20241218.180627 → returnn-1.20241219.123408/returnn.egg-info}/PKG-INFO

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

returnn-1.20241218.180627/_setup_info_generated.py

@@ -1,2 +0,0 @@
-version = '1.20241218.180627'
-long_version = '1.20241218.180627+git.66b9681'