Merge branch 'main' into thilotee-rep-template-olmoe

2025-08-08 11:27:14 +00:00 · 2025-02-12 14:18:35 -05:00 · 2025-02-12 14:18:35 -05:00 · c45f1f9cd7
commit c45f1f9cd7
parent 62fbe796c4 02e12089d3
3 changed files with 5 additions and 1 deletions
--- a/gpt4all-backend/deps/llama.cpp-mainline
+++ b/gpt4all-backend/deps/llama.cpp-mainline
@ -1 +1 @@
-Subproject commit 3ebb3603e807d74a16f061c46d2925a1653e7a93
+Subproject commit 11f734c3b0334dbae4823b4a7467764e447fc6d6
--- a/gpt4all-backend/src/llamamodel.cpp
+++ b/gpt4all-backend/src/llamamodel.cpp
@ -53,6 +53,7 @@ static const std::vector<const char *> KNOWN_ARCHES {
    "gpt2",
    // "gptj", -- no inference code
    "gptneox",
+    "granite",
    "granitemoe",
    "mpt",
    "baichuan",
--- a/gpt4all-chat/CHANGELOG.md
+++ b/gpt4all-chat/CHANGELOG.md
@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

 ## [Unreleased]

+### Added
+- Whitelist Granite (non-MoE) model architecture (by [@ThiloteE](https://github.com/ThiloteE) in [#3487](https://github.com/nomic-ai/gpt4all/pull/3487))
+
 ### Changed
 - Substitute prettier default templates for OLMoE 7B 0924/0125 and Granite 3.1 3B/8B ([#3471](https://github.com/nomic-ai/gpt4all/pull/3471))