convert : refactor vocab selection logic #6355
Merged
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.
This PR fixes some confusion as to the purpose of HfVocab, by making it explicit that it is only for LLaMA "SPM" vocabularies in tokenizer.json format, not generic HuggingFace fast tokenizer (tokenizer.json) vocabs. (There is one exception to this, which is its use for WordPiece - this will be corrected in a follow-up PR.)
PR #5821 fixed some of the confusion as to which files map to which tokenizers, but in adding the automatic fallback to HfVocab it unintentionally caused a few issues.
This PR makes it the job of each vocab class to attempt to load the vocab from the appropriate files, and to fail if tokenizer.json represents the wrong vocab type.
I also changed the Vocab Union to a pair of Protocols to make the API a little more explicit.
With these changes, converting e.g. deepseek-llm-7b-chat results in this exception with the default --vocab-type:
And converting with
--vocab-type bpe --pad-vocab
works as expected.With #5821, the model would appear to convert successfully with the default --vocab-type but fail at runtime, and
--vocab-type bpe
did not recognize the model.Prior to #5821, the presence of tokenizer.json caused convert.py to attempt to load it as a sentencepiece model:
Closes #6245
Fixes #6238
Fixes #6216
Fixes #5973