vrr/koboldcpp
2
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2026-05-09 19:46:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated lite, added compile flag fix

Browse source
This commit is contained in:
Concedo 2024-09-07 10:27:37 +08:00
parent 73dca7e5bc
commit 2e74bd0327
2 changed files with 49 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -48,12 +48,19 @@ ifdef KCPP_DEBUG
CFLAGS = -g -O0
CXXFLAGS = -g -O0
endif
CFLAGS += -I. -Iggml/include -Iggml/src -Iinclude -Isrc -I./include -I./include/CL -I./otherarch -I./otherarch/tools -I./otherarch/sdcpp -I./otherarch/sdcpp/thirdparty -I./include/vulkan -O3 -fno-finite-math-only -std=c11 -fPIC -DLOG_DISABLE_LOGS -D_GNU_SOURCE -DGGML_USE_LLAMAFILE
CXXFLAGS += -I. -Iggml/include -Iggml/src -Iinclude -Isrc -I./common -I./include -I./include/CL -I./otherarch -I./otherarch/tools -I./otherarch/sdcpp -I./otherarch/sdcpp/thirdparty -I./include/vulkan -O3 -fno-finite-math-only -std=c++11 -fPIC -DLOG_DISABLE_LOGS -D_GNU_SOURCE -DGGML_USE_LLAMAFILE
CFLAGS += -I. -Iggml/include -Iggml/src -Iinclude -Isrc -I./include -I./include/CL -I./otherarch -I./otherarch/tools -I./otherarch/sdcpp -I./otherarch/sdcpp/thirdparty -I./include/vulkan -O3 -fno-finite-math-only -std=c11 -fPIC -DLOG_DISABLE_LOGS -D_GNU_SOURCE
CXXFLAGS += -I. -Iggml/include -Iggml/src -Iinclude -Isrc -I./common -I./include -I./include/CL -I./otherarch -I./otherarch/tools -I./otherarch/sdcpp -I./otherarch/sdcpp/thirdparty -I./include/vulkan -O3 -fno-finite-math-only -std=c++11 -fPIC -DLOG_DISABLE_LOGS -D_GNU_SOURCE
ifndef KCPP_DEBUG
CFLAGS += -DNDEBUG -s
CXXFLAGS += -DNDEBUG -s
endif
ifdef LLAMA_NO_LLAMAFILE
GGML_NO_LLAMAFILE := 1
endif
ifndef GGML_NO_LLAMAFILE
CFLAGS += -DGGML_USE_LLAMAFILE
CXXFLAGS += -DGGML_USE_LLAMAFILE
endif
#lets try enabling everything
CFLAGS += -pthread -Wno-deprecated -Wno-deprecated-declarations -Wno-unused-variable

50
klite.embd
View file

@ -6251,7 +6251,7 @@ Current version indicated by LITEVER below.
let ll = Math.min(pat.length,rep.length)
for(let i=0;i<ll;++i)
{
regexreplace_data.push({"p":pat[i],"r":rep[i],"b":false});
regexreplace_data.push({"p":pat[i],"r":rep[i],"b":false,"d":false});
}
}
if (storyobj.regexreplace_data) {
@ -10318,11 +10318,13 @@ Current version indicated by LITEVER below.
function show_welcome_panel()
{
document.getElementById("welcomecontainer").classList.remove('hidden');
mainmenu_untab(true);
select_welcome_ui();
}
function close_welcome_panel(isok)
{
mainmenu_untab(false);
if(isok)
{
const selected = document.querySelector('input[name="welcometheme"]:checked');
@ -10483,6 +10485,7 @@ Current version indicated by LITEVER below.
let box1 = document.getElementById("regexreplace_pattern"+i);
let box2 = document.getElementById("regexreplace_replacement"+i);
let bw = document.getElementById("regexreplace_bothways"+i).checked;
let disponly = document.getElementById("regexreplace_displayonly"+i).checked;
if(!box1 || !box2)
{
break;
@ -10498,7 +10501,7 @@ Current version indicated by LITEVER below.
if(v1)
{
regexreplace_data.push({"p":v1,"r":v2,"b":bw});
regexreplace_data.push({"p":v1,"r":v2,"b":bw,"d":disponly});
}
}
@ -10840,6 +10843,24 @@ Current version indicated by LITEVER below.
return inputtxt;
}
function apply_display_only_regex(inputtxt)
{
//apply regex transforms
if(regexreplace_data && regexreplace_data.length>0)
{
for(let i=0;i<regexreplace_data.length;++i)
{
if(regexreplace_data[i].d && regexreplace_data[i].p!="")
{
let escapedpat = escapeHtml(regexreplace_data[i].p);
let pat = new RegExp(escapedpat, "gm");
inputtxt = inputtxt.replace(pat, regexreplace_data[i].r);
}
}
}
return inputtxt;
}
function end_trim_to_sentence(input,include_newline=false) {
let last = -1;
let enders = ['.', '!', '?', '*', '"', ')', '}', '`', ']', ';', '…'];
@ -11534,7 +11555,7 @@ Current version indicated by LITEVER below.
{
for(let i=0;i<regexreplace_data.length;++i)
{
if(regexreplace_data[i].b && regexreplace_data[i].p!="")
if(regexreplace_data[i].b && !(regexreplace_data[i].d) && regexreplace_data[i].p!="")
{
let pat = new RegExp(regexreplace_data[i].p, "gm");
newgen = newgen.replace(pat, regexreplace_data[i].r);
@ -13454,7 +13475,7 @@ Current version indicated by LITEVER below.
{
for(let i=0;i<regexreplace_data.length;++i)
{
if(regexreplace_data[i].p!="")
if(regexreplace_data[i].p!="" && !(regexreplace_data[i].d))
{
let pat = new RegExp(regexreplace_data[i].p, "gm");
gentxt = gentxt.replace(pat, regexreplace_data[i].r);
@ -14967,6 +14988,7 @@ Current version indicated by LITEVER below.
fulltxt = concat_gametext(false, "", "%SpnStg%", "%SpnEtg%",true);
} else {
fulltxt = concat_gametext(false, "", "", "",true);
fulltxt = apply_display_only_regex(fulltxt);
fulltxt = replace_placeholders(fulltxt,true);
}
@ -15210,6 +15232,7 @@ Current version indicated by LITEVER below.
else if (!inEditMode && isAestheticUiStyle)
{
let textToRender = (gametext_arr.length == 0 ? document.getElementById("gametext").innerHTML : concat_gametext(false, "", "", "", true));
textToRender = apply_display_only_regex(textToRender);
textToRender = replace_placeholders(textToRender,true);
if(localsettings.opmode==3 && localsettings.gui_type_chat==1)
@ -15626,6 +15649,7 @@ Current version indicated by LITEVER below.
let processed_msg = curr.msg;
if(processed_msg && processed_msg!="")
{
processed_msg = apply_display_only_regex(processed_msg);
processed_msg = replace_noninstruct_placeholders(processed_msg,true);
let codeblockcount = (processed_msg.match(/```/g) || []).length;
if(codeblockcount>0 && codeblockcount%2!=0 )
@ -16199,6 +16223,7 @@ Current version indicated by LITEVER below.
<th>Pattern <span class="helpicon">?<span class="helptext">The regex pattern to match against any incoming text. Leave blank to disable.</span></span></th>
<th>Replacement <span class="helpicon">?<span class="helptext">The string to replace matches with. Capture groups are allowed (e.g. $1). To remove all matches, leave this blank.</span></span></th>
<th>Both Ways <span class="helpicon">?<span class="helptext">If enabled, regex applies for both inputs and outputs, otherwise output only.</span></span></th>
<th>Display Only <span class="helpicon">?<span class="helptext">If enabled, regex replacements only affect displayed text without modifying context.</span></span></th>
</tr>`;
let regextable = document.getElementById("regex_replace_table");
@ -16209,6 +16234,7 @@ Current version indicated by LITEVER below.
<td><input class="settinglabel miniinput" type="text" placeholder="(Inactive)" value="" id="regexreplace_pattern${i}"></td>
<td><input class="settinglabel miniinput" type="text" placeholder="(Remove)" value="" id="regexreplace_replacement${i}"></td>
<td><input type="checkbox" id="regexreplace_bothways${i}" style="margin:0px 0 0;"></td>
<td><input type="checkbox" id="regexreplace_displayonly${i}" style="margin:0px 0 0;"></td>
</tr>
`;
}
@ -16220,18 +16246,21 @@ Current version indicated by LITEVER below.
let a1 = document.getElementById("regexreplace_pattern"+i);
let a2 = document.getElementById("regexreplace_replacement"+i);
let a3 = document.getElementById("regexreplace_bothways"+i);
if(a1 && a2 && a3)
let a4 = document.getElementById("regexreplace_displayonly"+i);
if(a1 && a2 && a3 && a4)
{
if(i<regexreplace_data.length)
{
a1.value = regexreplace_data[i].p;
a2.value = regexreplace_data[i].r;
a3.checked = (regexreplace_data[i].b?true:false);
a4.checked = (regexreplace_data[i].d?true:false);
}
else
{
a1.value = a2.value = "";
a3.checked = false;
a4.checked = false;
}
}
}
@ -19011,24 +19040,25 @@ Current version indicated by LITEVER below.
<div class="welcome-theme-selector">
<div class="welcome-theme-option">
<label><div class="welcome-theme-image welcomeimg1"></div>
<input onchange="select_welcome_ui()" type="radio" name="welcometheme" value="0" checked="true"> Classic </label>
<input onchange="select_welcome_ui()" type="radio" title="Classic UI Theme" name="welcometheme" value="0" checked="true"> Classic UI </label>
</div>
<div class="welcome-theme-option">
<label><div class="welcome-theme-image welcomeimg2"></div>
<input onchange="select_welcome_ui()" type="radio" name="welcometheme" value="2"> Aesthetic </label>
<input onchange="select_welcome_ui()" type="radio" title="Aesthetic UI Theme" name="welcometheme" value="2"> Aesthetic UI </label>
</div>
<div class="welcome-theme-option">
<label><div class="welcome-theme-image welcomeimg3"></div>
<input onchange="select_welcome_ui()" type="radio" name="welcometheme" value="3"> Corpo </label>
<input onchange="select_welcome_ui()" type="radio" title="Corpo UI Theme" name="welcometheme" value="3"> Corpo UI </label>
</div>
</div>
<div style="margin-top: 10px;">
<p id="welcomeuidesc"></p>
<p class="color_lightgray" id="welcomeuidesc"></p>
<p>Alternatively, you can <a href="#" class="color_blueurl" onclick="close_welcome_panel(false);load_file_button()">Load A Savefile</a> or <a href="#" class="color_blueurl" onclick="close_welcome_panel(false);display_scenarios()">Quick Start Scenario</a></p>
</div>
</div>
<div class="popupfooter">
<button type="button" class="btn btn-primary" onclick="close_welcome_panel(true)">Ok</button>
<button type="button" class="btn btn-primary" onclick="close_welcome_panel(true)">Set UI</button>
<button type="button" class="btn btn-primary" onclick="close_welcome_panel()">Cancel</button>
</div>
</div>