Skip to content

run : avoid double tokenization #14327

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

Merged
merged 5 commits into from
Jun 22, 2025
Merged

run : avoid double tokenization #14327

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0306deb
run : avoid double tokenization by adopting common_tokenize heuristic
retr0reg Jun 22, 2025
6f280c4
build : fix windows gcc and clang warnings
retr0reg Jun 22, 2025
4181be2
lint : fixed trailing whitepace
retr0reg Jun 22, 2025
48ae05c
run : fix is_first flag
retr0reg Jun 22, 2025
9ecf5e2
Merge remote-tracking branch 'upstream/master'
retr0reg Jun 22, 2025
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
32 changes: 24 additions & 8 deletions tools/run/run.cpp
View file
Open in desktop
Copy link
Collaborator Author

@retr0reg retr0reg Jun 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Referenced:

llama.cpp/common/common.cpp

Lines 39 to 41 in af3373f

#ifndef NOMINMAX
# define NOMINMAX
#endif

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
#include <nlohmann/json.hpp>

#if defined(_WIN32)
# ifndef NOMINMAX
# define NOMINMAX
# endif
# include <windows.h>
# include <io.h>
#else
Expand Down Expand Up @@ -940,16 +943,29 @@ static int apply_chat_template(const struct common_chat_templates * tmpls, Llama
static int tokenize_prompt(const llama_vocab * vocab, const std::string & prompt,
std::vector<llama_token> & prompt_tokens, const LlamaData & llama_data) {
const bool is_first = llama_memory_seq_pos_max(llama_get_memory(llama_data.context.get()), 0) == -1;

const int n_prompt_tokens = -llama_tokenize(vocab, prompt.c_str(), prompt.size(), NULL, 0, is_first, true);
prompt_tokens.resize(n_prompt_tokens);
if (llama_tokenize(vocab, prompt.c_str(), prompt.size(), prompt_tokens.data(), prompt_tokens.size(), is_first,
true) < 0) {
printe("failed to tokenize the prompt\n");
int n_tokens = prompt.size() + 2 * is_first;
prompt_tokens.resize(n_tokens);
n_tokens = llama_tokenize(vocab, prompt.c_str(), prompt.size(),
prompt_tokens.data(), prompt_tokens.size(),
is_first, /*parse_special =*/true);
if (n_tokens == std::numeric_limits<int32_t>::min()) {
printe("tokenization failed: input too large\n");
return -1;
}

return n_prompt_tokens;
if (n_tokens < 0) {
prompt_tokens.resize(-n_tokens);
int check = llama_tokenize(vocab, prompt.c_str(), prompt.size(),
prompt_tokens.data(), prompt_tokens.size(),
is_first, /*parse_special =*/true);
if (check != -n_tokens) {
printe("failed to tokenize the prompt (size mismatch)\n");
return -1;
}
n_tokens = check;
} else {
prompt_tokens.resize(n_tokens);
}
return n_tokens;
}

// Check if we have enough space in the context to evaluate this batch
Expand Down
Loading