common : relax sampler name matching

common/arg.cpp

@@ -1615,7 +1615,7 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
         string_format("samplers that will be used for generation in the order, separated by \';\'\n(default: %s)", sampler_type_names.c_str()),
         [](common_params & params, const std::string & value) {
             const auto sampler_names = string_split<std::string>(value, ';');
-            params.sampling.samplers = common_sampler_types_from_names(sampler_names, true);
+            params.sampling.samplers = common_sampler_types_from_names(sampler_names);
             params.sampling.user_sampling_config |= common_params_sampling_config::COMMON_PARAMS_SAMPLING_CONFIG_SAMPLERS;
         }
     ).set_sampling());

common/common.cpp

@@ -1148,7 +1148,7 @@ static void common_init_sampler_from_model(
         if (llama_model_meta_val_str(model, llama_model_meta_key_str(LLAMA_MODEL_META_KEY_SAMPLING_SEQUENCE), buf, sizeof(buf)) > 0) {
             const std::vector<std::string> sampler_names = string_split<std::string>(std::string(buf), ';');
             if (!sampler_names.empty()) {
-                sparams.samplers = common_sampler_types_from_names(sampler_names, true);
+                sparams.samplers = common_sampler_types_from_names(sampler_names);
             }
         }
     }

common/sampling.cpp

@@ -769,54 +769,53 @@ std::string common_sampler_type_to_str(enum common_sampler_type cnstr) {
     }
 }
 
-std::vector<common_sampler_type> common_sampler_types_from_names(const std::vector<std::string> & names, bool allow_alt_names) {
-    std::unordered_map<std::string, common_sampler_type> sampler_canonical_name_map {
-        { "dry",         COMMON_SAMPLER_TYPE_DRY },
-        { "top_k",       COMMON_SAMPLER_TYPE_TOP_K },
-        { "top_p",       COMMON_SAMPLER_TYPE_TOP_P },
+std::vector<common_sampler_type> common_sampler_types_from_names(const std::vector<std::string> & names) {
+    std::unordered_map<std::string, common_sampler_type> sampler_name_map {
+        // canonical sampler names
+        { "dry",         COMMON_SAMPLER_TYPE_DRY         },
+        { "top_k",       COMMON_SAMPLER_TYPE_TOP_K       },
+        { "top_p",       COMMON_SAMPLER_TYPE_TOP_P       },
         { "top_n_sigma", COMMON_SAMPLER_TYPE_TOP_N_SIGMA },
-        { "typ_p",       COMMON_SAMPLER_TYPE_TYPICAL_P },
-        { "min_p",       COMMON_SAMPLER_TYPE_MIN_P },
+        { "typ_p",       COMMON_SAMPLER_TYPE_TYPICAL_P   },
+        { "min_p",       COMMON_SAMPLER_TYPE_MIN_P       },
         { "temperature", COMMON_SAMPLER_TYPE_TEMPERATURE },
-        { "xtc",         COMMON_SAMPLER_TYPE_XTC },
-        { "infill",      COMMON_SAMPLER_TYPE_INFILL },
-        { "penalties",   COMMON_SAMPLER_TYPE_PENALTIES },
-        { "adaptive_p",  COMMON_SAMPLER_TYPE_ADAPTIVE_P },
-    };
-
-    // since samplers names are written multiple ways
-    // make it ready for both system names and input names
-    std::unordered_map<std::string, common_sampler_type> sampler_alt_name_map {
-        { "top-k",       COMMON_SAMPLER_TYPE_TOP_K },
-        { "top-p",       COMMON_SAMPLER_TYPE_TOP_P },
+        { "xtc",         COMMON_SAMPLER_TYPE_XTC         },
+        { "infill",      COMMON_SAMPLER_TYPE_INFILL      },
+        { "penalties",   COMMON_SAMPLER_TYPE_PENALTIES   },
+        { "adaptive_p",  COMMON_SAMPLER_TYPE_ADAPTIVE_P  },
+        // we support these alternative sampler names for compatibility
+        { "top-k",       COMMON_SAMPLER_TYPE_TOP_K       },
+        { "topk",        COMMON_SAMPLER_TYPE_TOP_K       },
+        { "top-p",       COMMON_SAMPLER_TYPE_TOP_P       },
+        { "topp",        COMMON_SAMPLER_TYPE_TOP_P       },
+        { "nucleus",     COMMON_SAMPLER_TYPE_TOP_P       },
         { "top-n-sigma", COMMON_SAMPLER_TYPE_TOP_N_SIGMA },
-        { "nucleus",     COMMON_SAMPLER_TYPE_TOP_P },
-        { "typical-p",   COMMON_SAMPLER_TYPE_TYPICAL_P },
-        { "typical",     COMMON_SAMPLER_TYPE_TYPICAL_P },
-        { "typ-p",       COMMON_SAMPLER_TYPE_TYPICAL_P },
-        { "typ",         COMMON_SAMPLER_TYPE_TYPICAL_P },
-        { "min-p",       COMMON_SAMPLER_TYPE_MIN_P },
+        { "top-nsigma",  COMMON_SAMPLER_TYPE_TOP_N_SIGMA },
+        { "typ-p",       COMMON_SAMPLER_TYPE_TYPICAL_P   },
+        { "typ",         COMMON_SAMPLER_TYPE_TYPICAL_P   },
+        { "typical_p",   COMMON_SAMPLER_TYPE_TYPICAL_P   },
+        { "typical-p",   COMMON_SAMPLER_TYPE_TYPICAL_P   },
+        { "typical",     COMMON_SAMPLER_TYPE_TYPICAL_P   },
+        { "min-p",       COMMON_SAMPLER_TYPE_MIN_P       },
+        { "minp",        COMMON_SAMPLER_TYPE_MIN_P       },
         { "temp",        COMMON_SAMPLER_TYPE_TEMPERATURE },
-        { "adaptive-p",  COMMON_SAMPLER_TYPE_ADAPTIVE_P },
+        { "adaptive-p",  COMMON_SAMPLER_TYPE_ADAPTIVE_P  },
+        { "adaptivep",   COMMON_SAMPLER_TYPE_ADAPTIVE_P  }
     };
 
     std::vector<common_sampler_type> samplers;
     samplers.reserve(names.size());
 
     for (const auto & name : names) {
-        auto sampler = sampler_canonical_name_map.find(name);
-        if (sampler != sampler_canonical_name_map.end()) {
+        // transform the given sampler name to lowercase before checking
+        std::string name_lower = name;
+        std::transform(name_lower.begin(), name_lower.end(), name_lower.begin(), ::tolower);
+        auto sampler = sampler_name_map.find(name_lower);
+        if (sampler != sampler_name_map.end()) {
             samplers.push_back(sampler->second);
             continue;
         }
-        if (allow_alt_names) {
-            sampler = sampler_alt_name_map.find(name);
-            if (sampler != sampler_alt_name_map.end()) {
-                samplers.push_back(sampler->second);
-                continue;
-            }
-        }
-        LOG_WRN("%s: unable to match sampler by name '%s'\n", __func__, name.c_str());
+        LOG_WRN("%s: unable to match sampler by name '%s'\n", __func__, name_lower.c_str());
     }
 
     return samplers;

common/sampling.h

@@ -109,7 +109,7 @@ std::string common_sampler_prev_str(common_sampler * gsmpl, llama_context * ctx,
 char        common_sampler_type_to_chr(enum common_sampler_type cnstr);
 std::string common_sampler_type_to_str(enum common_sampler_type cnstr);
 
-std::vector<enum common_sampler_type> common_sampler_types_from_names(const std::vector<std::string> & names, bool allow_alt_names);
+std::vector<enum common_sampler_type> common_sampler_types_from_names(const std::vector<std::string> & names);
 std::vector<enum common_sampler_type> common_sampler_types_from_chars(const std::string & chars);
 
 llama_sampler * llama_sampler_init_llg(const llama_vocab * vocab,

tools/server/server-task.cpp

@@ -605,7 +605,7 @@ task_params server_task::params_from_json_cmpl(
         const auto samplers = data.find("samplers");
         if (samplers != data.end()) {
             if (samplers->is_array()) {
-                params.sampling.samplers = common_sampler_types_from_names(*samplers, false);
+                params.sampling.samplers = common_sampler_types_from_names(*samplers);
             } else if (samplers->is_string()){
                 params.sampling.samplers = common_sampler_types_from_chars(samplers->get<std::string>());
             }