Merge mainline

This commit is contained in:
Iwan Kawrakow
2024-08-12 11:54:01 +03:00
parent f5d1af61d7
commit 3188517cf4
165 changed files with 9073 additions and 3403 deletions

View File

@@ -179,7 +179,10 @@ int main(int argc, char ** argv) {
// load the model and apply lora adapter, if any
LOG("%s: load the model and apply lora adapter, if any\n", __func__);
std::tie(model, ctx) = llama_init_from_gpt_params(params);
llama_init_result llama_init = llama_init_from_gpt_params(params);
model = llama_init.model;
ctx = llama_init.context;
if (model == NULL) {
LOG_TEE("%s: error: unable to load model\n", __func__);