diff options
| author | Kawrakow <48489457+ikawrakow@users.noreply.github.com> | 2024-08-12 15:14:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-12 15:14:32 +0200 |
| commit | 8f43e551038af2547b5c01d0e9edd641c0e4bd29 (patch) | |
| tree | 07a4373620a9381d0b5c7189a475990a6feb48a5 /examples/main/main.cpp | |
| parent | f5d1af61d79fb53ccfbac2e665e43208c07b083d (diff) | |
Merge mainline - Aug 12 2024 (#17)
* Merge mainline
* Fix after merge
* Remove CI check
---------
Co-authored-by: Iwan Kawrakow <iwan.kawrakow@gmail.com>
Diffstat (limited to 'examples/main/main.cpp')
| -rw-r--r-- | examples/main/main.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/examples/main/main.cpp b/examples/main/main.cpp index 61e960ea..6e0635a6 100644 --- a/examples/main/main.cpp +++ b/examples/main/main.cpp @@ -207,7 +207,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 (sparams.cfg_scale > 1.f) { struct llama_context_params lparams = llama_context_params_from_gpt_params(params); ctx_guidance = llama_new_context_with_model(model, lparams); |