From 23d23409a02430a700d5e76ac92f97554ec6d9e7 Mon Sep 17 00:00:00 2001 From: Daniel Hiltgen Date: Mon, 29 Apr 2024 20:18:48 -0700 Subject: [PATCH] Update llama.cpp (#4036) * Bump llama.cpp to b2761 * Adjust types for bump --- llm/ext_server/server.cpp | 8 ++++---- llm/llama.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/llm/ext_server/server.cpp b/llm/ext_server/server.cpp index 22117037..61ef20dc 100644 --- a/llm/ext_server/server.cpp +++ b/llm/ext_server/server.cpp @@ -2644,18 +2644,18 @@ static void server_params_parse(int argc, char **argv, server_params &sparams, if (strncmp(sep, "int:", 4) == 0) { sep += 4; kvo.tag = LLAMA_KV_OVERRIDE_TYPE_INT; - kvo.int_value = std::atol(sep); + kvo.val_i64 = std::atol(sep); } else if (strncmp(sep, "float:", 6) == 0) { sep += 6; kvo.tag = LLAMA_KV_OVERRIDE_TYPE_FLOAT; - kvo.float_value = std::atof(sep); + kvo.val_f64 = std::atof(sep); } else if (strncmp(sep, "bool:", 5) == 0) { sep += 5; kvo.tag = LLAMA_KV_OVERRIDE_TYPE_BOOL; if (std::strcmp(sep, "true") == 0) { - kvo.bool_value = true; + kvo.val_bool = true; } else if (std::strcmp(sep, "false") == 0) { - kvo.bool_value = false; + kvo.val_bool = false; } else { fprintf(stderr, "error: Invalid boolean value for KV override: %s\n", argv[i]); invalid_param = true; diff --git a/llm/llama.cpp b/llm/llama.cpp index 46e12c46..f4ab2a41 160000 --- a/llm/llama.cpp +++ b/llm/llama.cpp @@ -1 +1 @@ -Subproject commit 46e12c4692a37bdd31a0432fc5153d7d22bc7f72 +Subproject commit f4ab2a41476600a98067a9474ea8f9e6db41bcfa