fix: adapt to llama.cpp breaking changes (#424)

withcatai · Jan 30, 2025 · 6e4bf3d · 6e4bf3d
1 parent 314d7e8
commit 6e4bf3d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/llama/CMakeLists.txt b/llama/CMakeLists.txt
@@ -50,6 +50,14 @@ if(APPLE)
     set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 else()
     set(CMAKE_BUILD_RPATH_USE_ORIGIN ON)
+
+    if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Android")
+        set(CMAKE_SKIP_BUILD_RPATH FALSE)
+        set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
+        set(CMAKE_BUILD_RPATH "$ORIGIN")
+        set(CMAKE_INSTALL_RPATH "$ORIGIN")
+        set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+    endif()
 endif()
 
 execute_process(COMMAND node -p "require('node-addon-api').include.slice(1,-1)"

diff --git a/llama/addon/AddonGrammar.cpp b/llama/addon/AddonGrammar.cpp
@@ -17,7 +17,7 @@ AddonGrammar::AddonGrammar(const Napi::CallbackInfo& info) : Napi::ObjectWrap<Ad
         }
     }
 
-    auto parsed_grammar = llama_grammar_init_impl(nullptr, grammarCode.c_str(), rootRuleName.c_str());
+    auto parsed_grammar = llama_grammar_init_impl(nullptr, grammarCode.c_str(), rootRuleName.c_str(), false, nullptr, 0, nullptr, 0);
 
     // will be empty if there are parse errors
     if (parsed_grammar == nullptr) {
@@ -37,7 +37,7 @@ AddonGrammar::~AddonGrammar() {
 Napi::Value AddonGrammar::isTextCompatible(const Napi::CallbackInfo& info) {
     const std::string testText = info[0].As<Napi::String>().Utf8Value();
 
-    auto parsed_grammar = llama_grammar_init_impl(nullptr, grammarCode.c_str(), rootRuleName.c_str());
+    auto parsed_grammar = llama_grammar_init_impl(nullptr, grammarCode.c_str(), rootRuleName.c_str(), false, nullptr, 0, nullptr, 0);
 
     // will be empty if there are parse errors
     if (parsed_grammar == nullptr) {