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

clean up arg parse

Browse source
This commit is contained in:
ngxson 2024-03-27 13:39:43 +01:00
parent 12b255487f
commit 843bc30c34
1 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
examples/gguf-split/gguf-split.cpp
View file

@ -62,12 +62,12 @@ static size_t split_str_to_n_bytes(std::string str) {
sscanf(str.c_str(), "%d", &n); sscanf(str.c_str(), "%d", &n);
n_bytes = n * 1024 * 1024 * 1024; // gigabytes n_bytes = n * 1024 * 1024 * 1024; // gigabytes
} else { } else {
throw std::invalid_argument("error: supported units are M (megabytes) or G (gigabytes), but got " + str.back()); throw std::invalid_argument("error: supported units are M (megabytes) or G (gigabytes), but got: " + std::string(1, str.back()));
} }
return n_bytes; return n_bytes;
} }
static bool split_params_parse_ex(int argc, const char ** argv, split_params & params) { static void split_params_parse_ex(int argc, const char ** argv, split_params & params) {
std::string arg; std::string arg;
const std::string arg_prefix = "--"; const std::string arg_prefix = "--";
bool invalid_param = false; bool invalid_param = false;
@ -138,24 +138,17 @@ static bool split_params_parse_ex(int argc, const char ** argv, split_params & p
} }
if (argc - arg_idx < 2) { if (argc - arg_idx < 2) {
printf("%s: bad arguments\n", argv[0]); throw std::invalid_argument("error: bad arguments");
split_print_usage(argv[0]);
return false;
} }
params.input = argv[arg_idx++]; params.input = argv[arg_idx++];
params.output = argv[arg_idx++]; params.output = argv[arg_idx++];
return true;
} }
static bool split_params_parse(int argc, const char ** argv, split_params & params) { static bool split_params_parse(int argc, const char ** argv, split_params & params) {
bool result = true; bool result = true;
try { try {
if (!split_params_parse_ex(argc, argv, params)) { split_params_parse_ex(argc, argv, params);
split_print_usage(argv[0]);
exit(EXIT_FAILURE);
}
} }
catch (const std::invalid_argument & ex) { catch (const std::invalid_argument & ex) {
fprintf(stderr, "%s\n", ex.what()); fprintf(stderr, "%s\n", ex.what());
@ -501,10 +494,6 @@ static void gguf_merge(const split_params & split_params) {
} }
int main(int argc, const char ** argv) { int main(int argc, const char ** argv) {
if (argc < 3) {
split_print_usage(argv[0]);
}
split_params params; split_params params;
split_params_parse(argc, argv, params); split_params_parse(argc, argv, params);