mirror of
https://github.com/likelovewant/ollama-for-amd.git
synced 2025-12-22 06:43:57 +00:00
0cf7794b16
* Revert "vulkan: temporary cary of vulkan fixes (#12971)"
This reverts commit 3a9e8e9fd4.
* ggml update to b7087
* fix argsort on metal
* update to b7108
* fix bakllava regression
This model lacks the metadata for the projector type.
* update to b7209
* fix TopK perf
* only build arm code on arm
29 lines
764 B
Diff
29 lines
764 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Hiltgen <daniel@ollama.com>
|
|
Date: Tue, 18 Nov 2025 09:58:23 -0800
|
|
Subject: [PATCH] win: exit instead of abort
|
|
|
|
---
|
|
ggml/src/ggml.c | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/ggml/src/ggml.c b/ggml/src/ggml.c
|
|
index b99345a2e..1c9e0bc05 100644
|
|
--- a/ggml/src/ggml.c
|
|
+++ b/ggml/src/ggml.c
|
|
@@ -229,8 +229,13 @@ void ggml_abort(const char * file, int line, const char * fmt, ...) {
|
|
fprintf(stderr, "%s\n", message);
|
|
ggml_print_backtrace();
|
|
}
|
|
-
|
|
+#if defined(_WIN32)
|
|
+ fflush(stderr);
|
|
+ fflush(stdout);
|
|
+ exit(1);
|
|
+#else
|
|
abort();
|
|
+#endif
|
|
}
|
|
|
|
// ggml_print_backtrace is registered with std::set_terminate by ggml.cpp
|