update llamacpp dependency management tooling

.github/workflows/npm-publish.yml

@@ -15,6 +15,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 20
+      - run: npm run setup
       - run: npm ci
       - run: npm test
 
@@ -27,7 +28,6 @@ jobs:
         with:
           node-version: 20
           registry-url: https://registry.npmjs.org/
-      - run: npm ci
       - run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

bin/update_submodules.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Define the repository URL
+REPO_URL="https://github.com/ggerganov/llama.cpp.git"
+
+# Define the directory where the repository will be cloned
+DIR="llamacpp/lib"
+
+# If the directory already exists, pull the latest changes
+if [ -d "$DIR" ]; then
+  echo "Directory $DIR exists."
+  echo "Pulling latest changes..."
+  cd "$DIR" && git pull origin master
+else
+  # If the directory does not exist, clone the repository
+  echo "Directory $DIR does not exist."
+  echo "Cloning repository..."
+  git clone "$REPO_URL" "$DIR"
+fi

llamacpp/CMakeLists.txt

@@ -18,9 +18,9 @@ execute_process(COMMAND node -p "require('node-addon-api').include.slice(1,-1)"
 
 include_directories(${NODE_ADDON_API_DIR} ${CMAKE_JS_INC})
 
-add_subdirectory("lib/llamacpp")
-include_directories("lib/llamacpp")
-include_directories("lib/llamacpp/common")
+add_subdirectory("./lib")
+include_directories("./lib")
+include_directories("./lib/common")
 
 file(GLOB SOURCE_FILES "llamacpp-bindings.cc")
 
@@ -33,7 +33,7 @@ target_link_libraries(${PROJECT_NAME} "common")
 # copy ggml-metal.metal to release folder
 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_SOURCE_DIR}/lib/llamacpp/ggml-metal.metal
+  ${CMAKE_SOURCE_DIR}/lib/ggml-metal.metal
   ${CMAKE_CURRENT_BINARY_DIR}/Release/ggml-metal.metal)
 
 if(MSVC AND CMAKE_JS_NODELIB_DEF AND CMAKE_JS_NODELIB_TARGET)