Skip to content
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

Jump to bottom

TF: Merge PT and TF behavior for Bart when no decoder_input_ids are passed #17593

Merged
merged 3 commits into from
Jun 8, 2022
Merged

TF: Merge PT and TF behavior for Bart when no decoder_input_ids are passed #17593

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a352dbf
Merge PT and TF behavior
gante Jun 7, 2022
14f2f44
correct None check
gante Jun 7, 2022
9186fbc
extra not removed
gante Jun 7, 2022
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
16 changes: 9 additions & 7 deletions src/transformers/models/bart/modeling_tf_bart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,14 +1073,16 @@ def call(
**kwargs
) -> Union[TFSeq2SeqModelOutput, Tuple[tf.Tensor]]:

if decoder_input_ids is None and decoder_inputs_embeds is None:
use_cache = False

output_hidden_states = (
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TFBartMainLayer (i.e. this class) is not a stand-alone class, output_hidden_states is always passed from the stand-alone classes. This line was redundant and thus removed.

output_hidden_states if output_hidden_states is not None else self.config.output_hidden_states
)
# different to other models, Bart automatically creates decoder_input_ids from
# input_ids if no decoder_input_ids are provided
if decoder_input_ids is None and decoder_inputs_embeds is not None:
if input_ids is None:
raise ValueError(
"If no `decoder_input_ids` or `decoder_inputs_embeds` are "
"passed, `input_ids` cannot be `None`. Please pass either "
"`input_ids` or `decoder_input_ids` or `decoder_inputs_embeds`."
)

if decoder_input_ids is None and input_ids is not None:
decoder_input_ids = shift_tokens_right(
input_ids, self.config.pad_token_id, self.config.decoder_start_token_id
)
Expand Down