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

fix merge conflict

Browse source
This commit is contained in:
Minsoo Cheong 2024-03-24 21:28:17 +09:00
parent 3cb7567607
commit 0cacdecd13
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/common.h
View file

@ -171,7 +171,7 @@ bool gpt_params_parse(int argc, char ** argv, gpt_params & params);
void gpt_print_usage(int argc, char ** argv, const gpt_params & params); void gpt_print_usage(int argc, char ** argv, const gpt_params & params);
bool gpt_params_find_arg(int argc, char ** argv, gpt_params & params, int & i, bool & invalid_param); bool gpt_params_find_arg(int argc, char ** argv, const std::string & arg, gpt_params & params, int & i, bool & invalid_param);
std::string get_system_info(const gpt_params & params); std::string get_system_info(const gpt_params & params);

2
examples/retrieval/retrieval.cpp
View file

@ -25,7 +25,7 @@ static void retrieval_params_parse(int argc, char ** argv, gpt_params & gpt_para
while(i < argc) { while(i < argc) {
arg = argv[i]; arg = argv[i];
bool invalid_gpt_param = false; bool invalid_gpt_param = false;
if(gpt_params_find_arg(argc, argv, gpt_params, i, invalid_gpt_param)) { if(gpt_params_find_arg(argc, argv, argv[i], gpt_params, i, invalid_gpt_param)) {
if (invalid_gpt_param) { if (invalid_gpt_param) {
fprintf(stderr, "error: invalid argument: %s\n", arg.c_str()); fprintf(stderr, "error: invalid argument: %s\n", arg.c_str());
retrieval_params_print_usage(argc, argv, gpt_params, retrieval_params); retrieval_params_print_usage(argc, argv, gpt_params, retrieval_params);