Merge branch 'concedo_experimental' into crokeso

Author: Nexesenex

ggml/src/ggml-cuda/cpy.cu

@@ -718,6 +718,8 @@ void ggml_cuda_cpy(ggml_backend_cuda_context & ctx, const ggml_tensor * src0, gg
     if(ctx.cuda_graph->use_cpy_indirection && !disable_indirection_for_this_node) {
         ctx.cuda_graph->graph_cpynode_index = graph_cpynode_index;
     }
+#else
+    GGML_UNUSED(disable_indirection_for_this_node);
 #endif
 
 }

koboldcpp.py

@@ -4829,18 +4829,19 @@ def zenity_clean(txt: str):
         .replace("?", "\\?").replace("&", "&amp;").replace("|", "&#124;").replace("<", "&lt;").replace(">", "&gt;")\
         .replace("(", "\\(").replace(")", "\\)").replace("[", "\\[").replace("]", "\\]").replace("{", "\\{").replace("}", "\\}")
 
-    def zenity_sanity_check(): #make sure zenity is sane
-        nonlocal zenity_bin
+    def zenity_sanity_check(zenity_bin): #make sure zenity is sane
         try: # Run `zenity --help` and pipe to grep
-            result = subprocess.run(f"{zenity_bin} --help | grep Usage", shell=True, capture_output=True, text=True, encoding='utf-8', timeout=10)
+            result = subprocess.run(f"{zenity_bin} --help", shell=True, capture_output=True, text=True, encoding='utf-8', timeout=10)
             if result.returncode == 0 and "Usage" in result.stdout:
                 return True
             else:
+                print(f"Zenity/YAD sanity check failed - ReturnCode={result.returncode}")
                 return False
         except FileNotFoundError:
+            print(f"Zenity/YAD sanity check failed - {zenity_bin} not found")
             return False
 
-    if not zenity_sanity_check():
+    if not zenity_sanity_check(zenity_bin):
         raise Exception("Zenity not working correctly, falling back to TK GUI.")
 
     # Build args based on keywords

make_pyinstaller.sh

@@ -23,4 +23,4 @@ pyinstaller --noconfirm --onefile --clean --console --collect-all customtkinter
 --add-data "./rwkv_vocab.embd:." \
 --add-data "./rwkv_world_vocab.embd:." \
 --version-file "./version.txt" \
-"./koboldcpp.py" -n "koboldcpp"
+"./koboldcpp.py" -n "koboldcpp"