fix: correct EOS handling in batched generation#270
Open
RedaRahmani wants to merge 1 commit intomistralai:mainfrom
Open
fix: correct EOS handling in batched generation#270RedaRahmani wants to merge 1 commit intomistralai:mainfrom
RedaRahmani wants to merge 1 commit intomistralai:mainfrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fix: correct EOS handling in batched generation
Problem
When running batched inference with
eos_idset, sequences that finish at different steps produce corrupted output. If row 0 hits EOS at step 1 but row 1 hasn't finished yet, the current code:This means the returned
generated_tokensfor early-finishing rows contain junk tokens generated after their EOS, and the logprobs don't match the actual generation.Root cause
The original loop checks
is_finished.all()to break, but between EOS detection and the break, it unconditionally appends tokens and logprobs for every row — including rows that already hit EOS. It also feeds all rows back intomodel.forward()regardless of their finished state.Fix
next_tokenwitheos_idfor any row that already finished, so the model gets a consistent input and the KV cache stays clean.not is_finished[i].finished_after_tokenstensor records exactly when each row hit EOS. The final output is trimmed per-row to exclude post-EOS tokens.is_finishedupdate to after appending the current token, so the token that triggered EOS is correctly included in the output before marking the row as done.Tests
Added tests/test_generate_eos_batching.py with a lightweight DummyTransformer mock (no GPU needed):
eos_idback to the model instead of random tokens.