diff --git a/gpttype_adapter.cpp b/gpttype_adapter.cpp index b2a393298..5533a7c55 100644 --- a/gpttype_adapter.cpp +++ b/gpttype_adapter.cpp @@ -1640,7 +1640,7 @@ const std::vector & sampler_order, llama_grammar * grammar, float dyna else if (nsigma > 0.0f) { sample_top_k(&candidates_p, top_k); - if (dynatemp_range > 0) { + if (dynatemp_range != 0) { float dynatemp_min = temp - dynatemp_range; float dynatemp_max = temp + dynatemp_range; //do not allow negative values diff --git a/kcpp_docs.embd b/kcpp_docs.embd index 9ce588a83..49abc72c7 100644 --- a/kcpp_docs.embd +++ b/kcpp_docs.embd @@ -141,8 +141,9 @@ }, "dynatemp_range": { "default": 0, - "description": "If greater than 0, uses dynamic temperature. Dynamic temperature range will be between Temp+Range and Temp-Range. If less or equal to 0 , uses static temperature.", - "minimum": 0, + "description": "If not equal to 0, uses dynamic temperature. Dynamic temperature range will be between Temp+Range and Temp-Range. If equal to 0 , uses static temperature.", + "minimum": -5, + "maximum": 5, "type": "number" }, "smoothing_factor": { diff --git a/klite.embd b/klite.embd index 342adaeb2..4bb1dee75 100644 --- a/klite.embd +++ b/klite.embd @@ -8526,13 +8526,8 @@ Current version indicated by LITEVER below. { let a1 = parseFloat(document.getElementById("dynatemp_min").value); let a2 = parseFloat(document.getElementById("dynatemp_max").value); - if (a20?"ON":"OFF"); + document.getElementById("dynatemp_overview").innerText = (document.getElementById("dynatemp_range").value!=0?"ON":"OFF"); } function show_dynatemp() { @@ -10867,7 +10862,7 @@ Current version indicated by LITEVER below. document.getElementById("dynatemp_exponent").value = localsettings.dynatemp_exponent; document.getElementById("smoothing_factor").value = localsettings.smoothing_factor; document.getElementById("nsigma").value = localsettings.nsigma; - document.getElementById("dynatemp_overview").innerText = (localsettings.dynatemp_range>0?"ON":"OFF"); + document.getElementById("dynatemp_overview").innerText = (localsettings.dynatemp_range!=0?"ON":"OFF"); document.getElementById("presence_penalty").value = localsettings.presence_penalty; document.getElementById("sampler_seed").value = localsettings.sampler_seed; document.getElementById("top_k").value = document.getElementById("top_k_slide").value = localsettings.top_k; @@ -11072,7 +11067,7 @@ Current version indicated by LITEVER below. document.getElementById("rep_pen_slope").value = found.rep_pen_slope; document.getElementById("sampler_order").value = found.sampler_order.toString(); document.getElementById("presetsdesc").innerText = found.description; - document.getElementById("dynatemp_overview").innerText = (document.getElementById("dynatemp_range").value>0?"ON":"OFF"); + document.getElementById("dynatemp_overview").innerText = (document.getElementById("dynatemp_range").value!=0?"ON":"OFF"); }else{ document.getElementById("presetsdesc").innerText = ""; } @@ -11418,8 +11413,8 @@ Current version indicated by LITEVER below. localsettings.rep_pen_slope = cleannum(localsettings.rep_pen_slope, 0, 20); localsettings.top_p = cleannum(localsettings.top_p, 0.002, 1); localsettings.min_p = cleannum(localsettings.min_p, 0.0, 1); - localsettings.dynatemp_range = cleannum(localsettings.dynatemp_range, 0.0, 5); - localsettings.dynatemp_range = (localsettings.dynatemp_range>localsettings.temperature?localsettings.temperature:localsettings.dynatemp_range); + localsettings.dynatemp_range = cleannum(localsettings.dynatemp_range, -5, 5); + localsettings.dynatemp_range = (localsettings.dynatemp_range>localsettings.temperature?localsettings.temperature:localsettings.dynatemp_range<-localsettings.temperature?-localsettings.temperature:localsettings.dynatemp_range); localsettings.dynatemp_exponent = cleannum(localsettings.dynatemp_exponent, 0.0, 10.0); localsettings.smoothing_factor = cleannum(localsettings.smoothing_factor, 0.0, 10.0); localsettings.nsigma = cleannum(localsettings.nsigma, 0.0, 5.0); diff --git a/otherarch/otherarch.h b/otherarch/otherarch.h index 397ce6983..62c03a047 100644 --- a/otherarch/otherarch.h +++ b/otherarch/otherarch.h @@ -47,7 +47,7 @@ struct kcpp_params { std::vector dry_sequence_breakers; // DRY sequence breakers float xtc_threshold = 0; float xtc_probability = 0; - float dynatemp_range = 0.0f; // enables DynaTemp if greater than 0. dynatemp_min = temperature - dt_range, dynatemp_max = temperature + dt_range + float dynatemp_range = 0.0f; // enables DynaTemp if neq 0. dynatemp_min = temperature - dt_range, dynatemp_max = temperature + dt_range float dynatemp_exponent = 1.0f; std::string model_filename = ""; // model path