From: Georgi Gerganov <redacted>
Date: Wed, 10 Jul 2024 12:23:29 +0000 (+0300)
Subject: ggml : move sgemm sources to llamafile subfolder (llama/8394)
X-Git-Tag: upstream/0.0.1642~525
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=3fd56416dc61cd2d4e344aef819218a9b5404611;p=pkg%2Fggml%2Fsources%2Fggml

ggml : move sgemm sources to llamafile subfolder (llama/8394)

ggml-ci
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28411d61..25724973 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,7 +110,7 @@ option(GGML_ACCELERATE                      "ggml: enable Accelerate framework"
 option(GGML_BLAS                            "ggml: use BLAS"                                  ${GGML_BLAS_DEFAULT})
 set(GGML_BLAS_VENDOR ${GGML_BLAS_VENDOR_DEFAULT} CACHE STRING
                                             "ggml: BLAS library vendor")
-option(GGML_LLAMAFILE                       "ggml: use ggml SGEMM"                            OFF)
+option(GGML_LLAMAFILE                       "ggml: use LLAMAFILE"                             OFF)
 
 option(GGML_CUDA                            "ggml: use CUDA"                                  OFF)
 option(GGML_CUDA_FORCE_DMMV                 "ggml: use dmmv instead of mmvq CUDA kernels"     OFF)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aae5b8e9..c5ee7e42 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -238,12 +238,12 @@ if (GGML_BLAS)
 endif()
 
 if (GGML_LLAMAFILE)
-    message(STATUS "Using ggml SGEMM")
+    message(STATUS "Using llamafile")
 
     add_compile_definitions(GGML_USE_LLAMAFILE)
 
-    set(GGML_HEADERS_LLAMAFILE sgemm.h)
-    set(GGML_SOURCES_LLAMAFILE sgemm.cpp)
+    set(GGML_HEADERS_LLAMAFILE llamafile/sgemm.h)
+    set(GGML_SOURCES_LLAMAFILE llamafile/sgemm.cpp)
 endif()
 
 if (GGML_CUDA)
diff --git a/src/ggml.c b/src/ggml.c
index 7988a7f5..10e96827 100644
--- a/src/ggml.c
+++ b/src/ggml.c
@@ -6,7 +6,6 @@
 #include "ggml.h"
 #include "ggml-aarch64.h"
 
-
 #if defined(_MSC_VER) || defined(__MINGW32__)
 #include <malloc.h> // using malloc.h with MSC/MINGW
 #elif !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
@@ -43,7 +42,7 @@
 #endif
 
 #ifdef GGML_USE_LLAMAFILE
-#include "sgemm.h"
+#include <llamafile/sgemm.h>
 #endif
 
 #if defined(_MSC_VER)