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

Update gpt_params_parse and fix a merge error take 2

Browse source
This commit is contained in:
Jason McCartney 2023-05-11 21:17:04 -07:00
parent 121c986d02
commit e052d53e51
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/common.cpp
View file

@ -346,7 +346,7 @@ bool gpt_params_parse(int argc, char ** argv, gpt_params & params) {
} }
if (params.prompt_cache_all && if (params.prompt_cache_all &&
(params.interactive || params.interactive_first || (params.interactive || params.interactive_first ||
params.instruct || params.antiprompt.size())) { params.instruct)) {
fprintf(stderr, "error: --prompt-cache-all not supported in interactive mode yet\n"); fprintf(stderr, "error: --prompt-cache-all not supported in interactive mode yet\n");
gpt_print_usage(argc, argv, default_params); gpt_print_usage(argc, argv, default_params);
exit(1); exit(1);

4
examples/main/main.cpp
View file

@ -210,7 +210,7 @@ int main(int argc, char ** argv) {
} }
// enable interactive mode if interactive start is specified // enable interactive mode if interactive start is specified
if (params.interactive_start) { if (params.interactive_first) {
params.interactive = true; params.interactive = true;
} }
@ -527,7 +527,7 @@ int main(int argc, char ** argv) {
if (last_output.find(antiprompt.c_str(), search_start_pos) != std::string::npos) { if (last_output.find(antiprompt.c_str(), search_start_pos) != std::string::npos) {
if (params.interactive) { if (params.interactive) {
is_interacting = true; is_interacting = true;
set_console_color(con_st, CONSOLE_COLOR_USER_INPUT); console_set_color(con_st, CONSOLE_COLOR_USER_INPUT);
} }
is_antiprompt = true; is_antiprompt = true;
fflush(stdout); fflush(stdout);