Switch llama.cpp dependency from git to cmake FetchContent

kherud · kherud · commit e8028bba8082 · 2023-12-19T12:17:15.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.12)
 
 project(jllama CXX)
 
+set(LLAMA_CPP_TAG b1645)
+
 # todo: Is there a better way to build the library than copy & pasting the build argument cmake definition of llama.cpp?
 include(build-args.cmake)
 
@@ -35,6 +37,9 @@ if(NOT DEFINED OS_NAME)
       OUTPUT_STRIP_TRAILING_WHITESPACE
     )
 endif()
+if(NOT OS_NAME)
+    message(FATAL_ERROR "Could not determine OS name")
+endif()
 
 # find which architecture we build for if not set  (make sure to run mvn compile first)
 if(NOT DEFINED OS_ARCH)
@@ -44,6 +49,21 @@ if(NOT DEFINED OS_ARCH)
       OUTPUT_STRIP_TRAILING_WHITESPACE
     )
 endif()
+if(NOT OS_ARCH)
+    message(FATAL_ERROR "Could not determine CPU architecture")
+endif()
+
+set(JLLAMA_DIR ${CMAKE_SOURCE_DIR}/src/main/resources/de/kherud/llama/${OS_NAME}/${OS_ARCH})
+message(STATUS "Installing files to ${JLLAMA_DIR}")
+
+# checkout llama.cpp
+include(FetchContent)
+FetchContent_Declare(
+	llama.cpp
+	GIT_REPOSITORY https://github.com/ggerganov/llama.cpp.git
+	GIT_TAG        ${LLAMA_CPP_TAG}
+)
+FetchContent_MakeAvailable(llama.cpp)
 
 add_library(jllama SHARED src/main/cpp/jllama.cpp)
 
@@ -53,27 +73,21 @@ target_include_directories(jllama PRIVATE
     src/main/cpp
 )
 
-add_subdirectory(
-    src/main/cpp/llama.cpp
-)
-
 target_link_libraries(jllama PRIVATE common llama ${LLAMA_EXTRA_LIBS})
 
 target_compile_features(jllama PRIVATE cxx_std_11)
 
 if(OS_NAME STREQUAL "Windows")
 	set_target_properties(jllama llama PROPERTIES
-	  RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/src/main/resources/de/kherud/llama/${OS_NAME}/${OS_ARCH}"
+	  RUNTIME_OUTPUT_DIRECTORY_RELEASE ${JLLAMA_DIR}
 	)
 else()
 	set_target_properties(jllama llama PROPERTIES
-	  LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/main/resources/de/kherud/llama/${OS_NAME}/${OS_ARCH}"
+	  LIBRARY_OUTPUT_DIRECTORY ${JLLAMA_DIR}
 	)
 endif()
 
 if (LLAMA_METAL)
     # copy ggml-metal.metal to bin directory
-    configure_file(src/main/cpp/llama.cpp/ggml-metal.metal ${CMAKE_SOURCE_DIR}/src/main/resources/de/kherud/llama/${OS_NAME}/${OS_ARCH}/ggml-metal.metal COPYONLY)
+    configure_file(${llama.cpp_SOURCE_DIR}/ggml-metal.metal ${JLLAMA_DIR}/ggml-metal.metal COPYONLY)
 endif()
-
-message(STATUS "Installing files to ${CMAKE_SOURCE_DIR}/src/main/resources/de/kherud/llama/${OS_NAME}/${OS_ARCH}")
