Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	docs/backend/SYCL.md

examples/llava/clip.cpp

@@ -1714,7 +1714,7 @@ static void normalize_image_u8_to_f32(const clip_image_u8* src, clip_image_f32*
     }
 }
 
-inline float clip(float x, float lower, float upper) {
+inline int clip(int x, int lower, int upper) {
     return std::max(lower, std::min(x, upper));
 }
 
@@ -1918,10 +1918,6 @@ static std::pair<int, int> uhd_get_refine_size(std::pair<int, int> original_size
     return refine_size;
 }
 
-inline int clip(int x, int lower, int upper) {
-    return std::max(lower, std::min(x, upper));
-}
-
 static std::pair<int, int> uhd_best_grid(const int max_slice_nums, const int multiple, const float log_ratio) {
     std::vector<int> candidate_split_grids_nums;
     for (int i : {multiple - 1, multiple, multiple + 1}) {

klite.embd

@@ -12,7 +12,7 @@ Current version indicated by LITEVER below.
 -->
 
 <script>
-	const LITEVER = 171;
+	const LITEVER = 172;
 	const urlParams = new URLSearchParams(window.location.search);
 	var localflag = true;
 	const STORAGE_PREFIX = (localflag?"e_":"")+"kaihordewebui_";
@@ -2369,7 +2369,10 @@ Current version indicated by LITEVER below.
 	0% {
 		background-color: #9e9e9e;
 	}
-	50%, 100% {
+	29.9% {
+		background-color: #9e9e9e;
+	}
+	30%, 100% {
 		background-color: #9e9e9e33;
 	}
 	}
@@ -2422,7 +2425,7 @@ Current version indicated by LITEVER below.
 		const scenario_db = [
 		{
 			"title":"New Story",
-			"desc":"Starts a new game in story mode, using your current settings.",
+			"desc":"Starts a new session in story mode, using your current settings.",
 			"opmode":1,
 			"prefmodel1":storymodels1,
 			"prefmodel2":storymodels2,
@@ -2433,7 +2436,7 @@ Current version indicated by LITEVER below.
 		},
 		{
 			"title":"New Adventure",
-			"desc":"Starts a new game in adventure mode, using your current settings.",
+			"desc":"Starts a new session in adventure mode, using your current settings.",
 			"opmode":2,
 			"prefmodel1":adventuremodels1,
 			"prefmodel2":adventuremodels2,
@@ -2445,7 +2448,7 @@ Current version indicated by LITEVER below.
 		},
 		{
 			"title":"New Chat",
-			"desc":"Starts a new game in chat mode, using your current settings.",
+			"desc":"Starts a new session in chat mode, using your current settings.",
 			"opmode":3,
 			"chatname": "User",
 			"chatopponent": "KoboldAI",
@@ -2459,7 +2462,7 @@ Current version indicated by LITEVER below.
 		},
 		{
 			"title":"New Instruct",
-			"desc":"Starts a new game in instruct mode, using your current settings.",
+			"desc":"Starts a new session in instruct mode, using your current settings.",
 			"opmode":4,
 			"instruct_starttag": "\\n### Instruction:\\n",
 			"instruct_endtag": "\\n### Response:\\n",
@@ -2473,7 +2476,7 @@ Current version indicated by LITEVER below.
 		{
 			"title":"New Adventure (Instruct)",
 			"author":"Henky!!",
-			"desc":"Starts a new game in adventure mode, with a prompt designed for Instruction-Trained models. Begin by submitting a text describing the setting and your character. For the best experience avoid actions that make your goals to easy such as inputting the instant solution to your goals.",
+			"desc":"Starts a new session in adventure mode, with a prompt designed for Instruction-Trained models. Begin by submitting a text describing the setting and your character. For the best experience avoid actions that make your goals to easy such as inputting the instant solution to your goals.",
 			"opmode":2,
 			"prefmodel1":adventuremodels1,
 			"prefmodel2":adventuremodels2,
@@ -6537,7 +6540,7 @@ Current version indicated by LITEVER below.
 
 		if(localsettings.import_tavern_prompt)
 		{
-			msgboxYesNo("Import Character Card in Instruct Mode?\n\nYes = Instruct Mode Used\nNo = Chat Mode Used\n\nIf unsure, select 'No'.","Import Tavern Card", ()=>{
+			msgboxYesNo("Import Character Card in Instruct Mode?\n\nYes = Instruct Mode Used\nNo = Chat Mode Used\n\nIf unsure, select 'No'.","Import Tavern Card Mode", ()=>{
 				load_tav_obj_confirm_p1(false);
 			},()=>{
 				load_tav_obj_confirm_p1(true);
@@ -15685,7 +15688,6 @@ Current version indicated by LITEVER below.
 	{
 		let panel = document.getElementById('corpoleftpanelitems');
 		let panelitems = `
-		<div onclick="display_newgame();" class="corpo_leftpanel_btn" type="button" style="background-image: var(--img_nikosquare); padding-left: 44px;">New Chat</div>
 		<div onclick="btn_memory()" class="corpo_leftpanel_btn" type="button" style="background-image: var(--img_gear); padding-left: 44px;">Context</div>
 		<div onclick="btn_editmode()" class="corpo_leftpanel_btn" type="button" style="background-image: var(--img_corpo_edit); padding-left: 44px;">Raw Editor</div>
 		<div onclick="update_toggle_theme(true)" class="corpo_leftpanel_btn" type="button" style="background-image: var(--img_corpo_theme); padding-left: 44px;">Light / Dark Theme</div>
@@ -17677,7 +17679,7 @@ Current version indicated by LITEVER below.
 		<div class="popupbg flex"></div>
 		<div class="nspopup flexsizevsmall">
 			<div class="popuptitlebar">
-				<div class="popuptitletext">Really Start A New Story?</div>
+				<div class="popuptitletext">Really Start A New Session?</div>
 			</div>
 			<div class="aidgpopuplistheader anotelabel">
 				Unsaved data will be lost.<br><br>