Merge branch 'upstream' into concedo_experimental

# Conflicts: # CMakeLists.txt # Makefile # README.md # common/common.cpp # requirements/requirements-convert-hf-to-gguf-update.txt # requirements/requirements-convert-hf-to-gguf.txt # requirements/requirements-convert.txt # tests/CMakeLists.txt # tests/test-json-schema-to-grammar.cpp
2026-09-19 17:25:07 +02:00 · 2024-05-09 15:13:34 +08:00
parent caf9f21888 4426e2987b
commit d084f78faa
48 changed files with 3786 additions and 1438 deletions
@@ -156,6 +156,7 @@ struct gpt_params {
    bool random_prompt     = false; // do not randomize prompt if none provided
    bool use_color         = false; // use color to distinguish generations and inputs
    bool interactive       = false; // interactive mode
+    bool conversation      = false; // conversation mode (does not print special tokens and suffix/prefix)
    bool chatml            = false; // chatml mode (used for models trained on chatml syntax)
    bool prompt_cache_all  = false; // save user input and generations to prompt cache
    bool prompt_cache_ro   = false; // open the prompt cache read-only and do not update it