Skip to content

StackLayer, out_spatial_dim option #809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 30, 2021
Merged

StackLayer, out_spatial_dim option #809

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions returnn/tf/layers/basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5521,12 +5521,14 @@ class StackLayer(LayerBase):
"""
layer_class = "stack"

def __init__(self, axis=None, **kwargs):
def __init__(self, axis=None, out_spatial_dim=None, **kwargs):
"""
:param int|None axis: new axis.
If not given, will use Data.get_default_new_axis_for_dim_tag(<spatial>),
i.e. some reasonable default for a new spatial axis.
:param DimensionTag|None out_spatial_dim:
"""
out_spatial_dim # noqa # handled in get_out_data_from_opts
super(StackLayer, self).__init__(**kwargs)
axis_, common_source = self._get_axis_and_common(self.sources)
if axis is None:
Expand All @@ -5543,24 +5545,28 @@ def _get_axis_and_common(cls, sources):
:param list[LayerBase] sources:
:rtype: (int,Data)
"""
from returnn.tf.util.basic import DimensionTag
common_source = Data.get_common_data([src.output for src in sources]).copy_template()
tag = DimensionTag(kind=DimensionTag.Types.Spatial, dimension=1)
return common_source.get_default_new_axis_for_dim_tag(tag), common_source
dummy_tag = DimensionTag(kind=DimensionTag.Types.Spatial, dimension=1)
return common_source.get_default_new_axis_for_dim_tag(dummy_tag), common_source

@classmethod
def get_out_data_from_opts(cls, name, sources, axis=None, **kwargs):
def get_out_data_from_opts(cls, name, sources, axis=None, out_spatial_dim=None, **kwargs):
"""
:param str name:
:param list[LayerBase] sources:
:param int|None axis:
:param DimensionTag|None out_spatial_dim:
:rtype: Data
"""
axis_, common_source = cls._get_axis_and_common(sources)
if axis is None:
axis = axis_
out = common_source.copy_template(name="%s_output" % name)
out = out.copy_add_spatial_dim(spatial_dim_axis=axis, dim=len(sources))
if not out_spatial_dim:
out_spatial_dim = DimensionTag(
kind=DimensionTag.Types.Spatial, description="%s:stack" % name, dimension=len(sources))
assert out_spatial_dim.dimension == len(sources)
out = out.copy_add_dim_by_tag(axis=axis, dim_tag=out_spatial_dim, unbroadcast=True)
return out


Expand Down