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

Use tiktoken #1044

Merged
merged 9 commits into from
Mar 13, 2023
Merged

Use tiktoken #1044

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5e35893
use tiktoken==0.3.0
jongwook Mar 7, 2023
39237a3
formatting
jongwook Mar 7, 2023
67e8805
tuple should be safer
jongwook Mar 7, 2023
117ed3e
Update whisper/tokenizer.py
jongwook Mar 13, 2023
06e59be
Merge branch 'main' into use-tiktoken
jongwook Mar 13, 2023
2a14e80
use tiktoken 0.3.1
jongwook Mar 13, 2023
6869cd8
reflecting suggestions
jongwook Mar 13, 2023
72e5e67
cleanup
jongwook Mar 13, 2023
a0bd014
bypassing load_tiktoken_bpe to avoid blobfile dep
jongwook Mar 13, 2023
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
Prev Previous commit
Next Next commit
formatting
  • Loading branch information
@jongwook
jongwook committed Mar 7, 2023
commit 39237a35317c75278952b394359795dab4d73d09
16 changes: 6 additions & 10 deletions whisper/tokenizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ class Tokenizer:
"""A thin wrapper around `GPT2TokenizerFast` providing quick access to special tokens"""
jongwook marked this conversation as resolved.
Show resolved Hide resolved

encoding: tiktoken.Encoding
task: str
language: Optional[str]
language: Optional[str] = None
task: Optional[str] = None
sot_sequence: List[int] = field(default_factory=list)
special_tokens: Dict[str, int] = field(default_factory=dict)

Expand Down Expand Up @@ -364,8 +364,8 @@ def get_encoding(name: str = "gpt2"):
def get_tokenizer(
multilingual: bool,
*,
task: Optional[str] = None, # Literal["transcribe", "translate", None]
language: Optional[str] = None,
task: Optional[str] = None, # Literal["transcribe", "translate", None]
) -> Tokenizer:
if language is not None:
language = language.lower()
Expand All @@ -377,17 +377,13 @@ def get_tokenizer(

if multilingual:
encoding_name = "multilingual"
task = task or "transcribe"
language = language or "en"
task = task or "transcribe"
else:
encoding_name = "gpt2"
task = None
language = None
task = None

encoding = get_encoding(name=encoding_name)

return Tokenizer(
encoding=encoding,
task=task,
language=language,
)
return Tokenizer(encoding=encoding, language=language, task=task)