01-load-progress.diff 1.4 KB

12345678910111213141516171819202122232425262728293031
  1. diff --git a/common/common.cpp b/common/common.cpp
  2. index ba1ecf0e..cead57cc 100644
  3. --- a/common/common.cpp
  4. +++ b/common/common.cpp
  5. @@ -1836,6 +1836,8 @@ struct llama_model_params llama_model_params_from_gpt_params(const gpt_params &
  6. mparams.use_mmap = params.use_mmap;
  7. mparams.use_mlock = params.use_mlock;
  8. mparams.check_tensors = params.check_tensors;
  9. + mparams.progress_callback = params.progress_callback;
  10. + mparams.progress_callback_user_data = params.progress_callback_user_data;
  11. if (params.kv_overrides.empty()) {
  12. mparams.kv_overrides = NULL;
  13. } else {
  14. diff --git a/common/common.h b/common/common.h
  15. index d80344f2..71e84834 100644
  16. --- a/common/common.h
  17. +++ b/common/common.h
  18. @@ -174,6 +174,13 @@ struct gpt_params {
  19. // multimodal models (see examples/llava)
  20. std::string mmproj = ""; // path to multimodal projector
  21. std::vector<std::string> image; // path to image file(s)
  22. +
  23. + // Called with a progress value between 0.0 and 1.0. Pass NULL to disable.
  24. + // If the provided progress_callback returns true, model loading continues.
  25. + // If it returns false, model loading is immediately aborted.
  26. + llama_progress_callback progress_callback = NULL;
  27. + // context pointer passed to the progress callback
  28. + void * progress_callback_user_data;
  29. };
  30. void gpt_params_handle_model_default(gpt_params & params);