vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

main: refactor ctrl_token_no_out --> no_special

Browse source
This commit is contained in:
brian khuu 2024-05-21 16:03:18 +10:00
parent 7d52482bac
commit 8f76ba54ba
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/common.cpp
View file

@ -906,7 +906,7 @@ bool gpt_params_find_arg(int argc, char ** argv, const std::string & arg, gpt_pa
return true; return true;
} }
if (arg == "--no-special") { if (arg == "--no-special") {
params.ctrl_token_no_out = true; params.no_special = true;
return true; return true;
} }
if (arg == "--embedding") { if (arg == "--embedding") {

2
common/common.h
View file

@ -142,7 +142,7 @@ struct gpt_params {
bool use_color = false; // use color to distinguish generations and inputs bool use_color = false; // use color to distinguish generations and inputs
bool interactive = false; // interactive mode bool interactive = false; // interactive mode
bool interactive_specials = false; // whether to allow special tokens from user, during interactive mode bool interactive_specials = false; // whether to allow special tokens from user, during interactive mode
bool ctrl_token_no_out = false; // disable control token output bool no_special = false; // disable control token output
bool conversation = false; // conversation mode (does not print special tokens and suffix/prefix) 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 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_all = false; // save user input and generations to prompt cache

2
examples/main/main.cpp
View file

@ -760,7 +760,7 @@ int main(int argc, char ** argv) {
if (!llama_token_is_control_token(llama_get_model(ctx), id)) { if (!llama_token_is_control_token(llama_get_model(ctx), id)) {
// Stream Output Token To Standard Output // Stream Output Token To Standard Output
fprintf(stdout, "%s", token_str.c_str()); fprintf(stdout, "%s", token_str.c_str());
} else if (!params.ctrl_token_no_out) { } else if (!params.no_special) {
#ifndef _MSC_VER #ifndef _MSC_VER
if (control_token_file_descriptor_is_attached) { if (control_token_file_descriptor_is_attached) {
// Stream Control Token To Special Token Output. Useful for debugging control token behaviour // Stream Control Token To Special Token Output. Useful for debugging control token behaviour