summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgi Gerganov <ggerganov@gmail.com>2023-12-21 23:07:58 +0200
committerGeorgi Gerganov <ggerganov@gmail.com>2023-12-21 23:08:14 +0200
commit32259b2dade6f6856739bf7ba0a4ff7b474dc760 (patch)
tree1ba9bcc4e3f6108ca182622a01b0fecb57720fff
parent4a5f9d629ecfd0a53afdddbaf54a4fa02d9a9ce9 (diff)
gguf : simplify example dependencies
-rw-r--r--Makefile2
-rw-r--r--examples/gguf/CMakeLists.txt2
-rw-r--r--examples/gguf/gguf.cpp1
3 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 512407a1..68df7702 100644
--- a/Makefile
+++ b/Makefile
@@ -606,7 +606,7 @@ save-load-state: examples/save-load-state/save-load-state.cpp ggml.o llama.o $(C
server: examples/server/server.cpp examples/server/httplib.h examples/server/json.hpp examples/server/index.html.hpp examples/server/index.js.hpp examples/server/completion.js.hpp examples/llava/clip.cpp examples/llava/clip.h common/stb_image.h ggml.o llama.o $(COMMON_DEPS) grammar-parser.o $(OBJS)
$(CXX) $(CXXFLAGS) -Iexamples/server $(filter-out %.h,$(filter-out %.hpp,$^)) -o $@ $(LDFLAGS) $(LWINSOCK2) -Wno-cast-qual
-gguf: examples/gguf/gguf.cpp ggml.o llama.o $(OBJS)
+gguf: examples/gguf/gguf.cpp ggml.o $(OBJS)
$(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS)
train-text-from-scratch: examples/train-text-from-scratch/train-text-from-scratch.cpp ggml.o llama.o $(COMMON_DEPS) train.o $(OBJS)
diff --git a/examples/gguf/CMakeLists.txt b/examples/gguf/CMakeLists.txt
index 7d1806af..6481f087 100644
--- a/examples/gguf/CMakeLists.txt
+++ b/examples/gguf/CMakeLists.txt
@@ -1,5 +1,5 @@
set(TARGET gguf)
add_executable(${TARGET} gguf.cpp)
install(TARGETS ${TARGET} RUNTIME)
-target_link_libraries(${TARGET} PRIVATE llama ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(${TARGET} PRIVATE ggml ${CMAKE_THREAD_LIBS_INIT})
target_compile_features(${TARGET} PRIVATE cxx_std_11)
diff --git a/examples/gguf/gguf.cpp b/examples/gguf/gguf.cpp
index 9e24bf24..e67be4fb 100644
--- a/examples/gguf/gguf.cpp
+++ b/examples/gguf/gguf.cpp
@@ -1,5 +1,4 @@
#include "ggml.h"
-#include "llama.h"
#include <cstdio>
#include <cinttypes>