vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nits

Browse source
This commit is contained in:
ochafik 2025-01-30 04:20:06 +00:00
parent f8e14bffc3
commit 81547e6f9b
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/chat.cpp
View file

@ -841,4 +841,4 @@ common_chat_msg common_chat_parse(const std::string & input, common_chat_format
default: default:
throw std::runtime_error("Unsupported format: " + common_chat_format_name(format)); throw std::runtime_error("Unsupported format: " + common_chat_format_name(format));
} }
} }

2
common/chat.hpp
View file

@ -32,7 +32,7 @@ enum common_chat_format {
COMMON_CHAT_FORMAT_FUNCTIONARY_V3_2, COMMON_CHAT_FORMAT_FUNCTIONARY_V3_2,
COMMON_CHAT_FORMAT_FUNCTIONARY_V3_1_LLAMA_3_1, COMMON_CHAT_FORMAT_FUNCTIONARY_V3_1_LLAMA_3_1,
COMMON_CHAT_FORMAT_HERMES_2_PRO, COMMON_CHAT_FORMAT_HERMES_2_PRO,
COMMON_CHAT_FORMAT_COUNT, // Not a format, just the # formats COMMON_CHAT_FORMAT_COUNT, // Not a format, just the # formats
}; };

2
examples/server/server.cpp
View file

@ -340,7 +340,7 @@ struct server_task {
{ {
auto it = data.find("chat_format"); auto it = data.find("chat_format");
if (it != data.end()) { if (it != data.end()) {
params.oaicompat_chat_format = static_cast<common_chat_format>(it->get<u_int32_t>()); params.oaicompat_chat_format = static_cast<common_chat_format>(it->get<int>());
} else { } else {
params.oaicompat_chat_format = defaults.oaicompat_chat_format; params.oaicompat_chat_format = defaults.oaicompat_chat_format;
} }

2
examples/server/utils.hpp
View file

@ -643,7 +643,7 @@ static json oaicompat_completion_params_parse(
inputs.json_schema = json_value(llama_params, "json_schema", json::object()); inputs.json_schema = json_value(llama_params, "json_schema", json::object());
auto chat_params = common_chat_params_init(tmpl, inputs); auto chat_params = common_chat_params_init(tmpl, inputs);
llama_params["chat_format"] = static_cast<u_int32_t>(chat_params.format); llama_params["chat_format"] = static_cast<int>(chat_params.format);
llama_params["prompt"] = chat_params.prompt; llama_params["prompt"] = chat_params.prompt;
llama_params["grammar"] = chat_params.grammar; llama_params["grammar"] = chat_params.grammar;
llama_params["grammar_lazy"] = chat_params.grammar_lazy; llama_params["grammar_lazy"] = chat_params.grammar_lazy;