From 0cacdecd13a6a2415536e3ba0c3ea4e50eaf127e Mon Sep 17 00:00:00 2001 From: Minsoo Cheong Date: Sun, 24 Mar 2024 21:28:17 +0900 Subject: [PATCH] fix merge conflict --- common/common.h | 2 +- examples/retrieval/retrieval.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/common.h b/common/common.h index df4670220..99ee90bc3 100644 --- a/common/common.h +++ b/common/common.h @@ -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); -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); diff --git a/examples/retrieval/retrieval.cpp b/examples/retrieval/retrieval.cpp index 39b0fa2d8..8aaf6da04 100644 --- a/examples/retrieval/retrieval.cpp +++ b/examples/retrieval/retrieval.cpp @@ -25,7 +25,7 @@ static void retrieval_params_parse(int argc, char ** argv, gpt_params & gpt_para while(i < argc) { arg = argv[i]; 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) { fprintf(stderr, "error: invalid argument: %s\n", arg.c_str()); retrieval_params_print_usage(argc, argv, gpt_params, retrieval_params);