Update llama.cpp submodule to latest release b3534 (#178)

jan-service-account · github-actions[bot] · sangjanai · web-flow · commit ee12d6408702 · 2024-08-07T11:05:26.000+07:00
* Update submodule to latest release b3534

* fix: API changes

* fix: assign model and context

---------

Co-authored-by: github-actions[bot] &lt;github-actions[bot]@users.noreply.github.com&gt;
Co-authored-by: vansangpfiev &lt;sang@jan.ai&gt;
diff --git a/llama.cpp b/llama.cpp
@@ -1 +1 @@
-Subproject commit bc0f887e159c0d78c28121e2c8b5c58094170875
+Subproject commit 641f5dd2a6422941faa9f32ab5cb50fc1b24c1f5
diff --git a/src/llama_server_context.cc b/src/llama_server_context.cc
@@ -177,7 +177,9 @@ bool LlamaServerContext::LoadModel(const gpt_params& params_) {
     }
   }
 
-  std::tie(model, ctx) = llama_init_from_gpt_params(params);
+  auto res = llama_init_from_gpt_params(params);
+  model = res.model;
+  ctx = res.context;
   if (model == nullptr) {
     LOG_ERROR_LLAMA("llama.cpp unable to load model",
                     {{"model", params.model}});

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,9 @@ bool LlamaServerContext::LoadModel(const gpt_params& params_) {`
`177`	`177`	`}`
`178`	`178`	`}`
`179`	`179`
`180`		`- std::tie(model, ctx) = llama_init_from_gpt_params(params);`
	`180`	`+ auto res = llama_init_from_gpt_params(params);`
	`181`	`+ model = res.model;`
	`182`	`+ ctx = res.context;`
`181`	`183`	`if (model == nullptr) {`
`182`	`184`	`LOG_ERROR_LLAMA("llama.cpp unable to load model",`
`183`	`185`	`{{"model", params.model}});`