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

FIX [Generation] Fix some issues when running the MaxLength criteria on CPU #29317

Merged
merged 2 commits into from
Mar 5, 2024
Merged

FIX [Generation] Fix some issues when running the MaxLength criteria on CPU #29317

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b657f7
fix the bitwise or issue
younesbelkada Feb 27, 2024
99f8620
Merge remote-tracking branch 'upstream/main' into fix-dtype-bool
younesbelkada Feb 29, 2024
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
6 changes: 3 additions & 3 deletions src/transformers/generation/stopping_criteria.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def __call__(self, input_ids: torch.LongTensor, scores: torch.FloatTensor, **kwa
f"maximum length ({self.max_position_embeddings}). Depending on the model, you may observe "
"exceptions, performance degradation, or nothing at all."
)
return torch.full((input_ids.shape[0],), is_done, device=input_ids.device)
return torch.full((input_ids.shape[0],), is_done, device=input_ids.device, dtype=torch.bool)


class MaxNewTokensCriteria(StoppingCriteria):
Expand Down Expand Up @@ -103,7 +103,7 @@ def __init__(self, start_length: int, max_new_tokens: int):
@add_start_docstrings(STOPPING_CRITERIA_INPUTS_DOCSTRING)
def __call__(self, input_ids: torch.LongTensor, scores: torch.FloatTensor, **kwargs) -> torch.BoolTensor:
is_done = input_ids.shape[-1] >= self.max_length
return torch.full((input_ids.shape[0],), is_done, device=input_ids.device)
return torch.full((input_ids.shape[0],), is_done, device=input_ids.device, dtype=torch.bool)


class MaxTimeCriteria(StoppingCriteria):
Expand All @@ -126,7 +126,7 @@ def __init__(self, max_time: float, initial_timestamp: Optional[float] = None):
@add_start_docstrings(STOPPING_CRITERIA_INPUTS_DOCSTRING)
def __call__(self, input_ids: torch.LongTensor, scores: torch.FloatTensor, **kwargs) -> torch.BoolTensor:
is_done = time.time() - self.initial_timestamp > self.max_time
return torch.full((input_ids.shape[0],), is_done, device=input_ids.device)
return torch.full((input_ids.shape[0],), is_done, device=input_ids.device, dtype=torch.bool)


class StoppingCriteriaList(list):
Expand Down
Loading