returnn 1.20240905.152045__tar.gz → 1.20240905.172412__tar.gz

{returnn-1.20240905.152045 → returnn-1.20240905.172412}/PKG-INFO

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

returnn-1.20240905.172412/_setup_info_generated.py

@@ -0,0 +1,2 @@
+version = '1.20240905.172412'
+long_version = '1.20240905.172412+git.fb9d5c3'

{returnn-1.20240905.152045 → returnn-1.20240905.172412}/returnn/frontend/_backend.py

@@ -957,6 +957,11 @@ class Backend(Generic[T]):
         """slice"""
         raise NotImplementedError
 
+    @staticmethod
+    def flip(source: Tensor, *, axis: Dim) -> Tensor:
+        """flip"""
+        raise NotImplementedError
+
     @staticmethod
     def where(
         cond: Tensor,

{returnn-1.20240905.152045 → returnn-1.20240905.172412}/returnn/frontend/array_.py

@@ -723,11 +723,14 @@ def slice(
     :param axis:
     :param start:
     :param end:
-    :param step:
+    :param step: we only support a positive step here. If you want to flip the sequence,
+        use :func:`reverse_sequence`, maybe with ``handle_dynamic_dims=False``.
     :param size:
     :param out_dim:
     :return: tensor, out_dim
     """
+    if isinstance(step, int) and step <= 0:
+        raise ValueError(f"rf.slice with non-positive step {step} not supported")
     if not out_dim:
         # Note: We cover not really all possible cases here but just those we really support.
         # (Actually, it might still be a superset of cases we really support,
@@ -794,14 +797,21 @@ def shift_right(source: Tensor, *, axis: Dim, pad_value: Union[rf.RawTensorTypes
     return padded_slice
 
 
-def reverse_sequence(tensor: Tensor, *, axis: Dim) -> Tensor:
+def reverse_sequence(tensor: Tensor, *, axis: Dim, handle_dynamic_dims: bool = True) -> Tensor:
     """
     Similar as tf.reverse_sequence, or Torch flip (but taking seq lengths into account).
 
     :param tensor:
     :param axis:
+    :param handle_dynamic_dims: if True, the dynamic dims will be handled correctly,
+        i.e. a padded seq "a b c <pad>" will be reversed to "c b a <pad>".
+        If False, the dynamic dims will be handled as if they are static,
+        i.e. a padded seq "a b c <pad>" will be reversed to "<pad> c b a".
     :return: reversed tensor, same dims
     """
+    if not handle_dynamic_dims or not axis.need_masking():
+        # noinspection PyProtectedMember
+        return tensor._raw_backend.flip(tensor, axis=axis)
     indices = rf.combine_bc(axis.get_size_tensor(), "-", rf.range_over_dim(axis)) - 1
     return rf.gather(tensor, indices=indices, axis=axis, clip_to_valid=True)
 

{returnn-1.20240905.152045 → returnn-1.20240905.172412}/returnn/tf/frontend_layers/_backend.py

@@ -695,6 +695,13 @@ class ReturnnLayersBackend(Backend[Layer]):
             {"class": "slice", "from": source, "axis": axis, "out_dim": out_dim, **args}, name="slice"
         )
 
+    @staticmethod
+    def flip(source: Tensor, *, axis: Dim) -> Tensor:
+        """flip"""
+        return rfl.make_layer(
+            {"class": "slice", "from": source, "axis": axis, "out_dim": axis, "slice_step": -1}, name="flip"
+        )
+
     @staticmethod
     def where(
         cond: Tensor,

{returnn-1.20240905.152045 → returnn-1.20240905.172412}/returnn/torch/frontend/_backend.py

@@ -1096,6 +1096,14 @@ class TorchBackend(Backend[torch.Tensor]):
             out.raw_tensor = torch.narrow(source.raw_tensor, dim=axis_int, start=start, length=end - start)
         return out
 
+    @staticmethod
+    def flip(source: Tensor, *, axis: Dim) -> Tensor:
+        """flip"""
+        axis_int = source.get_axis_from_description(axis, allow_int=False)
+        out = source.copy_template("flip")
+        out.raw_tensor = torch.flip(source.raw_tensor, [axis_int])
+        return out
+
     @staticmethod
     def where(
         cond: Tensor,

{returnn-1.20240905.152045 → returnn-1.20240905.172412}/returnn.egg-info/PKG-INFO

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

{returnn-1.20240905.152045 → returnn-1.20240905.172412}/tests/test_rf_array.py

@@ -398,6 +398,23 @@ def test_reverse_sequence():
     run_model(extern_data, lambda *, epoch, step: _Net(), _forward_step)
 
 
+def test_reverse_sequence_no_dyn():
+    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):
+        out = rf.reverse_sequence(extern_data["data"], axis=time_dim, handle_dynamic_dims=False)
+        out.mark_as_default_output(shape=(batch_dim, time_dim, in_dim))
+
+    run_model(extern_data, lambda *, epoch, step: rf.Module(), _forward_step)
+
+
 def test_where():
     time_dim = Dim(Tensor("time", [batch_dim], dtype="int32"))
     in_dim = Dim(7, name="in")

returnn-1.20240905.152045/_setup_info_generated.py

@@ -1,2 +0,0 @@
-version = '1.20240905.152045'
-long_version = '1.20240905.152045+git.c0f3741'