returnn 1.20241106.173429__tar.gz → 1.20241111.122914__tar.gz

{returnn-1.20241106.173429 → returnn-1.20241111.122914}/PKG-INFO

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

returnn-1.20241111.122914/_setup_info_generated.py

@@ -0,0 +1,2 @@
+version = '1.20241111.122914'
+long_version = '1.20241111.122914+git.d6d11d1'

{returnn-1.20241106.173429 → returnn-1.20241111.122914}/returnn/torch/data/returnn_dataset_wrapper.py

@@ -45,7 +45,7 @@ class ReturnnDatasetResetMpSharedEpochCallback:
     def __call__(self):
         # dataset is likely a copy of the original dataset, either in the main process or in a worker process
         # Use epoch_mp_shared to get the current epoch correctly in worked processes
-        epoch = self.epoch_mp_shared.value
+        epoch = self.epoch_mp_shared.value or None
         self.dataset.init_seq_order(epoch=epoch)
 
 

{returnn-1.20241106.173429 → returnn-1.20241111.122914}/returnn/torch/engine.py

@@ -248,7 +248,7 @@ class Engine(EngineBase):
         print(
             f"Starting training at epoch {self._start_epoch}, global train step {self.global_train_step}", file=log.v3
         )
-        self.epoch = self._start_epoch - 1
+        self.set_epoch(self._start_epoch - 1)
         while self.epoch + 1 <= self._final_epoch:
             self.set_epoch(self.epoch + 1)
             self.init_train_epoch()
@@ -966,7 +966,7 @@ class Engine(EngineBase):
             # We decremented the step above.
             epoch += 1
             step += 1
-        self.epoch = epoch  # in training, this will be reset to start_epoch
+        self.set_epoch(epoch)  # in training, this will be reset to start_epoch
         self.global_train_step = step
 
         load_model_post_hooks = self.config.typed_value("load_model_post_hooks")
@@ -1276,7 +1276,7 @@ class Engine(EngineBase):
                 if not self._is_dataset_evaluated(name=name, epoch=epoch):
                     raise Exception(f"Scores of epoch {epoch} for {name} are missing.")
 
-        self.epoch = self._start_epoch - 1
+        self.set_epoch(self._start_epoch - 1)
         if not self._is_dataset_evaluated(name="train"):
             raise Exception(f"Scores of last train epoch {self.epoch} are missing.")
         for name in self.eval_datasets.keys():

{returnn-1.20241106.173429 → returnn-1.20241111.122914}/returnn/util/file_cache.py

@@ -327,7 +327,7 @@ class FileCache:
         # Copy the file, while holding a lock. See comment on lock_timeout above.
         with LockFile(
             directory=dst_dir, name=os.path.basename(dst_filename) + ".lock", lock_timeout=self._lock_timeout
-        ) as lock:
+        ) as lock, self._touch_files_thread.files_added_context(lock.lockfile):
             # Maybe it was copied in the meantime, while waiting for the lock.
             if self._check_existing_copied_file_maybe_cleanup(src_filename, dst_filename):
                 print(f"FileCache: using existing file {dst_filename}")
@@ -349,7 +349,7 @@ class FileCache:
                     f" to be older than {self._lock_timeout * 0.8:.1f}s but it is {dst_tmp_file_age} seconds old"
                 )
 
-            with self._touch_files_thread.files_added_context([dst_dir, lock.lockfile]):
+            with self._touch_files_thread.files_added_context(dst_dir):
                 # save mtime before the copy process to have it pessimistic
                 orig_mtime_ns = os.stat(src_filename).st_mtime_ns
                 FileInfo(mtime_ns=orig_mtime_ns).save(self._get_info_filename(dst_filename))

{returnn-1.20241106.173429 → returnn-1.20241111.122914}/returnn.egg-info/PKG-INFO

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

{returnn-1.20241106.173429 → returnn-1.20241111.122914}/tests/test_torch_engine.py

@@ -479,6 +479,7 @@ def test_min_seq_len():
     dataset.initialize()
     dataset.init_seq_order(epoch=1)
     engine = Engine(config=config)
+    engine.set_epoch(1)
     data_loader = engine._create_data_loader(dataset)
     for _ in data_loader:
         assert False, "Should not contain sequences"
@@ -488,6 +489,7 @@ def test_min_seq_len():
     dataset.initialize()
     dataset.init_seq_order(epoch=1)
     engine = Engine(config=config)
+    engine.set_epoch(1)
     data_loader = engine._create_data_loader(dataset)
     for _ in data_loader:
         return
@@ -502,6 +504,7 @@ def test_max_seq_len():
     dataset.initialize()
     dataset.init_seq_order(epoch=1)
     engine = Engine(config=config)
+    engine.set_epoch(1)
     data_loader = engine._create_data_loader(dataset)
     for _ in data_loader:
         assert False, "Should not contain sequences"
@@ -511,6 +514,7 @@ def test_max_seq_len():
     dataset.initialize()
     dataset.init_seq_order(epoch=1)
     engine = Engine(config=config)
+    engine.set_epoch(1)
     data_loader = engine._create_data_loader(dataset)
     for _ in data_loader:
         return
@@ -527,6 +531,7 @@ def test_data_loader_oggzip():
     with create_ogg_zip_txt_only_dataset_mult_seqs(num_seqs=ds_num_seqs, max_seq_len=ds_max_seq_len) as dataset:
         dataset.init_seq_order(epoch=1)
         engine = Engine(config=config)
+        engine.set_epoch(1)
         data_loader = engine._create_data_loader(dataset)
         num_batches = 0
         num_seqs = 0
@@ -551,6 +556,7 @@ def test_data_loader_oggzip():
     with create_ogg_zip_txt_only_dataset_mult_seqs(num_seqs=ds_num_seqs, max_seq_len=ds_max_seq_len) as dataset:
         dataset.init_seq_order(epoch=1)
         engine = Engine(config=config)
+        engine.set_epoch(1)
         data_loader = engine._create_data_loader(dataset)
         for batch in data_loader:
             assert isinstance(batch, dict)

returnn-1.20241106.173429/_setup_info_generated.py

@@ -1,2 +0,0 @@
-version = '1.20241106.173429'
-long_version = '1.20241106.173429+git.0f87197'