happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

common: optimize duplicate detection with insert().second 

Co-authored-by: personalmountains <46615898+personalmountains@users.noreply.github.com>
This commit is contained in:
Pascal 2025-12-15 20:00:33 +01:00
parent a37539ea9b
commit ea7044eeb3
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/arg.cpp
View File

@ -432,10 +432,9 @@ static bool common_params_parse_ex(int argc, char ** argv, common_params_context
if (arg_to_options.find(arg) == arg_to_options.end()) { if (arg_to_options.find(arg) == arg_to_options.end()) {
throw std::invalid_argument(string_format("error: invalid argument: %s", arg.c_str())); throw std::invalid_argument(string_format("error: invalid argument: %s", arg.c_str()));
} }
if (seen_args.count(arg) > 0) { if (!seen_args.insert(arg).second) {
LOG_WRN("DEPRECATED: argument '%s' specified multiple times, use comma-separated values instead (only last value will be used)\n", arg.c_str()); LOG_WRN("DEPRECATED: argument '%s' specified multiple times, use comma-separated values instead (only last value will be used)\n", arg.c_str());
} }
seen_args.insert(arg);
auto & tmp = arg_to_options[arg]; auto & tmp = arg_to_options[arg];
auto opt = *tmp.first; auto opt = *tmp.first;
bool is_positive = tmp.second; bool is_positive = tmp.second;
@ -768,10 +767,9 @@ bool common_params_to_map(int argc, char ** argv, llama_example ex, std::map<com
if (arg_to_options.find(arg) == arg_to_options.end()) { if (arg_to_options.find(arg) == arg_to_options.end()) {
throw std::invalid_argument(string_format("error: invalid argument: %s", arg.c_str())); throw std::invalid_argument(string_format("error: invalid argument: %s", arg.c_str()));
} }
if (seen_args.count(arg) > 0) { if (!seen_args.insert(arg).second) {
LOG_WRN("DEPRECATED: argument '%s' specified multiple times, use comma-separated values instead (only last value will be used)\n", arg.c_str()); LOG_WRN("DEPRECATED: argument '%s' specified multiple times, use comma-separated values instead (only last value will be used)\n", arg.c_str());
} }
seen_args.insert(arg);
auto opt = *arg_to_options[arg]; auto opt = *arg_to_options[arg];
std::string val; std::string val;
if (opt.value_hint != nullptr) { if (opt.value_hint != nullptr) {