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

move the check for incompatible parameters to gpt_params_parse

Browse source
This commit is contained in:
Evan Jones 2023-05-09 22:28:40 -04:00
parent 8c88b172c5
commit 8826fb8e2f
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
examples/common.cpp
View file

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

5
examples/main/main.cpp
View file

@ -235,11 +235,6 @@ int main(int argc, char ** argv) {
} }
if (params.interactive) { if (params.interactive) {
if (params.prompt_cache_all) {
fprintf(stderr, "error: --prompt-cache-all not supported in interactive mode yet\n");
return 1;
}
#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__)) #if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
struct sigaction sigint_action; struct sigaction sigint_action;
sigint_action.sa_handler = sigint_handler; sigint_action.sa_handler = sigint_handler;