returnn 1.20250318.201955__py3-none-any.whl → 1.20250318.214311__py3-none-any.whl

returnn/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: returnn
-Version: 1.20250318.201955
+Version: 1.20250318.214311
 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.20250318.201955'
-long_version = '1.20250318.201955+git.abd2339'
+version = '1.20250318.214311'
+long_version = '1.20250318.214311+git.0d4a307'

returnn/util/better_exchook.py

@@ -930,31 +930,36 @@ class _OutputLinesCollector:
         self.lines = []
         self.dom_term = DomTerm() if DomTerm.is_domterm() else None
 
-    def __call__(self, s1, s2=None, **kwargs):
+    def __call__(self, s1, s2=None, merge_into_prev=True, **kwargs):
         """
         Adds to self.lines.
         This strange function signature is for historical reasons.
 
         :param str s1:
         :param str|None s2:
+        :param bool merge_into_prev: if True and existing self.lines, merge into prev line.
         :param kwargs: passed to self.color
         """
         if kwargs:
             s1 = self.color(s1, **kwargs)
         if s2 is not None:
             s1 = add_indent_lines(s1, s2)
-        self.lines.append(s1 + "\n")
+        if merge_into_prev and self.lines:
+            self.lines[-1] += s1 + "\n"
+        else:
+            self.lines.append(s1 + "\n")
 
     @contextlib.contextmanager
-    def fold_text_ctx(self, line):
+    def fold_text_ctx(self, line, merge_into_prev=True):
         """
         Folds text, via :class:`DomTerm`, if available.
         Notes that this temporarily overwrites self.lines.
 
         :param str line: always visible
+        :param bool merge_into_prev: if True and existing self.lines, merge into prev line.
         """
         if not self.dom_term:
-            self.__call__(line)
+            self.__call__(line, merge_into_prev=merge_into_prev)
             yield
             return
         self.lines, old_lines = [], self.lines  # overwrite self.lines
@@ -970,7 +975,10 @@ class _OutputLinesCollector:
             line = line[1:]
         self.dom_term.fold_text(line, hidden=hidden_text, file=output_buf, align=len(prefix))
         output_text = prefix[1:] + output_buf.getvalue()
-        self.lines.append(output_text)
+        if merge_into_prev and self.lines:
+            self.lines[-1] += output_text
+        else:
+            self.lines.append(output_text)
 
     def _pp_extra_info(self, obj, depth_limit=3):
         """
@@ -1197,7 +1205,7 @@ def format_tb(
                     name,
                 ]
             )
-            with output.fold_text_ctx(file_descr):
+            with output.fold_text_ctx(file_descr, merge_into_prev=False):
                 source_code = get_source_code(filename, lineno, f.f_globals)
                 if source_code:
                     source_code = remove_indent_lines(replace_tab_indents(source_code)).rstrip()

{returnn-1.20250318.201955.dist-info → returnn-1.20250318.214311.dist-info}/METADATA

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

{returnn-1.20250318.201955.dist-info → returnn-1.20250318.214311.dist-info}/RECORD

@@ -1,9 +1,9 @@
-returnn/PKG-INFO,sha256=d6PnUuTfcVen-TJZ3Y_2BNUjSVxwFTuHx_-i8q6NuZU,5215
+returnn/PKG-INFO,sha256=ad2i6uCYdaa6fq8vzbwhfZfT_h_Baai_WZp3-gABaSg,5215
 returnn/__init__.py,sha256=biBtRsM0WZ406vShaeH-9WFoqJ8XwTbn6g0EeFJ7l8E,1012
 returnn/__main__.py,sha256=qBFbuB1yN3adgVM5pXt2-Yq9vorjRNchNPL8kDKx44M,31752
 returnn/__old_mod_loader__.py,sha256=nvsNY-xELdS_IPNkv66Q9Rmvg4dbGW0-EBRDcCmctos,7654
 returnn/__setup__.py,sha256=22kQn2fh11iPM0hLb2Fy5sLmoU1JGvmDxXRYuRgQkwU,4659
-returnn/_setup_info_generated.py,sha256=zg-b8R0BfZ75dBXNiCqQLGn_bpnb5eVwXMdNpCX8mAg,77
+returnn/_setup_info_generated.py,sha256=QxRiQyIvJSPE6v4w_WN2ZTQAJzkql4VUcgu5L3ijZTU,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
@@ -234,7 +234,7 @@ returnn/torch/util/module.py,sha256=MXHIrF9Isu575DDJIa81212ULKwdqu1oOLxDVZecVSk,
 returnn/torch/util/scaled_gradient.py,sha256=3585VuNypBty-pW6r3BKK047H3MqZQSdMjXeYAb4cmU,3192
 returnn/util/__init__.py,sha256=UIG1qw4idqhW71BV60ha7h9PktxvEVcBIu0lYRossK8,336
 returnn/util/basic.py,sha256=eLlzR-ARGWJoiyRb5-SH5v2zx1jgR_5vuQ5jwYO5Cww,142380
-returnn/util/better_exchook.py,sha256=LoJEVQo9Hhd0X1_PzHVyvG0uwW9T7yvMKspfb_ngLb8,63433
+returnn/util/better_exchook.py,sha256=TAtb_ZyM-357UnOg_HMoBZUSxzt0WPgumlvprmlCprA,63921
 returnn/util/bpe.py,sha256=LWFhICZsEOnMwNws0lybPNzKRX6rSr8yKCvP65vjl9Y,19656
 returnn/util/debug.py,sha256=wuRzdg9zB84WWCGyTjmRR_zYypu8gXxlc0nZ6si9OC8,28224
 returnn/util/debug_helpers.py,sha256=0EINLK4uLtoSt5_kHs1M2NIFpMd0S7i4c4rx90U4fJk,2914
@@ -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.20250318.201955.dist-info/LICENSE,sha256=ywBD_U2aD4vpuoIgNAsjIGBYydl0tVKll3De0Z8s77c,11041
-returnn-1.20250318.201955.dist-info/METADATA,sha256=d6PnUuTfcVen-TJZ3Y_2BNUjSVxwFTuHx_-i8q6NuZU,5215
-returnn-1.20250318.201955.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-returnn-1.20250318.201955.dist-info/top_level.txt,sha256=Lsn4WZc5Pbfk0-xDQOgnFCxOoqxL4CyeM3N1TFbJncw,8
-returnn-1.20250318.201955.dist-info/RECORD,,
+returnn-1.20250318.214311.dist-info/LICENSE,sha256=ywBD_U2aD4vpuoIgNAsjIGBYydl0tVKll3De0Z8s77c,11041
+returnn-1.20250318.214311.dist-info/METADATA,sha256=ad2i6uCYdaa6fq8vzbwhfZfT_h_Baai_WZp3-gABaSg,5215
+returnn-1.20250318.214311.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+returnn-1.20250318.214311.dist-info/top_level.txt,sha256=Lsn4WZc5Pbfk0-xDQOgnFCxOoqxL4CyeM3N1TFbJncw,8
+returnn-1.20250318.214311.dist-info/RECORD,,