mirror of
https://github.com/likelovewant/ollama-for-amd.git
synced 2025-12-21 22:33:56 +00:00
49a9c9ba6a
* Revert "add support for NVIDIA Nemotron 3 Nano" This reverts commit e7d2ae9d69421012e9a8765c06a3fdf0e45b12f3. * GGML update to 380b4c984 Remove MaskBatchPadding as GGML_KQ_MASK_PAD is no longer present (no padding required) * update to c45f89d55 * ec98e2002 solar pro needed more adjusting - needs verification * review comments
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 eb3ae72ea..c9242a15a 100644
|
|
--- a/ggml/src/ggml.c
|
|
+++ b/ggml/src/ggml.c
|
|
@@ -250,8 +250,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
|