returnn 1.20250119.205709__tar.gz → 1.20250122.105051__tar.gz

{returnn-1.20250119.205709/returnn.egg-info → returnn-1.20250122.105051}/PKG-INFO

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

returnn-1.20250122.105051/_setup_info_generated.py

@@ -0,0 +1,2 @@
+version = '1.20250122.105051'
+long_version = '1.20250122.105051+git.e0ca139'

{returnn-1.20250119.205709 → returnn-1.20250122.105051}/returnn/torch/frontend/_backend.py

@@ -1171,6 +1171,9 @@ class TorchBackend(Backend[torch.Tensor]):
             start = 0
         if isinstance(size, Dim):
             size = size.get_dim_value()
+        elif isinstance(size, Tensor):
+            assert size.dims == ()  # scalar
+            size = size.raw_tensor
         if size is not None:
             assert end is None
             out.raw_tensor = torch.narrow(source.raw_tensor, dim=axis_int, start=start, length=size)

{returnn-1.20250119.205709 → returnn-1.20250122.105051}/returnn/util/better_exchook.py

@@ -239,8 +239,8 @@ def set_linecache(filename, source):
 # noinspection PyShadowingBuiltins
 def simple_debug_shell(globals, locals):
     """
-    :param dict[str] globals:
-    :param dict[str] locals:
+    :param dict[str,typing.Any] globals:
+    :param dict[str,typing.Any] locals:
     :return: nothing
     """
     try:
@@ -288,8 +288,8 @@ def debug_shell(user_ns, user_global_ns, traceback=None, execWrapper=None):
     Spawns some interactive shell. Tries to use IPython if available.
     Falls back to :func:`pdb.post_mortem` or :func:`simple_debug_shell`.
 
-    :param dict[str] user_ns:
-    :param dict[str] user_global_ns:
+    :param dict[str,typing.Any] user_ns:
+    :param dict[str,typing.Any] user_global_ns:
     :param traceback:
     :param execWrapper:
     :return: nothing
@@ -460,7 +460,7 @@ def get_source_code(filename, lineno, module_globals=None):
     """
     :param str filename:
     :param int lineno:
-    :param dict[str]|None module_globals:
+    :param dict[str,typing.Any]|None module_globals:
     :return: source code of that line (including newline)
     :rtype: str
     """
@@ -693,7 +693,8 @@ class Color:
         ops = ".,;:+-*/%&!=|(){}[]^<>"
         i = 0
         cur_token = ""
-        color_args = {0: {}, len(s): {}}  # type: typing.Dict[int,typing.Dict[str]]  # pos in s -> color kwargs
+        # pos in s -> color kwargs
+        color_args = {0: {}, len(s): {}}  # type: typing.Dict[int,typing.Dict[str,typing.Any]]
 
         def finish_identifier():
             """
@@ -1008,7 +1009,7 @@ class _OutputLinesCollector:
 
     def pretty_print(self, obj):
         """
-        :param object obj:
+        :param typing.Any obj:
         :rtype: str
         """
         s = repr(obj)
@@ -1031,15 +1032,28 @@ class _OutputLinesCollector:
 
 # For compatibility, we keep non-PEP8 argument names.
 # noinspection PyPep8Naming
-def format_tb(tb=None, limit=None, allLocals=None, allGlobals=None, withTitle=False, with_color=None, with_vars=None):
+def format_tb(
+    tb=None,
+    limit=None,
+    allLocals=None,
+    allGlobals=None,
+    withTitle=False,
+    with_color=None,
+    with_vars=None,
+    clear_frames=True,
+):
     """
     :param types.TracebackType|types.FrameType|StackSummary tb: traceback. if None, will use sys._getframe
     :param int|None limit: limit the traceback to this number of frames. by default, will look at sys.tracebacklimit
-    :param dict[str]|None allLocals: if set, will update it with all locals from all frames
-    :param dict[str]|None allGlobals: if set, will update it with all globals from all frames
+    :param dict[str,typing.Any]|None allLocals: if set, will update it with all locals from all frames
+    :param dict[str,typing.Any]|None allGlobals: if set, will update it with all globals from all frames
     :param bool withTitle:
     :param bool|None with_color: output with ANSI escape codes for color
     :param bool with_vars: will print var content which are referenced in the source code line. by default enabled.
+    :param bool clear_frames: whether to call frame.clear() after processing it.
+        That will potentially fix some mem leaks regarding locals, so it can be important.
+        Also see https://github.com/python/cpython/issues/113939.
+        However, any further access to frame locals will not work (e.g. if you want to use a debugger afterwards).
     :return: list of strings (line-based)
     :rtype: list[str]
     """
@@ -1115,8 +1129,8 @@ def format_tb(tb=None, limit=None, allLocals=None, allGlobals=None, withTitle=Fa
 
         def _resolve_identifier(namespace, keys):
             """
-            :param dict[str] namespace:
-            :param tuple[str] keys:
+            :param dict[str,typing.Any] namespace:
+            :param typing.Sequence[str] keys:
             :return: namespace[name[0]][name[1]]...
             """
             if keys[0] not in namespace:
@@ -1227,16 +1241,17 @@ def format_tb(tb=None, limit=None, allLocals=None, allGlobals=None, withTitle=Fa
                 else:
                     output(color("    -- code not available --", color.fg_colors[0]))
 
-            # Just like :func:`traceback.clear_frames`, but has an additional fix
-            # (https://github.com/python/cpython/issues/113939).
-            try:
-                f.clear()
-            except RuntimeError:
-                pass
-            else:
-                # Using this code triggers that the ref actually goes out of scope, otherwise it does not!
-                # https://github.com/python/cpython/issues/113939
-                f.f_locals  # noqa
+            if clear_frames:
+                # Just like :func:`traceback.clear_frames`, but has an additional fix
+                # (https://github.com/python/cpython/issues/113939).
+                try:
+                    f.clear()
+                except RuntimeError:
+                    pass
+                else:
+                    # Using this code triggers that the ref actually goes out of scope, otherwise it does not!
+                    # https://github.com/python/cpython/issues/113939
+                    f.f_locals  # noqa
 
             if isframe(_tb):
                 _tb = _tb.f_back
@@ -1329,6 +1344,13 @@ def better_exchook(
     if file is None:
         file = sys.stderr
 
+    if autodebugshell:
+        # noinspection PyBroadException
+        try:
+            debugshell = int(os.environ["DEBUG"]) != 0
+        except Exception:
+            pass
+
     color = Color(enable=with_color)
     output = _OutputLinesCollector(color=color)
 
@@ -1369,6 +1391,7 @@ def better_exchook(
                 allGlobals=all_globals,
                 withTitle=True,
                 with_color=color.enable,
+                clear_frames=not debugshell,
             )
         )
     else:
@@ -1451,14 +1474,9 @@ def better_exchook(
         file.write(line)
     file.flush()
 
-    if autodebugshell:
-        # noinspection PyBroadException
-        try:
-            debugshell = int(os.environ["DEBUG"]) != 0
-        except Exception:
-            pass
     if debugshell:
-        output("---------- DEBUG SHELL -----------")
+        file.write("---------- DEBUG SHELL -----------\n")
+        file.flush()
         debug_shell(user_ns=all_locals, user_global_ns=all_globals, traceback=tb)
 
 

{returnn-1.20250119.205709 → returnn-1.20250122.105051/returnn.egg-info}/PKG-INFO

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

{returnn-1.20250119.205709 → returnn-1.20250122.105051}/tests/test_rf_array.py

@@ -542,6 +542,26 @@ def test_slice():
     run_model(extern_data, lambda *, epoch, step: _Net(), _forward_step)
 
 
+def test_slice_dyn_size():
+    time_dim = Dim(Tensor("time", [batch_dim], dtype="int32"))
+    in_dim = Dim(7, name="in")
+    extern_data = TensorDict(
+        {
+            "data": Tensor("data", [batch_dim, time_dim, in_dim], dtype="float32"),
+        }
+    )
+
+    # noinspection PyShadowingNames
+    def _forward_step(*, extern_data: TensorDict, **_kwargs):
+        x = extern_data["data"]
+        size = time_dim.get_size_tensor()
+        size = rf.reduce_min(size, axis=size.dims)  # do whatever, but get some scalar
+        pack, new_time = rf.slice(x, axis=time_dim, size=size)
+        pack.mark_as_default_output(shape=(batch_dim, new_time, in_dim))
+
+    run_model(extern_data, lambda **_kwargs: rf.Module(), _forward_step)
+
+
 def test_shift_right():
     time_dim = Dim(Tensor("time", [batch_dim], dtype="int32"))
     in_dim = Dim(7, name="in")

returnn-1.20250119.205709/_setup_info_generated.py

@@ -1,2 +0,0 @@
-version = '1.20250119.205709'
-long_version = '1.20250119.205709+git.d3c7c3c'