explicit parameter handling

Fix #82

Author: albertz

nn/array_.py

@@ -27,8 +27,10 @@ def cum_concat_step(
   Concatenates all previous frames of a time-axis.
   See RETURNN :class:`CumConcatLayer` for details.
   """
-  from ._generated_layers import _cum_concat
-  return _cum_concat(source=source, state=state, out_spatial_dim=out_spatial_dim, name=name)
+  from ._generated_layers import rec_cum_concat
+  return rec_cum_concat(
+    source=source, axis=nn.single_step_dim,
+    state=state, out_spatial_dim=out_spatial_dim, name=name)
 
 
 def split(source: nn.LayerRef, *,
@@ -40,9 +42,16 @@ def split(source: nn.LayerRef, *,
   Basically a wrapper around tf.split.
   """
   from ._generated_layers import _split
-  from .base import get_sub_layer
+  from .base import _get_sub_layer
   res = _split(source, axis=axis, out_dims=out_dims, name=name)
-  return tuple(get_sub_layer(res, str(i)) for i in range(len(out_dims)))
+  src_axis_int = source.data.get_axis_from_description(axis)
+  return tuple(
+    _get_sub_layer(
+      layer=res, name=str(i),
+      data=source.data.copy_template_replace_dim_tag(
+        axis=src_axis_int, new_dim_tag=dim,
+        name=f"{source.data.name}/split:{i}:{dim.description}"))
+    for i, dim in enumerate(out_dims))
 
 
 def window(
@@ -57,8 +66,8 @@ def window(
   """
   Window. See :func:`_generated_layers._window`.
   """
-  from ._generated_layers import _window
-  layer, state = _window(
+  from ._generated_layers import rec_window
+  layer, state = rec_window(
     source,
     window_dim=window_dim, window_left=window_left, window_right=window_right,
     axis=axis, padding=padding, stride=stride,
@@ -69,7 +78,6 @@ def window(
 
 def window_step(
       source: nn.LayerRef, *, state: nn.LayerState,
-      axis: nn.Dim,
       window_dim: nn.Dim,
       padding: str = NotSpecified,
       stride: int = NotSpecified,
@@ -78,9 +86,9 @@ def window_step(
   Window into the past when iterating.
   See :func:`_generated_layers._window`.
   """
-  from ._generated_layers import _window
-  return _window(
+  from ._generated_layers import rec_window
+  return rec_window(
     source, state=state,
     window_dim=window_dim, window_left=window_dim.dimension - 1, window_right=0,
-    axis=axis, padding=padding, stride=stride,
+    axis=nn.single_step_dim, padding=padding, stride=stride,
     name=name)