浏览代码

Update llama.cpp (#4036)

* Bump llama.cpp to b2761

* Adjust types for bump
Daniel Hiltgen 1 年之前
父节点
当前提交
23d23409a0
共有 2 个文件被更改,包括 5 次插入5 次删除
  1. 4 4
      llm/ext_server/server.cpp
  2. 1 1
      llm/llama.cpp

+ 4 - 4
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;

+ 1 - 1
llm/llama.cpp

@@ -1 +1 @@
-Subproject commit 46e12c4692a37bdd31a0432fc5153d7d22bc7f72
+Subproject commit f4ab2a41476600a98067a9474ea8f9e6db41bcfa