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/parallel/parallel.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/parallel/parallel.cpp')
| -rw-r--r-- | examples/parallel/parallel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/parallel/parallel.cpp b/examples/parallel/parallel.cpp index 7faeaec9..621a1c95 100644 --- a/examples/parallel/parallel.cpp +++ b/examples/parallel/parallel.cpp @@ -129,11 +129,11 @@ int main(int argc, char ** argv) { llama_backend_init(); llama_numa_init(params.numa); - llama_model * model = NULL; - llama_context * ctx = NULL; - // load the target model - std::tie(model, ctx) = llama_init_from_gpt_params(params); + llama_init_result llama_init = llama_init_from_gpt_params(params); + + llama_model * model = llama_init.model; + llama_context * ctx = llama_init.context; // load the prompts from an external file if there are any if (params.prompt.empty()) { |