From: Georgi Gerganov Date: Sat, 11 May 2024 13:25:50 +0000 (+0300) Subject: ggml : resolve merge (ggml/0) X-Git-Tag: upstream/0.0.4488~1631 X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=325756d28df7d018a7bac424e1b3bc8acb4ecf07;p=pkg%2Fggml%2Fsources%2Fllama.cpp ggml : resolve merge (ggml/0) ggml-ci --- diff --git a/ggml.c b/ggml.c index 4f301158..b96a82a4 100644 --- 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 // using malloc.h with MSC/MINGW @@ -37,6 +36,10 @@ #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 :)