Skip to content

glm5.2: preserve input marking in prompt tokenization (fix output stalls on stray message tags) #148

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

Open
mp4 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

glm5.2: preserve input marking in prompt tokenization (fix output stalls on stray message tags) #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions common/arg.cpp.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
--- a/common/arg.cpp
+++ b/common/arg.cpp
@@ -2330,7 +2330,10 @@
for (auto * dev : devices) {
size_t free, total;
ggml_backend_dev_memory(dev, &free, &total);
- printf(" %s: %s (%zu MiB, %zu MiB free)\n", ggml_backend_dev_name(dev), ggml_backend_dev_description(dev), total / 1024 / 1024, free / 1024 / 1024);
+ struct ggml_backend_dev_props props;
+ ggml_backend_dev_get_props(dev, &props);
+ printf(" %s: %s [%s] (%zu MiB, %zu MiB free)\n",
+ ggml_backend_dev_name(dev), ggml_backend_dev_description(dev),
+ props.device_id ? props.device_id : "N/A",
+ total / 1024 / 1024, free / 1024 / 1024);
}
exit(0);
}
3 changes: 2 additions & 1 deletion common/chat-auto-parser-generator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ common_chat_params peg_generator::generate_parser(const common_chat_template &
const autoparser & autoparser) {
// Create the result structure
common_chat_params data;
data.prompt = common_chat_template_direct_apply(tmpl, inputs);
data.prompt = common_chat_template_direct_apply(tmpl, inputs, &data.prompt_parts);
data.generation_prompt = common_chat_template_generation_prompt(tmpl, inputs);
data.format = COMMON_CHAT_FORMAT_PEG_NATIVE;
data.preserved_tokens = autoparser.preserved_tokens;
Expand All @@ -68,6 +68,7 @@ common_chat_params peg_generator::generate_parser(const common_chat_template &
}

data.prompt += data.generation_prompt;
data.prompt_parts.push_back({false, data.generation_prompt});
}

auto parser = autoparser.build_parser(inputs, parser_generation_prompt);
Expand Down
Loading