From fd0c501d68d6aecf39371b47e795dcbe93cae36b Mon Sep 17 00:00:00 2001
From: cebtenzzre <cebtenzzre@gmail.com>
Date: Fri, 27 Oct 2023 17:07:23 -0400
Subject: [PATCH] backend: support GGUFv3 (#1582)

---
 gpt4all-backend/bert.cpp           | 2 +-
 gpt4all-backend/gptj.cpp           | 2 +-
 gpt4all-backend/llama.cpp-mainline | 2 +-
 gpt4all-backend/llamamodel.cpp     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gpt4all-backend/bert.cpp b/gpt4all-backend/bert.cpp
index a1f7a596..ba92465d 100644
--- a/gpt4all-backend/bert.cpp
+++ b/gpt4all-backend/bert.cpp
@@ -884,7 +884,7 @@ DLL_EXPORT bool magic_match(const char * fname) {
     if (!ctx_gguf)
         return false;
 
-    bool isValid = gguf_get_version(ctx_gguf) <= 2;
+    bool isValid = gguf_get_version(ctx_gguf) <= 3;
     isValid = isValid && get_arch_name(ctx_gguf) == "bert";
 
     gguf_free(ctx_gguf);
diff --git a/gpt4all-backend/gptj.cpp b/gpt4all-backend/gptj.cpp
index 936888bf..69b97fdf 100644
--- a/gpt4all-backend/gptj.cpp
+++ b/gpt4all-backend/gptj.cpp
@@ -806,7 +806,7 @@ DLL_EXPORT bool magic_match(const char * fname) {
     if (!ctx_gguf)
         return false;
 
-    bool isValid = gguf_get_version(ctx_gguf) <= 2;
+    bool isValid = gguf_get_version(ctx_gguf) <= 3;
     isValid = isValid && get_arch_name(ctx_gguf) == "gptj";
 
     gguf_free(ctx_gguf);
diff --git a/gpt4all-backend/llama.cpp-mainline b/gpt4all-backend/llama.cpp-mainline
index 3414cd82..10e6c38b 160000
--- a/gpt4all-backend/llama.cpp-mainline
+++ b/gpt4all-backend/llama.cpp-mainline
@@ -1 +1 @@
-Subproject commit 3414cd82174d8500094ff83ccc8ee0617b41bf94
+Subproject commit 10e6c38b0022b23181488371e045eefc4490bea6
diff --git a/gpt4all-backend/llamamodel.cpp b/gpt4all-backend/llamamodel.cpp
index e743ac00..fdd5d047 100644
--- a/gpt4all-backend/llamamodel.cpp
+++ b/gpt4all-backend/llamamodel.cpp
@@ -395,7 +395,7 @@ DLL_EXPORT bool magic_match(const char * fname) {
     if (!ctx_gguf)
         return false;
 
-    bool isValid = gguf_get_version(ctx_gguf) <= 2;
+    bool isValid = gguf_get_version(ctx_gguf) <= 3;
     auto arch = get_arch_name(ctx_gguf);
     isValid = isValid && (arch == "llama" || arch == "starcoder" || arch == "falcon" || arch == "mpt");