Skip to content

Commit

Permalink
Update llama.cpp submodule commit to d94c6e0c (ollama#5805)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmorganca authored Jul 22, 2024
1 parent b3e5491 commit f8fedbd
Show file tree
Hide file tree
Showing 9 changed files with 366 additions and 81 deletions.
2 changes: 1 addition & 1 deletion llm/llama.cpp
Submodule llama.cpp updated 190 files
10 changes: 5 additions & 5 deletions llm/patches/05-default-pretokenizer.diff
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/src/llama.cpp b/src/llama.cpp
index 2b9ace28..172640e2 100644
index 8fe51971..7113ba64 100644
--- a/src/llama.cpp
+++ b/src/llama.cpp
@@ -5357,16 +5357,7 @@ static void llm_load_vocab(
@@ -5433,16 +5433,7 @@ static void llm_load_vocab(
if (vocab.type == LLAMA_VOCAB_TYPE_BPE) {
vocab.tokenizer_add_space_prefix = false;
vocab.tokenizer_clean_spaces = true;
Expand All @@ -20,9 +20,9 @@ index 2b9ace28..172640e2 100644
vocab.type_pre = LLAMA_VOCAB_PRE_TYPE_DEFAULT;
} else if (
tokenizer_pre == "llama3" ||
@@ -5439,7 +5430,8 @@ static void llm_load_vocab(
tokenizer_pre == "jais") {
vocab.type_pre = LLAMA_VOCAB_PRE_TYPE_JAIS;
@@ -5526,7 +5517,8 @@ static void llm_load_vocab(
vocab.type_pre = LLAMA_VOCAB_PRE_TYPE_SMOLLM;
vocab.tokenizer_clean_spaces = false;
} 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__);
Expand Down
File renamed without changes.
13 changes: 0 additions & 13 deletions llm/patches/06-qwen2.diff

This file was deleted.

File renamed without changes.
File renamed without changes.
Loading

0 comments on commit f8fedbd

Please sign in to comment.