move the check for incompatible parameters to gpt_params_parse

ggerganov · May 10, 2023 · 8826fb8 · 8826fb8
1 parent 8c88b17
commit 8826fb8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/examples/common.cpp b/examples/common.cpp
@@ -344,6 +344,13 @@ bool gpt_params_parse(int argc, char ** argv, gpt_params & params) {
         gpt_print_usage(argc, argv, default_params);
         exit(1);
     }
+    if (params.prompt_cache_all &&
+            (params.interactive || params.interactive_first ||
+             params.instruct || params.antiprompt.size())) {
+        fprintf(stderr, "error: --prompt-cache-all not supported in interactive mode yet\n");
+        gpt_print_usage(argc, argv, default_params);
+        exit(1);
+    }
     if (escape_prompt) {
         process_escapes(params.prompt);
     }

diff --git a/examples/main/main.cpp b/examples/main/main.cpp
@@ -235,11 +235,6 @@ int main(int argc, char ** argv) {
     }
 
     if (params.interactive) {
-        if (params.prompt_cache_all) {
-            fprintf(stderr, "error: --prompt-cache-all not supported in interactive mode yet\n");
-            return 1;
-        }
-
 #if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
         struct sigaction sigint_action;
         sigint_action.sa_handler = sigint_handler;