From 0f6fa6be93f6a1f2e46f3eef2a2fb3e4e4dde8a2 Mon Sep 17 00:00:00 2001
From: Concedo <39025047+LostRuins@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:37:56 +0800
Subject: [PATCH] try adding other fallback backends for linux

---
 Makefile     | 10 ++++++++--
 koboldcpp.py | 10 ++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 2cf1d3df1..442b6dea4 100644
--- a/Makefile
+++ b/Makefile
@@ -113,13 +113,15 @@ ifeq ($(UNAME_M),$(filter $(UNAME_M),x86_64 i686))
 	ifeq ($(OS),Windows_NT)
 		CFLAGS +=
 		NONECFLAGS +=
-# -mno-sse3
 		SIMPLECFLAGS += -mavx -msse3
 		FULLCFLAGS += -mavx2 -msse3 -mfma -mf16c -mavx
 	else
 # if not on windows, they are clearly building it themselves, so lets just use whatever is supported
 		ifdef LLAMA_PORTABLE
-		CFLAGS += -mavx2 -msse3 -mfma -mf16c -mavx
+		CFLAGS +=
+		NONECFLAGS +=
+		SIMPLECFLAGS += -mavx -msse3
+		FULLCFLAGS += -mavx2 -msse3 -mfma -mf16c -mavx
 		else
 		CFLAGS += -march=native -mtune=native
 		endif
@@ -314,6 +316,10 @@ ifeq ($(OS),Windows_NT)
 	endif
 else
 	DEFAULT_BUILD = $(CXX) $(CXXFLAGS)  $^ -shared -o $@.so $(LDFLAGS)
+	ifdef LLAMA_PORTABLE
+	FAILSAFE_BUILD = $(CXX) $(CXXFLAGS)  $^ -shared -o $@.so $(LDFLAGS)
+	NOAVX2_BUILD = $(CXX) $(CXXFLAGS)  $^ -shared -o $@.so $(LDFLAGS)
+	endif
 
 	ifdef LLAMA_OPENBLAS
 	OPENBLAS_BUILD = $(CXX) $(CXXFLAGS) $^ $(ARCH_ADD) -lopenblas -shared -o $@.so $(LDFLAGS)
diff --git a/koboldcpp.py b/koboldcpp.py
index dd21dc1d0..933c06c27 100755
--- a/koboldcpp.py
+++ b/koboldcpp.py
@@ -1149,13 +1149,7 @@ def show_new_gui():
     contextsize_text = ["256", "512", "1024", "2048", "3072", "4096", "6144", "8192", "12288", "16384", "24576", "32768", "49152", "65536"]
     runopts = [opt for lib, opt in lib_option_pairs if file_exists(lib)]
     antirunopts = [opt.replace("Use ", "") for lib, opt in lib_option_pairs if not (opt in runopts)]
-    if os.name != 'nt':
-        if "NoAVX2 Mode (Old CPU)" in antirunopts:
-            antirunopts.remove("NoAVX2 Mode (Old CPU)")
-        if "Failsafe Mode (Old CPU)" in antirunopts:
-            antirunopts.remove("Failsafe Mode (Old CPU)")
-        if "CLBlast NoAVX2 (Old CPU)" in antirunopts:
-            antirunopts.remove("CLBlast NoAVX2 (Old CPU)")
+
     if not any(runopts):
         exitcounter = 999
         show_gui_msgbox("No Backends Available!","KoboldCPP couldn't locate any backends to use (i.e Default, OpenBLAS, CLBlast, CuBLAS).\n\nTo use the program, please run the 'make' command from the directory.")
@@ -1430,7 +1424,7 @@ def show_new_gui():
         # backend count label with the tooltip function
         nl = '\n'
         tooltxt = f"Number of backends you have built and available." + (f"\n\nMissing Backends: \n\n{nl.join(antirunopts)}" if len(runopts) != 6 else "")
-        num_backends_built = makelabel(parent, str(len(runopts)) + f"/{7 if os.name == 'nt' else 4}", 5, 2,tooltxt)
+        num_backends_built = makelabel(parent, str(len(runopts)) + f"/7", 5, 2,tooltxt)
         num_backends_built.grid(row=1, column=1, padx=195, pady=0)
         num_backends_built.configure(text_color="#00ff00")