llama : remove llama_constraint

ggml-ci

Author: ggerganov

common/common.cpp

@@ -841,15 +841,15 @@ bool gpt_params_find_arg(int argc, char ** argv, const std::string & arg, gpt_pa
         params.defrag_thold = std::stof(argv[i]);
         return true;
     }
-    if (arg == "--samplers" || arg == "--constraints") {
+    if (arg == "--samplers") {
         CHECK_ARG
-        const auto constraint_names = string_split(argv[i], ';');
-        sparams.constraints = gpt_constraint_types_from_names(constraint_names, true);
+        const auto sampler_names = string_split(argv[i], ';');
+        sparams.samplers = gpt_sampler_types_from_names(sampler_names, true);
         return true;
     }
     if (arg == "--sampling-seq") {
         CHECK_ARG
-        sparams.constraints = gpt_constraint_types_from_chars(argv[i]);
+        sparams.samplers = gpt_sampler_types_from_chars(argv[i]);
         return true;
     }
     if (arg == "--top-p") {
@@ -1696,13 +1696,13 @@ bool gpt_params_find_arg(int argc, char ** argv, const std::string & arg, gpt_pa
 void gpt_params_print_usage(int /*argc*/, char ** argv, const gpt_params & params) {
     const auto & sparams = params.sparams;
 
-    std::string constraint_type_chars;
-    std::string constraint_type_names;
-    for (const auto & constraint : sparams.constraints) {
-        constraint_type_chars += gpt_constraint_type_to_chr(constraint);
-        constraint_type_names += gpt_constraint_type_to_str(constraint) + ";";
+    std::string sampler_type_chars;
+    std::string sampler_type_names;
+    for (const auto & sampler : sparams.samplers) {
+        sampler_type_chars += gpt_sampler_type_to_chr(sampler);
+        sampler_type_names += gpt_sampler_type_to_str(sampler) + ";";
     }
-    constraint_type_names.pop_back();
+    sampler_type_names.pop_back();
 
     struct option_info {
         LLAMA_COMMON_ATTRIBUTE_FORMAT(4, 5)
@@ -1816,9 +1816,9 @@ void gpt_params_print_usage(int /*argc*/, char ** argv, const gpt_params & param
     options.push_back({ "sampling" });
     options.push_back({ "*",           "-s,    --seed SEED",            "RNG seed (default: %d, use random seed for < 0)", sparams.seed });
     options.push_back({ "*",           "       --samplers SAMPLERS",    "samplers that will be used for generation in the order, separated by \';\'\n"
-                                                                        "(default: %s)", constraint_type_names.c_str() });
+                                                                        "(default: %s)", sampler_type_names.c_str() });
     options.push_back({ "*",           "       --sampling-seq SEQUENCE",
-                                                                        "simplified sequence for samplers that will be used (default: %s)", constraint_type_chars.c_str() });
+                                                                        "simplified sequence for samplers that will be used (default: %s)", sampler_type_chars.c_str() });
     options.push_back({ "*",           "       --ignore-eos",           "ignore end of stream token and continue generating (implies --logit-bias EOS-inf)" });
     options.push_back({ "*",           "       --penalize-nl",          "penalize newline tokens (default: %s)", sparams.penalize_nl ? "true" : "false" });
     options.push_back({ "*",           "       --temp T",               "temperature (default: %.1f)", (double)sparams.temp });