152fc202f5
* llm: update llama.cpp submodule to `7c26775` * disable `LLAMA_BLAS` for now * `-DLLAMA_OPENMP=off`
32 lines
1.8 KiB
Diff
32 lines
1.8 KiB
Diff
diff --git a/llama.cpp b/llama.cpp
|
|
index 61948751..4b72a293 100644
|
|
--- a/llama.cpp
|
|
+++ b/llama.cpp
|
|
@@ -4824,16 +4824,7 @@ static void llm_load_vocab(
|
|
|
|
// for now, only BPE models have pre-tokenizers
|
|
if (vocab.type == LLAMA_VOCAB_TYPE_BPE) {
|
|
- 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" ||
|
|
@@ -4888,7 +4879,8 @@ static void llm_load_vocab(
|
|
tokenizer_pre == "poro-chat") {
|
|
vocab.type_pre = LLAMA_VOCAB_PRE_TYPE_PORO;
|
|
} 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 {
|
|
vocab.type_pre = LLAMA_VOCAB_PRE_TYPE_DEFAULT;
|