returnn 1.20230603.14810__tar.gz → 1.20230609.101111__tar.gz

{returnn-1.20230603.14810/returnn.egg-info → returnn-1.20230609.101111}/PKG-INFO

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

returnn-1.20230609.101111/_setup_info_generated.py

@@ -0,0 +1,2 @@
+version = '1.20230609.101111'
+long_version = '1.20230609.101111+git.6e147f0'

{returnn-1.20230603.14810 → returnn-1.20230609.101111}/returnn/frontend/run_ctx.py

@@ -207,8 +207,6 @@ class RunCtx:
         tensor = tensor.copy(name=name)
         assert name not in self.outputs.data
         self.outputs.data[name] = tensor
-        # noinspection PyProtectedMember
-        backend = tensor._raw_backend
 
         if expected_output:
             # Perform sanity checks using the expected output.
@@ -219,29 +217,32 @@ class RunCtx:
             # e.g. dynamic dims.
             # Thus, we allow undefined dims in the expected output,
             # and ignore them when checking for equality.
+            # The most important thing for the user is to define what dims are dynamic and what dims are static.
+            # This is also necessary for ONNX export.
             assert len(expected_output.dims) == len(tensor.dims), (
                 f"mark_as_output: lengths of expected output {expected_output.dims}"
                 f" and actual output {tensor.dims} don't match."
             )
-            for axis, (expected_dim, actual_dim) in enumerate(zip(expected_output.dims, tensor.dims)):
+            for expected_dim, actual_dim in zip(expected_output.dims, tensor.dims):
                 expected_dim: Dim
                 actual_dim: Dim
                 if not expected_dim.is_dim_known():
-                    continue  # ignore undefined dims
-                assert expected_dim == actual_dim, (
-                    f"mark_as_output {name!r}: expected output {expected_output} does not match {tensor}, "
-                    f"expected {expected_dim}, got {actual_dim}"
-                )
-                if expected_dim.dyn_size_ext and expected_dim.dyn_size_ext.raw_tensor is None:
-                    if expected_dim.dyn_size_ext.batch_ndim == 0:
-                        # Automatically infer the expected dim from the actual output
-                        expected_dim.dyn_size_ext.raw_tensor = backend.convert_to_tensor(
-                            backend.get_shape_tuple_raw(tensor.raw_tensor)[axis],
-                            dims=(),
-                            dtype=expected_dim.dyn_size_ext.dtype,
-                        ).raw_tensor
-                    else:
-                        raise Exception(f"mark_as_output {name!r}: expected {expected_dim} dyn_size_ext to be defined")
+                    assert actual_dim.is_dynamic(), (
+                        f"mark_as_output: expected dim {expected_dim} doesn't have a known value."
+                        f" Matching actual dim assumed to be dynamic, but got non-dynamic dim {actual_dim}."
+                    )
+                elif expected_dim.is_dynamic():
+                    assert actual_dim.is_dynamic(), (
+                        f"mark_as_output: expected dim {expected_dim} is dynamic."
+                        f" Matching actual dim assumed to be dynamic, but got non-dynamic dim {actual_dim}."
+                    )
+                elif expected_dim.is_static():
+                    assert expected_dim.is_static() and actual_dim.dimension == expected_dim.dimension, (
+                        f"mark_as_output: expected dim {expected_dim} is static."
+                        f" Matching actual dim assumed to be the same static dim value, but got {actual_dim}."
+                    )
+                else:
+                    assert False, f"mark_as_output: unexpected expected dim {expected_dim}."
             assert expected_output.dtype == tensor.dtype, (
                 f"mark_as_output: {name!r} dtype mismatch from expected output,"
                 f" given {tensor.dtype}, expected {expected_output.dtype}"

{returnn-1.20230603.14810 → returnn-1.20230609.101111/returnn.egg-info}/PKG-INFO

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

returnn-1.20230603.14810/_setup_info_generated.py

@@ -1,2 +0,0 @@
-version = '1.20230603.014810'
-long_version = '1.20230603.014810+git.d343279'