Skip to content

ConcatLayer, add out_dim #824

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
Dec 5, 2021
Merged

ConcatLayer, add out_dim #824

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
21 changes: 13 additions & 8 deletions returnn/tf/layers/basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,11 +363,13 @@ class ConcatLayer(LayerBase):
"""
layer_class = "concat"

def __init__(self, sources, allow_broadcast=False, **kwargs):
def __init__(self, sources, allow_broadcast=False, out_dim=None, **kwargs):
"""
:param list[(LayerBase,str|Dim)] sources:
:param bool allow_broadcast:
:param Dim out_dim:
"""
out_dim # noqa # via get_out_data_from_opts
if allow_broadcast:
raise NotImplementedError
sources, axes = zip(*sources) # unzip
Expand Down Expand Up @@ -395,11 +397,12 @@ def _copy_compatible(x, axis):
allow_broadcast=[allow_broadcast] * len(sources_data))

@classmethod
def get_out_data_from_opts(cls, name, sources, allow_broadcast=False, **kwargs):
def get_out_data_from_opts(cls, name, sources, allow_broadcast=False, out_dim=None, **kwargs):
"""
:param str name:
:param list[(LayerBase,str|Dim)] sources:
:param bool allow_broadcast:
:param Dim|None out_dim:
:rtype: Data
"""
assert sources
Expand All @@ -413,13 +416,15 @@ def get_out_data_from_opts(cls, name, sources, allow_broadcast=False, **kwargs):
dimension = 0
for tag in concat_dim_tags:
dimension += tag.dimension
# We ignore allow_broadcast here... Anyway not currently implemented.
# Just overtake the first input format.
concat_res_dim_tag = Dim(
kind=concat_dim_tags[0].kind, description="%s_concat" % name, dimension=dimension,
derived_from_tag=concat_dim_tags[0])
if not out_dim:
# We ignore allow_broadcast here... Anyway not currently implemented.
# Just overtake the first input format.
out_dim = Dim(
kind=concat_dim_tags[0].kind, description="%s_concat" % name, dimension=dimension,
derived_from_tag=concat_dim_tags[0])
assert out_dim.dimension == dimension
res_dim_tags = list(sources[0].output.dim_tags)
res_dim_tags[axes_int[0]] = concat_res_dim_tag
res_dim_tags[axes_int[0]] = out_dim
return Data(name="%s_output" % name, dim_tags=res_dim_tags, dtype=sources[0].output.dtype)

@classmethod
Expand Down