try disabling the gMask prefix for glm-4 completions

Author: LostRuins

gpttype_adapter.cpp

@@ -3263,28 +3263,28 @@ generation_outputs gpttype_generate(const generation_inputs inputs)
     }
 
     //need to add a cursed hack to get coherency for GLM4, by ensuring injection for both sop and gmask
-    if (file_format == FileFormat::GGUF_GENERIC && file_format_meta.model_architecture == GGUFArch::ARCH_GLM4) {
-        std::string temp = gpttype_get_chat_template();
-        if (temp.find("[gMASK]<sop>") != std::string::npos) {
-            if (addedmemory == "") {
-                if (kcpp_data->prompt.rfind("[gMASK]", 0) == 0) {  //check startswith
-                    kcpp_data->prompt.erase(0, 7);
-                }
-                if (kcpp_data->prompt.rfind("<sop>", 0) == 0) {  //check startswith
-                    kcpp_data->prompt.erase(0, 5);
-                }
-                addedmemory = "[gMASK]<sop>";
-            } else {
-                if (addedmemory.rfind("[gMASK]", 0) == 0) {  //check startswith
-                    addedmemory.erase(0, 7);
-                }
-                if (addedmemory.rfind("<sop>", 0) == 0) {  //check startswith
-                    addedmemory.erase(0, 5);
-                }
-                addedmemory = "[gMASK]<sop>" + addedmemory;
-            }
-        }
-    }
+    // if (file_format == FileFormat::GGUF_GENERIC && file_format_meta.model_architecture == GGUFArch::ARCH_GLM4) {
+    //     std::string temp = gpttype_get_chat_template();
+    //     if (temp.find("[gMASK]<sop>") != std::string::npos) {
+    //         if (addedmemory == "") {
+    //             if (kcpp_data->prompt.rfind("[gMASK]", 0) == 0) {  //check startswith
+    //                 kcpp_data->prompt.erase(0, 7);
+    //             }
+    //             if (kcpp_data->prompt.rfind("<sop>", 0) == 0) {  //check startswith
+    //                 kcpp_data->prompt.erase(0, 5);
+    //             }
+    //             addedmemory = "[gMASK]<sop>";
+    //         } else {
+    //             if (addedmemory.rfind("[gMASK]", 0) == 0) {  //check startswith
+    //                 addedmemory.erase(0, 7);
+    //             }
+    //             if (addedmemory.rfind("<sop>", 0) == 0) {  //check startswith
+    //                 addedmemory.erase(0, 5);
+    //             }
+    //             addedmemory = "[gMASK]<sop>" + addedmemory;
+    //         }
+    //     }
+    // }
 
     bool stream_sse = inputs.stream_sse;
     bool allow_regular_prints = (!is_quiet && debugmode!=-1);

koboldcpp.py

@@ -4433,8 +4433,8 @@ def changed_gpu_choice_var(*args):
             except Exception:
                 pass
         else:
-            quick_gpuname_label.configure(text="")
-            gpuname_label.configure(text="")
+            quick_gpuname_label.configure(text="(dGPUs only, tensor split sets ratio)")
+            gpuname_label.configure(text="(dGPUs only, tensor split sets ratio)")
 
     gpu_choice_var.trace("w", changed_gpu_choice_var)
     gpulayers_var.trace("w", changed_gpulayers_estimate)