fixes

Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
mudler · Nov 11, 2023 · dd4fbd2 · dd4fbd2
1 parent e4c4021
commit dd4fbd2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/backend/cpp/llama/CMakeLists.txt b/backend/cpp/llama/CMakeLists.txt
@@ -4,6 +4,10 @@ set(TARGET grpc-server)
 set(_PROTOBUF_LIBPROTOBUF libprotobuf)
 set(_REFLECTION grpc++_reflection)
 
+## XXX: In some versions of CMake clip wasn't being built before llama.
+## This is an hack for now, but it should be fixed in the future.
+add_library(${TARGET} clip.cpp clip.h)
+
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     link_directories("/opt/homebrew/lib")
     include_directories("/opt/homebrew/include")

diff --git a/backend/cpp/llama/Makefile b/backend/cpp/llama/Makefile
@@ -29,6 +29,9 @@ llama.cpp/examples/grpc-server:
 	cp -r $(abspath ./)/grpc-server.cpp llama.cpp/examples/grpc-server/
 	cp -rfv $(abspath ./)/json.hpp llama.cpp/examples/grpc-server/
 	echo "add_subdirectory(grpc-server)" >> llama.cpp/examples/CMakeLists.txt
+## XXX: In some versions of CMake clip wasn't being built before llama.
+## This is an hack for now, but it should be fixed in the future.
+	cp -rfv llama.cpp/examples/grpc-server/clip.h llama.cpp/examples/grpc-server/clip.cpp llama.cpp/examples/grpc-server/
 
 rebuild:
 	cp -rfv $(abspath ./)/CMakeLists.txt llama.cpp/examples/grpc-server/