]> git.djapps.eu Git - pkg/ggml/sources/llama.cpp/commitdiff
ggml : resolve merge (ggml/0)
authorGeorgi Gerganov <redacted>
Sat, 11 May 2024 13:25:50 +0000 (16:25 +0300)
committerGeorgi Gerganov <redacted>
Sat, 11 May 2024 18:33:08 +0000 (21:33 +0300)
ggml-ci

ggml.c

diff --git a/ggml.c b/ggml.c
index 4f3011583d2e70939334104da1eb49dcc108a4a4..b96a82a41517dee31dce34625747ad7467a30498 100644 (file)
--- a/ggml.c
+++ b/ggml.c
@@ -4,7 +4,6 @@
 #include "ggml-impl.h"
 #include "ggml-quants.h"
 #include "ggml.h"
-#include "sgemm.h"
 
 #if defined(_MSC_VER) || defined(__MINGW32__)
 #include <malloc.h> // using malloc.h with MSC/MINGW
 #undef GGML_USE_LLAMAFILE
 #endif
 
+#ifdef GGML_USE_LLAMAFILE
+#include "sgemm.h"
+#endif
+
 #if defined(_MSC_VER)
 // disable "possible loss of data" to avoid hundreds of casts
 // we should just be careful :)