Skip to content

Fix TF T5 #9301

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
patrickvonplaten merged 3 commits into from
Dec 28, 2020
Merged

Fix TF T5 #9301

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bbb6a1
Fix T5
jplu Dec 24, 2020
1a2e67f
Fix test
jplu Dec 24, 2020
d662c3c
Fix test
jplu Dec 24, 2020
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
13 changes: 8 additions & 5 deletions src/transformers/models/t5/modeling_tf_t5.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,9 @@ def call(
), "past_key_value should have 2 past states: keys and values. Got {} past states".format(
len(past_key_value)
)
real_seq_length += past_key_value[0].shape[2] if query_length is None else query_length
real_seq_length += shape_list(past_key_value[0])[2] if query_length is None else query_length

key_length = real_seq_length if key_value_states is None else key_value_states.shape[1]
key_length = real_seq_length if key_value_states is None else shape_list(key_value_states)[1]

def shape(hidden_states):
""" projection """
Expand Down Expand Up @@ -1147,13 +1147,14 @@ def call(
training=inputs["training"],
)

past = (inputs["encoder_outputs"], decoder_outputs[1]) if inputs["use_cache"] else None

if not inputs["return_dict"]:
past = (inputs["encoder_outputs"], decoder_outputs[1]) if inputs["use_cache"] else None
if past is not None:
decoder_outputs = decoder_outputs[:1] + (past,) + decoder_outputs[2:]
return decoder_outputs + inputs["encoder_outputs"]

past = (inputs["encoder_outputs"].to_tuple(), decoder_outputs[1]) if inputs["use_cache"] else None

return TFSeq2SeqModelOutput(
last_hidden_state=decoder_outputs.last_hidden_state,
past_key_values=past,
Expand Down Expand Up @@ -1332,8 +1333,8 @@ def call(

loss = None if inputs["labels"] is None else self.compute_loss(inputs["labels"], logits)

past = (inputs["encoder_outputs"], decoder_outputs[1]) if inputs["use_cache"] else None
if not inputs["return_dict"]:
past = (inputs["encoder_outputs"], decoder_outputs[1]) if inputs["use_cache"] else None
if past is not None:
decoder_outputs = decoder_outputs[:1] + (past,) + decoder_outputs[2:]
output = (logits,) + decoder_outputs[1:] + inputs["encoder_outputs"]
Expand All @@ -1358,6 +1359,8 @@ def call(
attentions=attentions,
)

past = (inputs["encoder_outputs"].to_tuple(), decoder_outputs[1]) if inputs["use_cache"] else None

return TFSeq2SeqLMOutput(
loss=loss,
logits=logits,
Expand Down