Skip to content

fix: rename llama-sampling to llama-sampler in bootstrap.sh #290

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
jhen0409 merged 3 commits into from
Feb 11, 2026
Merged

fix: rename llama-sampling to llama-sampler in bootstrap.sh #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48915c6
fix(scripts): rename llama-sampling to llama-sampler in bootstrap.sh
actions-user Feb 10, 2026
f48862a
chore: bump llama.cpp submodule to b7988
actions-user Feb 10, 2026
7158706
feat: sync llama.cpp to b7988
actions-user Feb 10, 2026
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
39 changes: 35 additions & 4 deletions cpp/common/chat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,15 +380,46 @@ std::vector<common_chat_msg> common_chat_msgs_parse_oaicompat(const json & messa
return msgs;
}

json common_chat_msgs_to_json_oaicompat(const std::vector<common_chat_msg> & msgs, bool concat_typed_text) {
static json render_message_to_json(const std::vector<common_chat_msg> & msgs, const jinja::caps & c) {
if (!c.supports_string_content && !c.supports_typed_content) {
LOG_WRN("%s: Neither string content nor typed content is supported by the template. This is unexpected and may lead to issues.\n", __func__);
}

bool only_string_accepted = c.supports_string_content && !c.supports_typed_content;
bool only_typed_accepted = !c.supports_string_content && c.supports_typed_content;

json messages = json::array();
for (const auto & msg : msgs) {
json jmsg = msg.to_json_oaicompat(concat_typed_text);
messages.push_back(jmsg);
if (only_string_accepted) {
json jmsg = msg.to_json_oaicompat(/* concat_typed_text= */ true);
messages.push_back(jmsg);
} else if (only_typed_accepted) {
json jmsg = msg.to_json_oaicompat(/* concat_typed_text= */ false);
if (jmsg.at("content").is_string()) {
jmsg["content"] = json::array({
json{
{"type", "text"},
{"text", jmsg.at("content").get<std::string>()},
}
});
}
messages.push_back(jmsg);
} else {
json jmsg = msg.to_json_oaicompat(/* concat_typed_text= */ false);
messages.push_back(jmsg);
}
}
return messages;
}

// DEPRECATED: only used in tests
json common_chat_msgs_to_json_oaicompat(const std::vector<common_chat_msg> & msgs, bool concat_typed_text) {
jinja::caps c;
c.supports_string_content = true;
c.supports_typed_content = !concat_typed_text;
return render_message_to_json(msgs, c);
}

std::vector<common_chat_tool> common_chat_tools_parse_oaicompat(const json & tools) {
std::vector<common_chat_tool> result;

Expand Down Expand Up @@ -3051,7 +3082,7 @@ static common_chat_params common_chat_templates_apply_jinja(
: *tmpls->template_default;
const auto & src = tmpl.source();
const auto & caps = tmpl.original_caps();
params.messages = common_chat_msgs_to_json_oaicompat(inputs.messages, /* concat_text= */ !tmpl.original_caps().requires_typed_content);
params.messages = render_message_to_json(inputs.messages, tmpl.original_caps());
params.add_generation_prompt = inputs.add_generation_prompt;
params.tool_choice = inputs.tool_choice;
params.reasoning_format = inputs.reasoning_format;
Expand Down
2 changes: 2 additions & 0 deletions cpp/common/chat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,8 @@ bool common_chat_templates_has_variant(const struct common_chat_templates * tmpl

// Parses a JSON array of messages in OpenAI's chat completion API format.
std::vector<common_chat_msg> common_chat_msgs_parse_oaicompat(const nlohmann::ordered_json & messages);

// DEPRECATED: only used in tests
nlohmann::ordered_json common_chat_msgs_to_json_oaicompat(const std::vector<common_chat_msg> & msgs, bool concat_typed_text = false);

std::vector<common_chat_tool> common_chat_tools_parse_oaicompat(const nlohmann::ordered_json & tools);
Expand Down
1 change: 0 additions & 1 deletion cpp/common/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,6 @@ struct common_params_speculative {

uint16_t ngram_size_n = 12; // ngram size for lookup
uint16_t ngram_size_m = 48; // mgram size for speculative tokens
uint16_t ngram_check_rate = 1; // check rate for ngram lookup
uint16_t ngram_min_hits = 1; // minimum hits at ngram/mgram lookup for mgram to be proposed

std::shared_ptr<common_ngram_mod> ngram_mod;
Expand Down
13 changes: 9 additions & 4 deletions cpp/common/jinja/caps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ static void caps_print_stats(value & v, const std::string & path) {

std::map<std::string, bool> caps::to_map() const {
return {
{"requires_typed_content", requires_typed_content},
{"supports_string_content", supports_string_content},
{"supports_typed_content", supports_typed_content},
{"supports_tools", supports_tools},
{"supports_tool_calls", supports_tool_calls},
{"supports_parallel_tool_calls", supports_parallel_tool_calls},
Expand All @@ -89,7 +90,7 @@ caps caps_get(jinja::program & prog) {
return v->stats.ops.find(op_name) != v->stats.ops.end();
};

// case: typed content requirement
// case: typed content support
caps_try_execute(
prog,
[&]() {
Expand All @@ -105,12 +106,16 @@ caps caps_get(jinja::program & prog) {
// tools
return json{nullptr};
},
[&](bool, value & messages, value &) {
[&](bool success, value & messages, value &) {
auto & content = messages->at(0)->at("content");
caps_print_stats(content, "messages[0].content");
if (has_op(content, "selectattr") || has_op(content, "array_access")) {
// accessed as an array
result.requires_typed_content = true;
result.supports_typed_content = true;
}
if (!success) {
// failed to execute with content as string
result.supports_string_content = false;
}
}
);
Expand Down
4 changes: 3 additions & 1 deletion cpp/common/jinja/caps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ struct caps {
bool supports_parallel_tool_calls = true;
bool supports_preserve_reasoning = false; // support assistant message with reasoning_content

bool requires_typed_content = false; // default: use string content
// one of the 2 content capabilities must be true
bool supports_string_content = true;
bool supports_typed_content = false;

// for reporting on server
std::map<std::string, bool> to_map() const;
Expand Down
6 changes: 6 additions & 0 deletions cpp/common/jinja/runtime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,12 @@ value for_statement::execute_impl(context & ctx) {

value iterable_val = iter_expr->execute(scope);

// mark the variable being iterated as used for stats
if (ctx.is_get_stats) {
iterable_val->stats.used = true;
iterable_val->stats.ops.insert("array_access");
}

if (iterable_val->is_undefined()) {
JJ_DEBUG("%s", "For loop iterable is undefined, skipping loop");
iterable_val = mk_val<value_array>();
Expand Down
5 changes: 3 additions & 2 deletions cpp/ggml-backend-reg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,9 +471,10 @@ static lm_ggml_backend_reg_t lm_ggml_backend_load_best(const char * name, bool s

int best_score = 0;
fs::path best_path;
std::error_code ec;

for (const auto & search_path : search_paths) {
if (std::error_code ec; !fs::exists(search_path, ec)) {
if (!fs::exists(search_path, ec)) {
if (ec) {
LM_GGML_LOG_DEBUG("%s: posix_stat(%s) failure, error-message: %s\n", __func__, path_str(search_path).c_str(), ec.message().c_str());
} else {
Expand All @@ -483,7 +484,7 @@ static lm_ggml_backend_reg_t lm_ggml_backend_load_best(const char * name, bool s
}
fs::directory_iterator dir_it(search_path, fs::directory_options::skip_permission_denied);
for (const auto & entry : dir_it) {
if (entry.is_regular_file()) {
if (entry.is_regular_file(ec)) {
auto filename = entry.path().filename();
auto ext = entry.path().extension();
if (filename.native().find(file_prefix) == 0 && ext == file_extension) {
Expand Down
16 changes: 15 additions & 1 deletion cpp/ggml-cpu/arch-fallback.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#define lm_ggml_gemv_q4_K_8x4_q8_K_generic lm_ggml_gemv_q4_K_8x4_q8_K
#define lm_ggml_gemv_q4_K_8x8_q8_K_generic lm_ggml_gemv_q4_K_8x8_q8_K
#define lm_ggml_gemv_q5_K_8x8_q8_K_generic lm_ggml_gemv_q5_K_8x8_q8_K
#define lm_ggml_gemv_q6_K_8x4_q8_K_generic lm_ggml_gemv_q6_K_8x4_q8_K
#define lm_ggml_gemv_q6_K_8x8_q8_K_generic lm_ggml_gemv_q6_K_8x8_q8_K
#define lm_ggml_gemv_iq4_nl_4x4_q8_0_generic lm_ggml_gemv_iq4_nl_4x4_q8_0
#define lm_ggml_gemv_iq4_nl_8x8_q8_0_generic lm_ggml_gemv_iq4_nl_8x8_q8_0
Expand All @@ -55,7 +56,8 @@
#define lm_ggml_gemm_q4_K_8x4_q8_K_generic lm_ggml_gemm_q4_K_8x4_q8_K
#define lm_ggml_gemm_q4_K_8x8_q8_K_generic lm_ggml_gemm_q4_K_8x8_q8_K
#define lm_ggml_gemm_q5_K_8x8_q8_K_generic lm_ggml_gemm_q5_K_8x8_q8_K
# define lm_ggml_gemm_q6_K_8x8_q8_K_generic lm_ggml_gemm_q6_K_8x8_q8_K
#define lm_ggml_gemm_q6_K_8x4_q8_K_generic lm_ggml_gemm_q6_K_8x4_q8_K
#define lm_ggml_gemm_q6_K_8x8_q8_K_generic lm_ggml_gemm_q6_K_8x8_q8_K
#define lm_ggml_gemm_iq4_nl_4x4_q8_0_generic lm_ggml_gemm_iq4_nl_4x4_q8_0
#define lm_ggml_gemm_iq4_nl_8x8_q8_0_generic lm_ggml_gemm_iq4_nl_8x8_q8_0
#define lm_ggml_gemm_q8_0_4x4_q8_0_generic lm_ggml_gemm_q8_0_4x4_q8_0
Expand All @@ -76,6 +78,7 @@
#define lm_ggml_gemv_q4_0_4x8_q8_0_generic lm_ggml_gemv_q4_0_4x8_q8_0
#define lm_ggml_gemv_q4_K_8x4_q8_K_generic lm_ggml_gemv_q4_K_8x4_q8_K
#define lm_ggml_gemv_q5_K_8x8_q8_K_generic lm_ggml_gemv_q5_K_8x8_q8_K
#define lm_ggml_gemv_q6_K_8x4_q8_K_generic lm_ggml_gemv_q6_K_8x4_q8_K
#define lm_ggml_gemv_q6_K_8x8_q8_K_generic lm_ggml_gemv_q6_K_8x8_q8_K
#define lm_ggml_gemv_iq4_nl_4x4_q8_0_generic lm_ggml_gemv_iq4_nl_4x4_q8_0
#define lm_ggml_gemv_q8_0_4x4_q8_0_generic lm_ggml_gemv_q8_0_4x4_q8_0
Expand All @@ -84,6 +87,7 @@
#define lm_ggml_gemm_q4_0_4x8_q8_0_generic lm_ggml_gemm_q4_0_4x8_q8_0
#define lm_ggml_gemm_q4_K_8x4_q8_K_generic lm_ggml_gemm_q4_K_8x4_q8_K
#define lm_ggml_gemm_q5_K_8x8_q8_K_generic lm_ggml_gemm_q5_K_8x8_q8_K
#define lm_ggml_gemm_q6_K_8x4_q8_K_generic lm_ggml_gemm_q6_K_8x4_q8_K
#define lm_ggml_gemm_q6_K_8x8_q8_K_generic lm_ggml_gemm_q6_K_8x8_q8_K
#define lm_ggml_gemm_iq4_nl_4x4_q8_0_generic lm_ggml_gemm_iq4_nl_4x4_q8_0
#define lm_ggml_gemm_q8_0_4x4_q8_0_generic lm_ggml_gemm_q8_0_4x4_q8_0
Expand All @@ -107,6 +111,7 @@
#define lm_ggml_gemv_q4_K_8x4_q8_K_generic lm_ggml_gemv_q4_K_8x4_q8_K
#define lm_ggml_gemv_q4_K_8x8_q8_K_generic lm_ggml_gemv_q4_K_8x8_q8_K
#define lm_ggml_gemv_q5_K_8x8_q8_K_generic lm_ggml_gemv_q5_K_8x8_q8_K
#define lm_ggml_gemv_q6_K_8x4_q8_K_generic lm_ggml_gemv_q6_K_8x4_q8_K
#define lm_ggml_gemv_q6_K_8x8_q8_K_generic lm_ggml_gemv_q6_K_8x8_q8_K
#define lm_ggml_gemv_iq4_nl_4x4_q8_0_generic lm_ggml_gemv_iq4_nl_4x4_q8_0
#define lm_ggml_gemv_iq4_nl_8x8_q8_0_generic lm_ggml_gemv_iq4_nl_8x8_q8_0
Expand All @@ -119,6 +124,7 @@
#define lm_ggml_gemm_q4_K_8x4_q8_K_generic lm_ggml_gemm_q4_K_8x4_q8_K
#define lm_ggml_gemm_q4_K_8x8_q8_K_generic lm_ggml_gemm_q4_K_8x8_q8_K
#define lm_ggml_gemm_q5_K_8x8_q8_K_generic lm_ggml_gemm_q5_K_8x8_q8_K
#define lm_ggml_gemm_q6_K_8x4_q8_K_generic lm_ggml_gemm_q6_K_8x4_q8_K
#define lm_ggml_gemm_q6_K_8x8_q8_K_generic lm_ggml_gemm_q6_K_8x8_q8_K
#define lm_ggml_gemm_iq4_nl_4x4_q8_0_generic lm_ggml_gemm_iq4_nl_4x4_q8_0
#define lm_ggml_gemm_iq4_nl_8x8_q8_0_generic lm_ggml_gemm_iq4_nl_8x8_q8_0
Expand All @@ -143,6 +149,7 @@
#define lm_ggml_gemv_q4_K_8x4_q8_K_generic lm_ggml_gemv_q4_K_8x4_q8_K
#define lm_ggml_gemv_q4_K_8x8_q8_K_generic lm_ggml_gemv_q4_K_8x8_q8_K
#define lm_ggml_gemv_q5_K_8x8_q8_K_generic lm_ggml_gemv_q5_K_8x8_q8_K
#define lm_ggml_gemv_q6_K_8x4_q8_K_generic lm_ggml_gemv_q6_K_8x4_q8_K
#define lm_ggml_gemv_q6_K_8x8_q8_K_generic lm_ggml_gemv_q6_K_8x8_q8_K
#define lm_ggml_gemv_iq4_nl_4x4_q8_0_generic lm_ggml_gemv_iq4_nl_4x4_q8_0
#define lm_ggml_gemv_iq4_nl_8x8_q8_0_generic lm_ggml_gemv_iq4_nl_8x8_q8_0
Expand All @@ -155,6 +162,7 @@
#define lm_ggml_gemm_q4_K_8x4_q8_K_generic lm_ggml_gemm_q4_K_8x4_q8_K
#define lm_ggml_gemm_q4_K_8x8_q8_K_generic lm_ggml_gemm_q4_K_8x8_q8_K
#define lm_ggml_gemm_q5_K_8x8_q8_K_generic lm_ggml_gemm_q5_K_8x8_q8_K
#define lm_ggml_gemm_q6_K_8x4_q8_K_generic lm_ggml_gemm_q6_K_8x4_q8_K
#define lm_ggml_gemm_q6_K_8x8_q8_K_generic lm_ggml_gemm_q6_K_8x8_q8_K
#define lm_ggml_gemm_iq4_nl_4x4_q8_0_generic lm_ggml_gemm_iq4_nl_4x4_q8_0
#define lm_ggml_gemm_iq4_nl_8x8_q8_0_generic lm_ggml_gemm_iq4_nl_8x8_q8_0
Expand Down Expand Up @@ -186,6 +194,7 @@
#define lm_ggml_gemv_q4_K_8x4_q8_K_generic lm_ggml_gemv_q4_K_8x4_q8_K
#define lm_ggml_gemv_q4_K_8x8_q8_K_generic lm_ggml_gemv_q4_K_8x8_q8_K
#define lm_ggml_gemv_q5_K_8x8_q8_K_generic lm_ggml_gemv_q5_K_8x8_q8_K
#define lm_ggml_gemv_q6_K_8x4_q8_K_generic lm_ggml_gemv_q6_K_8x4_q8_K
#define lm_ggml_gemv_q6_K_8x8_q8_K_generic lm_ggml_gemv_q6_K_8x8_q8_K
#define lm_ggml_gemv_iq4_nl_4x4_q8_0_generic lm_ggml_gemv_iq4_nl_4x4_q8_0
#define lm_ggml_gemv_iq4_nl_8x8_q8_0_generic lm_ggml_gemv_iq4_nl_8x8_q8_0
Expand All @@ -197,6 +206,7 @@
#define lm_ggml_gemm_q4_K_8x4_q8_K_generic lm_ggml_gemm_q4_K_8x4_q8_K
#define lm_ggml_gemm_q4_K_8x8_q8_K_generic lm_ggml_gemm_q4_K_8x8_q8_K
#define lm_ggml_gemm_q5_K_8x8_q8_K_generic lm_ggml_gemm_q5_K_8x8_q8_K
#define lm_ggml_gemm_q6_K_8x4_q8_K_generic lm_ggml_gemm_q6_K_8x4_q8_K
#define lm_ggml_gemm_q6_K_8x8_q8_K_generic lm_ggml_gemm_q6_K_8x8_q8_K
#define lm_ggml_gemm_iq4_nl_4x4_q8_0_generic lm_ggml_gemm_iq4_nl_4x4_q8_0
#define lm_ggml_gemm_iq4_nl_8x8_q8_0_generic lm_ggml_gemm_iq4_nl_8x8_q8_0
Expand Down Expand Up @@ -227,6 +237,7 @@
#define lm_ggml_gemv_q4_K_8x4_q8_K_generic lm_ggml_gemv_q4_K_8x4_q8_K
#define lm_ggml_gemv_q4_K_8x8_q8_K_generic lm_ggml_gemv_q4_K_8x8_q8_K
#define lm_ggml_gemv_q5_K_8x8_q8_K_generic lm_ggml_gemv_q5_K_8x8_q8_K
#define lm_ggml_gemv_q6_K_8x4_q8_K_generic lm_ggml_gemv_q6_K_8x4_q8_K
#define lm_ggml_gemv_q6_K_8x8_q8_K_generic lm_ggml_gemv_q6_K_8x8_q8_K
#define lm_ggml_gemv_iq4_nl_4x4_q8_0_generic lm_ggml_gemv_iq4_nl_4x4_q8_0
#define lm_ggml_gemv_iq4_nl_8x8_q8_0_generic lm_ggml_gemv_iq4_nl_8x8_q8_0
Expand All @@ -239,6 +250,7 @@
#define lm_ggml_gemm_q4_K_8x4_q8_K_generic lm_ggml_gemm_q4_K_8x4_q8_K
#define lm_ggml_gemm_q4_K_8x8_q8_K_generic lm_ggml_gemm_q4_K_8x8_q8_K
#define lm_ggml_gemm_q5_K_8x8_q8_K_generic lm_ggml_gemm_q5_K_8x8_q8_K
#define lm_ggml_gemm_q6_K_8x4_q8_K_generic lm_ggml_gemm_q6_K_8x4_q8_K
#define lm_ggml_gemm_q6_K_8x8_q8_K_generic lm_ggml_gemm_q6_K_8x8_q8_K
#define lm_ggml_gemm_iq4_nl_4x4_q8_0_generic lm_ggml_gemm_iq4_nl_4x4_q8_0
#define lm_ggml_gemm_iq4_nl_8x8_q8_0_generic lm_ggml_gemm_iq4_nl_8x8_q8_0
Expand Down Expand Up @@ -271,6 +283,7 @@
#define lm_ggml_gemv_q4_K_8x4_q8_K_generic lm_ggml_gemv_q4_K_8x4_q8_K
#define lm_ggml_gemv_q4_K_8x8_q8_K_generic lm_ggml_gemv_q4_K_8x8_q8_K
#define lm_ggml_gemv_q5_K_8x8_q8_K_generic lm_ggml_gemv_q5_K_8x8_q8_K
#define lm_ggml_gemv_q6_K_8x4_q8_K_generic lm_ggml_gemv_q6_K_8x4_q8_K
#define lm_ggml_gemv_q6_K_8x8_q8_K_generic lm_ggml_gemv_q6_K_8x8_q8_K
#define lm_ggml_gemv_iq4_nl_4x4_q8_0_generic lm_ggml_gemv_iq4_nl_4x4_q8_0
#define lm_ggml_gemv_iq4_nl_8x8_q8_0_generic lm_ggml_gemv_iq4_nl_8x8_q8_0
Expand All @@ -283,6 +296,7 @@
#define lm_ggml_gemm_q4_K_8x4_q8_K_generic lm_ggml_gemm_q4_K_8x4_q8_K
#define lm_ggml_gemm_q4_K_8x8_q8_K_generic lm_ggml_gemm_q4_K_8x8_q8_K
#define lm_ggml_gemm_q5_K_8x8_q8_K_generic lm_ggml_gemm_q5_K_8x8_q8_K
#define lm_ggml_gemm_q6_K_8x4_q8_K_generic lm_ggml_gemm_q6_K_8x4_q8_K
#define lm_ggml_gemm_q6_K_8x8_q8_K_generic lm_ggml_gemm_q6_K_8x8_q8_K
#define lm_ggml_gemm_iq4_nl_4x4_q8_0_generic lm_ggml_gemm_iq4_nl_4x4_q8_0
#define lm_ggml_gemm_iq4_nl_8x8_q8_0_generic lm_ggml_gemm_iq4_nl_8x8_q8_0
Expand Down
Loading
Loading