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

Allow caller to handle help/argument exceptions

Browse source
This commit is contained in:
Mason M 2023-10-21 14:40:57 -03:00
parent 465219b914
commit d0e14e6ecd
9 changed files with 83 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

24
common/common.cpp
View file

@ -105,7 +105,6 @@ void process_escapes(std::string& input) {
bool gpt_params_parse(int argc, char ** argv, gpt_params & params) {
bool invalid_param = false;
std::string arg;
gpt_params default_params;
const std::string arg_prefix = "--";
llama_sampling_params & sparams = params.sparams;
@ -547,11 +546,8 @@ bool gpt_params_parse(int argc, char ** argv, gpt_params & params) {
break;
}
} else if (arg == "-h" || arg == "--help") {
gpt_print_usage(argc, argv, default_params);
#ifndef LOG_DISABLE_LOGS
log_print_usage();
#endif // LOG_DISABLE_LOGS
exit(0);
return false;
} else if (arg == "--random-prompt") {
params.random_prompt = true;
} else if (arg == "--in-prefix-bos") {
@ -610,22 +606,17 @@ bool gpt_params_parse(int argc, char ** argv, gpt_params & params) {
// End of Parse args for logging parameters
#endif // LOG_DISABLE_LOGS
} else {
fprintf(stderr, "error: unknown argument: %s\n", arg.c_str());
gpt_print_usage(argc, argv, default_params);
exit(1);
throw std::invalid_argument("error: unknown argument: " + arg);
}
}
if (invalid_param) {
fprintf(stderr, "error: invalid parameter for argument: %s\n", arg.c_str());
gpt_print_usage(argc, argv, default_params);
exit(1);
throw std::invalid_argument("error: invalid parameter for argument: " + arg);
}
if (params.prompt_cache_all &&
(params.interactive || params.interactive_first ||
params.instruct)) {
fprintf(stderr, "error: --prompt-cache-all not supported in interactive mode yet\n");
gpt_print_usage(argc, argv, default_params);
exit(1);
throw std::invalid_argument("error: --prompt-cache-all not supported in interactive mode yet\n");
}
if (params.escape) {
@ -753,6 +744,9 @@ void gpt_print_usage(int /*argc*/, char ** argv, const gpt_params & params) {
printf(" -ld LOGDIR, --logdir LOGDIR\n");
printf(" path under which to save YAML logs (no logging if unset)\n");
printf("\n");
#ifndef LOG_DISABLE_LOGS
log_print_usage();
#endif // LOG_DISABLE_LOGS
}
std::string get_system_info(const gpt_params & params) {

8
examples/embedding/embedding.cpp
View file

@ -11,7 +11,15 @@
int main(int argc, char ** argv) {
gpt_params params;
try {
if (!gpt_params_parse(argc, argv, params)) {
gpt_print_usage(argc, argv, gpt_params());
return 1;
}
}
catch (const std::invalid_argument& ex) {
fprintf(stderr, ex.what());
gpt_print_usage(argc, argv, gpt_params());
return 1;
}

8
examples/infill/infill.cpp
View file

@ -107,7 +107,15 @@ int main(int argc, char ** argv) {
llama_sampling_params & sparams = params.sparams;
g_params = &params;
try {
if (!gpt_params_parse(argc, argv, params)) {
gpt_print_usage(argc, argv, gpt_params());
return 1;
}
}
catch (const std::invalid_argument& ex) {
fprintf(stderr, ex.what());
gpt_print_usage(argc, argv, gpt_params());
return 1;
}

9
examples/llava/llava.cpp
View file

@ -17,7 +17,16 @@ int main(int argc, char ** argv) {
gpt_params params;
try {
if (!gpt_params_parse(argc, argv, params)) {
gpt_print_usage(argc, argv, gpt_params());
show_additional_info(argc, argv);
return 1;
}
}
catch (const std::invalid_argument& ex) {
fprintf(stderr, ex.what());
gpt_print_usage(argc, argv, gpt_params());
show_additional_info(argc, argv);
return 1;
}

9
examples/main/main.cpp
View file

@ -105,9 +105,18 @@ int main(int argc, char ** argv) {
gpt_params params;
g_params = &params;
try {
if (!gpt_params_parse(argc, argv, params)) {
gpt_print_usage(argc, argv, gpt_params());
return 1;
}
}
catch (const std::invalid_argument& ex) {
fprintf(stderr, ex.what());
gpt_print_usage(argc, argv, gpt_params());
return 1;
}
llama_sampling_params & sparams = params.sparams;
#ifndef LOG_DISABLE_LOGS

10
examples/parallel/parallel.cpp
View file

@ -102,7 +102,15 @@ int main(int argc, char ** argv) {
gpt_params params;
if (gpt_params_parse(argc, argv, params) == false) {
try {
if (!gpt_params_parse(argc, argv, params)) {
gpt_print_usage(argc, argv, gpt_params());
return 1;
}
}
catch (const std::invalid_argument& ex) {
fprintf(stderr, ex.what());
gpt_print_usage(argc, argv, gpt_params());
return 1;
}

8
examples/perplexity/perplexity.cpp
View file

@ -682,7 +682,15 @@ int main(int argc, char ** argv) {
gpt_params params;
params.n_batch = 512;
try {
if (!gpt_params_parse(argc, argv, params)) {
gpt_print_usage(argc, argv, gpt_params());
return 1;
}
}
catch (const std::invalid_argument& ex) {
fprintf(stderr, ex.what());
gpt_print_usage(argc, argv, gpt_params());
return 1;
}

8
examples/save-load-state/save-load-state.cpp
View file

@ -11,7 +11,15 @@ int main(int argc, char ** argv) {
params.prompt = "The quick brown fox";
try {
if (!gpt_params_parse(argc, argv, params)) {
gpt_print_usage(argc, argv, gpt_params());
return 1;
}
}
catch (const std::invalid_argument& ex) {
fprintf(stderr, ex.what());
gpt_print_usage(argc, argv, gpt_params());
return 1;
}

10
examples/speculative/speculative.cpp
View file

@ -24,7 +24,15 @@ struct seq_draft {
int main(int argc, char ** argv) {
gpt_params params;
if (gpt_params_parse(argc, argv, params) == false) {
try {
if (!gpt_params_parse(argc, argv, params)) {
gpt_print_usage(argc, argv, gpt_params());
return 1;
}
}
catch (const std::invalid_argument& ex) {
fprintf(stderr, ex.what());
gpt_print_usage(argc, argv, gpt_params());
return 1;
}