mirror of
https://github.com/likelovewant/ollama-for-amd.git
synced 2025-12-21 14:26:30 +00:00
b95693056c
* feat: Bump llama.cpp to the latest master (17f7f4b) This brings in significant improvements to prefill performance for all models using the SSM_CONV and SSM_SCAN ops (granite4, jamba, falcon-h, nemotron-h, Qwen3 Next) on Apple Metal. See https://github.com/ggml-org/llama.cpp/pull/17876 Branch: LlamaCPPMetalSSMImprovements Signed-off-by: Gabe Goodhart <ghart@us.ibm.com> * feat: Update patches 1-4 Branch: LlamaCPPMetalSSMImprovements Signed-off-by: Gabe Goodhart <ghart@us.ibm.com> * fix: Update patches 5-12 Branch: LlamaCPPMetalSSMImprovements Signed-off-by: Gabe Goodhart <ghart@us.ibm.com> * feat: Update patches 13-18 Branch: LlamaCPPMetalSSMImprovements Signed-off-by: Gabe Goodhart <ghart@us.ibm.com> * feat: Update patch 20 Branch: LlamaCPPMetalSSMImprovements Signed-off-by: Gabe Goodhart <ghart@us.ibm.com> * feat: Update patches 21-31 Branch: LlamaCPPMetalSSMImprovements Signed-off-by: Gabe Goodhart <ghart@us.ibm.com> * feat: Sync vendored code The two files I'm not sure about here are the swap from gemma3-iswa.cpp to gemma3.cpp (I chose to include this because I think it's required), and the inclusion of `ggml-zendnn.h` which I chose to omit. Branch: LlamaCPPMetalSSMImprovements Signed-off-by: Gabe Goodhart <ghart@us.ibm.com> --------- Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
23 lines
996 B
Diff
23 lines
996 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Gabe Goodhart <ghart@us.ibm.com>
|
|
Date: Fri, 11 Jul 2025 15:59:19 -0600
|
|
Subject: [PATCH] no power throttling win32 with gnuc
|
|
|
|
---
|
|
ggml/src/ggml-cpu/ggml-cpu.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/ggml/src/ggml-cpu/ggml-cpu.c b/ggml/src/ggml-cpu/ggml-cpu.c
|
|
index bb65985b4..47089a62e 100644
|
|
--- a/ggml/src/ggml-cpu/ggml-cpu.c
|
|
+++ b/ggml/src/ggml-cpu/ggml-cpu.c
|
|
@@ -2464,7 +2464,7 @@ static bool ggml_thread_apply_priority(int32_t prio) {
|
|
// Newer Windows 11 versions aggresively park (offline) CPU cores and often place
|
|
// all our threads onto the first 4 cores which results in terrible performance with
|
|
// n_threads > 4
|
|
- #if _WIN32_WINNT >= 0x0602
|
|
+ #if (_WIN32_WINNT >= 0x0602) && !defined(__GNUC__)
|
|
THREAD_POWER_THROTTLING_STATE t;
|
|
ZeroMemory(&t, sizeof(t));
|
|
t.Version = THREAD_POWER_THROTTLING_CURRENT_VERSION;
|