returnn 1.20250701.131223__py3-none-any.whl → 1.20250701.140328__py3-none-any.whl

returnn/PKG-INFO

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

returnn/_setup_info_generated.py

@@ -1,2 +1,2 @@
-version = '1.20250701.131223'
-long_version = '1.20250701.131223+git.7346de8'
+version = '1.20250701.140328'
+long_version = '1.20250701.140328+git.6646903'

returnn/util/file_cache.py

@@ -9,7 +9,7 @@ See https://github.com/rwth-i6/returnn/issues/1519 for initial discussion.
 Main class is :class:`FileCache`.
 """
 
-from typing import Any, Collection, Iterable, List, Optional, Tuple, Union
+from typing import Any, Collection, Dict, Iterable, List, Optional, Tuple, Union
 import errno
 import os
 import pathlib
@@ -20,7 +20,7 @@ from dataclasses import dataclass
 from collections import defaultdict
 from contextlib import contextmanager
 import json
-from threading import Thread, Event
+from threading import Lock, Thread, Event
 from returnn.config import Config, get_global_config
 from .basic import expand_env_vars, LockFile, human_bytes_size
 
@@ -527,6 +527,8 @@ class _TouchFilesThread(Thread):
         super().__init__(daemon=True)
         self.stop = Event()
         self.files = defaultdict(int)  # usage counter
+        self.files_lock = Lock()  # lock for self.files/self.locks
+        self.locks: Dict[str, Lock] = {}  # filename -> lock
         self.interval = interval
         self.cache_base_dir = cache_base_dir
         self._is_started = False  # careful: `_started` is already a member of the base class
@@ -534,16 +536,17 @@ class _TouchFilesThread(Thread):
     def run(self):
         """thread main loop"""
         while True:
-            all_files = {}  # dict to have order deterministic
-            for filename in self.files.copy():  # copy dict under GIL to avoid modifications during iteration
-                all_files[filename] = True
-                all_files.update({k: True for k in _all_parent_dirs(filename, base_dir=self.cache_base_dir)})
-            for filename in all_files:
-                try:
-                    os.utime(filename, None)
-                except Exception as exc:
-                    print(f"FileCache: failed updating mtime of {filename}: {exc}")
-                    raise
+            # locks dict copied under GIL
+            locks = self.locks.copy()
+            for filename, lock in locks.items():
+                with lock:
+                    if filename not in self.files:
+                        continue
+                    try:
+                        os.utime(filename, None)
+                    except Exception as exc:
+                        print(f"FileCache: failed updating mtime of {filename}: {exc}")
+                        raise
             if self.stop.wait(self.interval):
                 return
 
@@ -560,18 +563,26 @@ class _TouchFilesThread(Thread):
             to_add = [to_add]
         assert isinstance(to_add, Iterable)
         self.start_once()
-        for file in to_add:
-            self.files[file] += 1
+        # we track the parent directories as well and give them their own locks to be
+        # able to synchronize their deletion with the touch thread
+        files_to_iter = _files_with_parents(to_add, base_dir=self.cache_base_dir)
+        with self.files_lock:  # to avoid that we end up with duplicate locks
+            for file, count in files_to_iter.items():
+                self.files[file] += count
+                if file not in self.locks:
+                    self.locks[file] = Lock()
 
     def files_remove(self, to_remove: Union[str, Iterable[str]]):
         """remove"""
         if isinstance(to_remove, str):
             to_remove = [to_remove]
         assert isinstance(to_remove, Iterable)
-        for filename in to_remove:
-            self.files[filename] -= 1
-            if self.files[filename] <= 0:
-                del self.files[filename]
+        for file, count in _files_with_parents(to_remove, base_dir=self.cache_base_dir).items():
+            with self.locks[file], self.files_lock:
+                self.files[file] -= count
+                if self.files[file] <= 0:
+                    del self.files[file]
+                    del self.locks[file]
 
     @contextmanager
     def files_added_context(self, files: Collection[str]):
@@ -592,3 +603,12 @@ def _all_parent_dirs(filename: str, *, base_dir: str) -> List[str]:
             break
         dirs.append(filename)
     return dirs
+
+
+def _files_with_parents(filenames: Iterable[str], *, base_dir: str) -> Dict[str, int]:
+    res = defaultdict(int)  # dict to have order deterministic
+    for fn in filenames:
+        res[fn] += 1
+        for fn_ in _all_parent_dirs(fn, base_dir=base_dir):
+            res[fn_] += 1
+    return res

{returnn-1.20250701.131223.dist-info → returnn-1.20250701.140328.dist-info}/METADATA

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

{returnn-1.20250701.131223.dist-info → returnn-1.20250701.140328.dist-info}/RECORD

@@ -1,9 +1,9 @@
-returnn/PKG-INFO,sha256=HhZ81gqzWBl944H0m1ciKxs-C22Zrwl8-M-y26f3K3g,5215
+returnn/PKG-INFO,sha256=RByOzAa8sFb4gdGsaWiRUEOlZq3X9qqn4MEF0ziNPNc,5215
 returnn/__init__.py,sha256=biBtRsM0WZ406vShaeH-9WFoqJ8XwTbn6g0EeFJ7l8E,1012
 returnn/__main__.py,sha256=lHyZcu_0yc9f7Vf_Kfdy9PmeU0T76XVXnpalHi5WKro,31740
 returnn/__old_mod_loader__.py,sha256=nvsNY-xELdS_IPNkv66Q9Rmvg4dbGW0-EBRDcCmctos,7654
 returnn/__setup__.py,sha256=22kQn2fh11iPM0hLb2Fy5sLmoU1JGvmDxXRYuRgQkwU,4659
-returnn/_setup_info_generated.py,sha256=_rH7q_mBZ72AY8bymhQmw0zMby7RJjzhyKawprtoaGU,77
+returnn/_setup_info_generated.py,sha256=FycWE5HycEgzbwEzgqhdpFdUBY_4Kg7Rlg43mZCjiBs,77
 returnn/config.py,sha256=3tmKhB6FnQZaNdtcYsiB61JnEY--iZ2qmJ4yq0b6tE0,29140
 returnn/forward_iface.py,sha256=A_OJiaXsX4MlXQRzST86ylyxSUZbC402PQL1REcqHjM,911
 returnn/learning_rate_control.py,sha256=ZvWryAn_tv9DhV8sh1LV3eE34Yltl3On3mYZAG4hR9s,34684
@@ -238,7 +238,7 @@ returnn/util/better_exchook.py,sha256=39yvRecluDgYhViwSkaQ8crJ_cBWI63KeEGuK4RKe5
 returnn/util/bpe.py,sha256=LWFhICZsEOnMwNws0lybPNzKRX6rSr8yKCvP65vjl9Y,19656
 returnn/util/debug.py,sha256=wuRzdg9zB84WWCGyTjmRR_zYypu8gXxlc0nZ6si9OC8,28224
 returnn/util/debug_helpers.py,sha256=0EINLK4uLtoSt5_kHs1M2NIFpMd0S7i4c4rx90U4fJk,2914
-returnn/util/file_cache.py,sha256=wMZvzFGfdy_Kz5cdJCvp8KYX5lw2-N9lIHIuB0ic2qA,26646
+returnn/util/file_cache.py,sha256=15p0daE4KmzO5OvkhDr9cA_zJNbJrX98mnL-2fECtmM,27575
 returnn/util/fsa.py,sha256=k2lJ8tyf_g44Xk1EPVLwDwpP4spoMTqIigDVOWocQHY,59177
 returnn/util/literal_py_to_pickle.py,sha256=3dnjWPeeiDT2xp4bRDgIf9yddx7b1AG7mOKEn_jiSl8,2173
 returnn/util/lru_cache.py,sha256=7Q5H3a8b07E8e1iB7PA9jCpRnxMJZOFS2KO07cy0gqk,11446
@@ -253,8 +253,8 @@ returnn/util/sig_proc.py,sha256=Tjz0VOAVyqu2qDCF5HZ1JjALjcFsHcNkcd96WgZeKfE,7265
 returnn/util/task_system.py,sha256=y4sMVXQ25Qd2z0rx03uOlXlkE-jbCYC1Sjfn-XlraVU,26003
 returnn/util/train_proc_manager.py,sha256=Pjht28k6uz6BNQ47uW6Gf880iyq5q4wx7P_K2tmoAM8,3266
 returnn/util/watch_memory.py,sha256=BR5P2kvBN6UI81cE0_1WAA6Hd1SByLbBaiDxvLhPOew,4213
-returnn-1.20250701.131223.dist-info/LICENSE,sha256=ywBD_U2aD4vpuoIgNAsjIGBYydl0tVKll3De0Z8s77c,11041
-returnn-1.20250701.131223.dist-info/METADATA,sha256=HhZ81gqzWBl944H0m1ciKxs-C22Zrwl8-M-y26f3K3g,5215
-returnn-1.20250701.131223.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-returnn-1.20250701.131223.dist-info/top_level.txt,sha256=Lsn4WZc5Pbfk0-xDQOgnFCxOoqxL4CyeM3N1TFbJncw,8
-returnn-1.20250701.131223.dist-info/RECORD,,
+returnn-1.20250701.140328.dist-info/LICENSE,sha256=ywBD_U2aD4vpuoIgNAsjIGBYydl0tVKll3De0Z8s77c,11041
+returnn-1.20250701.140328.dist-info/METADATA,sha256=RByOzAa8sFb4gdGsaWiRUEOlZq3X9qqn4MEF0ziNPNc,5215
+returnn-1.20250701.140328.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+returnn-1.20250701.140328.dist-info/top_level.txt,sha256=Lsn4WZc5Pbfk0-xDQOgnFCxOoqxL4CyeM3N1TFbJncw,8
+returnn-1.20250701.140328.dist-info/RECORD,,