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/eval-callback/eval-callback.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/eval-callback/eval-callback.cpp')
| -rw-r--r-- | examples/eval-callback/eval-callback.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/examples/eval-callback/eval-callback.cpp b/examples/eval-callback/eval-callback.cpp index c8a3016a..ef35ba2c 100644 --- a/examples/eval-callback/eval-callback.cpp +++ b/examples/eval-callback/eval-callback.cpp @@ -62,7 +62,7 @@ static void ggml_print_tensor(uint8_t * data, ggml_type type, const int64_t * ne } else if (type == GGML_TYPE_I8) { v = (float) *(int8_t *) &data[i]; } else { - GGML_ASSERT(false); + GGML_ABORT("fatal error"); } printf("%12.4f", v); sum += v; @@ -163,9 +163,10 @@ int main(int argc, char ** argv) { params.warmup = false; // init - llama_model * model; - llama_context * ctx; - 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; if (model == nullptr || ctx == nullptr) { fprintf(stderr, "%s : failed to init\n", __func__); return 1; |