mirror of
https://github.com/ollama/ollama.git
synced 2025-03-21 23:32:18 +01:00
42 lines
2.3 KiB
Diff
42 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Michael Yang <mxyng@pm.me>
|
|
Date: Mon, 16 Sep 2024 15:53:13 -0700
|
|
Subject: [PATCH] pretokenizer
|
|
|
|
---
|
|
src/llama-model.cpp | 14 +++-----------
|
|
1 file changed, 3 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/src/llama-model.cpp b/src/llama-model.cpp
|
|
index 405e0528..00b80c52 100644
|
|
--- a/src/llama-model.cpp
|
|
+++ b/src/llama-model.cpp
|
|
@@ -1249,16 +1249,7 @@ void llm_load_vocab(llama_model_loader & ml, llama_model & model) {
|
|
if (vocab.type == LLAMA_VOCAB_TYPE_BPE) {
|
|
vocab.tokenizer_add_space_prefix = false;
|
|
vocab.tokenizer_clean_spaces = true;
|
|
- if (tokenizer_pre.empty()) {
|
|
- LLAMA_LOG_WARN("%s: missing pre-tokenizer type, using: 'default'\n", __func__);
|
|
- LLAMA_LOG_WARN("%s: \n", __func__);
|
|
- LLAMA_LOG_WARN("%s: ************************************ \n", __func__);
|
|
- LLAMA_LOG_WARN("%s: GENERATION QUALITY WILL BE DEGRADED! \n", __func__);
|
|
- LLAMA_LOG_WARN("%s: CONSIDER REGENERATING THE MODEL \n", __func__);
|
|
- LLAMA_LOG_WARN("%s: ************************************ \n", __func__);
|
|
- LLAMA_LOG_WARN("%s: \n", __func__);
|
|
- vocab.type_pre = LLAMA_VOCAB_PRE_TYPE_DEFAULT;
|
|
- } else if (tokenizer_pre == "default") {
|
|
+ if (tokenizer_pre == "default") {
|
|
vocab.type_pre = LLAMA_VOCAB_PRE_TYPE_DEFAULT;
|
|
} else if (
|
|
tokenizer_pre == "llama3" ||
|
|
@@ -1373,7 +1364,8 @@ void llm_load_vocab(llama_model_loader & ml, llama_model & model) {
|
|
tokenizer_pre == "megrez") {
|
|
vocab.type_pre = LLAMA_VOCAB_PRE_TYPE_QWEN2;
|
|
} else {
|
|
- throw std::runtime_error(format("unknown pre-tokenizer type: '%s'", tokenizer_pre.c_str()));
|
|
+ LLAMA_LOG_WARN("%s: missing or unrecognized pre-tokenizer type, using: 'default'\n", __func__);
|
|
+ vocab.type_pre = LLAMA_VOCAB_PRE_TYPE_DEFAULT;
|
|
}
|
|
} else if (vocab.type == LLAMA_VOCAB_TYPE_SPM) {
|
|
vocab.type_pre = LLAMA_VOCAB_PRE_TYPE_DEFAULT;
|