fix(llama-cpp/darwin): make sure to bundle libutf8 libs (#6060)

fix(darwin): make sure to bundle libutf8_validity

Plus some refactoring, use makefile

Signed-off-by: Ettore Di Giacinto <[email protected]>

Author: mudler

.github/workflows/backend.yml

@@ -969,10 +969,7 @@ jobs:
       - name: Build llama-cpp-darwin
         run: |
           make protogen-go
-          make build
-          bash scripts/build-llama-cpp-darwin.sh
-          ls -la build/darwin.tar
-          mv build/darwin.tar build/llama-cpp.tar
+          make backends/llama-cpp-darwin
       - name: Upload llama-cpp.tar
         uses: actions/upload-artifact@v4
         with:
@@ -1060,9 +1057,7 @@ jobs:
           make protogen-go
           make build
           export PLATFORMARCH=darwin/amd64
-          bash scripts/build-llama-cpp-darwin.sh
-          ls -la build/darwin.tar
-          mv build/darwin.tar build/llama-cpp.tar
+          make backends/llama-cpp-darwin
       - name: Upload llama-cpp.tar
         uses: actions/upload-artifact@v4
         with:

.github/workflows/test.yml

@@ -214,11 +214,7 @@ jobs:
       - name: Build llama-cpp-darwin
         run: |
           make protogen-go
-          make build
-          bash scripts/build-llama-cpp-darwin.sh
-          ls -la build/darwin.tar
-          mv build/darwin.tar build/llama-cpp.tar
-          ./local-ai backends install "ocifile://$PWD/build/llama-cpp.tar"
+          make backends/llama-cpp-darwin
       - name: Test
         run: |
           export C_INCLUDE_PATH=/usr/local/include

Makefile

@@ -165,6 +165,10 @@ backends/kitten-tts: docker-build-kitten-tts docker-save-kitten-tts build
 backends/kokoro: docker-build-kokoro docker-save-kokoro build
 	./local-ai backends install "ocifile://$(abspath ./backend-images/kokoro.tar)"
 
+backends/llama-cpp-darwin: build
+	bash ./scripts/build-llama-cpp-darwin.sh
+	./local-ai backends install "ocifile://$(abspath ./backend-images/llama-cpp.tar)"
+
 ########################################################
 ## AIO tests
 ########################################################

backend/cpp/llama-cpp/run.sh

@@ -42,7 +42,8 @@ fi
 
 # Extend ld library path with the dir where this script is located/lib
 if [ "$(uname)" == "Darwin" ]; then
-	DYLD_FALLBACK_LIBRARY_PATH=$CURDIR/lib:$DYLD_FALLBACK_LIBRARY_PATH
+	export DYLD_LIBRARY_PATH=$CURDIR/lib:$DYLD_LIBRARY_PATH
+	#export DYLD_FALLBACK_LIBRARY_PATH=$CURDIR/lib:$DYLD_FALLBACK_LIBRARY_PATH
 else
 	export LD_LIBRARY_PATH=$CURDIR/lib:$LD_LIBRARY_PATH
 fi
@@ -57,5 +58,5 @@ fi
 echo "Using binary: $BINARY"
 exec $CURDIR/$BINARY "$@"
 
-# In case we fail execing, just run fallback
+# We should never reach this point, however just in case we do, run fallback
 exec $CURDIR/llama-cpp-fallback "$@"

scripts/build-llama-cpp-darwin.sh

@@ -16,6 +16,8 @@ make llama-cpp-rpc-server
 popd
 
 mkdir -p build/darwin
+mkdir -p backend-images
+mkdir -p build/darwin/lib
 
 # cp -rf backend/cpp/llama-cpp/llama-cpp-avx build/darwin/
 # cp -rf backend/cpp/llama-cpp/llama-cpp-avx2 build/darwin/
@@ -24,11 +26,15 @@ cp -rf backend/cpp/llama-cpp/llama-cpp-fallback build/darwin/
 cp -rf backend/cpp/llama-cpp/llama-cpp-grpc build/darwin/
 cp -rf backend/cpp/llama-cpp/llama-cpp-rpc-server build/darwin/
 
+ADDITIONAL_LIBS=${ADDITIONAL_LIBS:-$(ls /opt/homebrew/Cellar/protobuf/**/lib/libutf8_validity.dylib)}
+
+for file in $ADDITIONAL_LIBS; do
+  cp -rfv $file build/darwin/lib
+done
+
 for file in build/darwin/*; do
   LIBS="$(otool -L $file | awk 'NR > 1 { system("echo " $1) } ' | xargs echo)"
-
   for lib in $LIBS; do
-    mkdir -p build/darwin/lib
     # only libraries ending in dylib
     if [[ "$lib" == *.dylib ]]; then
         if [ -e "$lib" ]; then
@@ -38,13 +44,21 @@ for file in build/darwin/*; do
   done
 done
 
+echo "--------------------------------"
+echo "ADDITIONAL_LIBS: $ADDITIONAL_LIBS"
+echo "--------------------------------"
+
+echo "Bundled libraries:"
+ls -la build/darwin/lib
+
+
 cp -rf backend/cpp/llama-cpp/run.sh build/darwin/
 
 PLATFORMARCH="${PLATFORMARCH:-darwin/arm64}"
 
 ./local-ai util create-oci-image \
         build/darwin/. \
-        --output build/darwin.tar \
+        --output ./backend-images/llama-cpp.tar \
         --image-name $IMAGE_NAME \
         --platform $PLATFORMARCH