From d16bfafddac749e82718c6b4938f90da4c75bbb9 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Thu, 7 May 2026 17:19:56 +0200 Subject: [PATCH 01/39] feat: add platform builds and packages --- .github/workflows/flutter-package.yml | 82 +++ .github/workflows/main.yml | 620 ++++++++++++++++++ .gitignore | 10 + Makefile | 358 ++++++++-- extensions/postgres/Makefile | 14 +- extensions/sqlite/Makefile | 158 ++++- packages/android/build.gradle | 121 ++++ packages/android/gradle.properties | 2 + .../android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 45457 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + packages/android/gradlew | 248 +++++++ packages/android/gradlew.bat | 93 +++ packages/android/src/main/AndroidManifest.xml | 4 + packages/flutter/.pubignore | 7 + packages/flutter/LICENSE | 1 + packages/flutter/README.md | 74 +++ packages/flutter/analysis_options.yaml | 1 + packages/flutter/hook/build.dart | 139 ++++ packages/flutter/lib/sqlite_adam.dart | 6 + packages/flutter/lib/src/sqlite_adam.dart | 37 ++ packages/flutter/pubspec.yaml | 22 + 21 files changed, 1941 insertions(+), 63 deletions(-) create mode 100644 .github/workflows/flutter-package.yml create mode 100644 .github/workflows/main.yml create mode 100644 packages/android/build.gradle create mode 100644 packages/android/gradle.properties create mode 100644 packages/android/gradle/wrapper/gradle-wrapper.jar create mode 100644 packages/android/gradle/wrapper/gradle-wrapper.properties create mode 100755 packages/android/gradlew create mode 100644 packages/android/gradlew.bat create mode 100644 packages/android/src/main/AndroidManifest.xml create mode 100644 packages/flutter/.pubignore create mode 120000 packages/flutter/LICENSE create mode 100644 packages/flutter/README.md create mode 100644 packages/flutter/analysis_options.yaml create mode 100644 packages/flutter/hook/build.dart create mode 100644 packages/flutter/lib/sqlite_adam.dart create mode 100644 packages/flutter/lib/src/sqlite_adam.dart create mode 100644 packages/flutter/pubspec.yaml diff --git a/.github/workflows/flutter-package.yml b/.github/workflows/flutter-package.yml new file mode 100644 index 0000000..e064da7 --- /dev/null +++ b/.github/workflows/flutter-package.yml @@ -0,0 +1,82 @@ +name: publish flutter package +on: + push: + tags: + - '*.*.*' + +permissions: + contents: read + id-token: write + +jobs: + publish: + runs-on: ubuntu-22.04 + name: publish to pub.dev + + steps: + + - uses: actions/checkout@v4.2.2 + + - name: download release assets + run: | + VERSION=${GITHUB_REF#refs/tags/} + echo "VERSION=$VERSION" >> $GITHUB_ENV + + mkdir -p artifacts + cd artifacts + + # Download all platform binaries from the GitHub release + gh release download "$VERSION" --pattern "adam-*.tar.gz" + + # Extract all archives + for archive in adam-*.tar.gz; do + name=$(basename "$archive" "-$VERSION.tar.gz") + mkdir -p "$name" + tar -xzf "$archive" -C "$name" + rm "$archive" + done + + ls -la + env: + GH_TOKEN: ${{ github.token }} + + - uses: dart-lang/setup-dart@v1.7.1 + + - name: assemble and publish flutter package + run: | + FLUTTER_DIR=packages/flutter + + # Android (only arm64 and x64, no arm) + mkdir -p $FLUTTER_DIR/native_libraries/android + cp artifacts/adam-android-arm64-v8a/adam.so $FLUTTER_DIR/native_libraries/android/adam_android_arm64.so + cp artifacts/adam-android-x86_64/adam.so $FLUTTER_DIR/native_libraries/android/adam_android_x64.so + + # iOS device + mkdir -p $FLUTTER_DIR/native_libraries/ios + cp artifacts/adam-ios/adam.dylib $FLUTTER_DIR/native_libraries/ios/adam_ios_arm64.dylib + + # iOS simulator (keep universal/fat binary as-is) + mkdir -p $FLUTTER_DIR/native_libraries/ios-sim + cp artifacts/adam-ios-sim/adam.dylib $FLUTTER_DIR/native_libraries/ios-sim/adam_ios-sim.dylib + + # macOS (separate arch-specific dylibs) + mkdir -p $FLUTTER_DIR/native_libraries/mac + cp artifacts/adam-macos-arm64/adam.dylib $FLUTTER_DIR/native_libraries/mac/adam_mac_arm64.dylib + cp artifacts/adam-macos-x86_64/adam.dylib $FLUTTER_DIR/native_libraries/mac/adam_mac_x64.dylib + + # Linux + mkdir -p $FLUTTER_DIR/native_libraries/linux + cp artifacts/adam-linux-cpu-x86_64/adam.so $FLUTTER_DIR/native_libraries/linux/adam_linux_x64.so + cp artifacts/adam-linux-cpu-arm64/adam.so $FLUTTER_DIR/native_libraries/linux/adam_linux_arm64.so + + # Windows + mkdir -p $FLUTTER_DIR/native_libraries/windows + cp artifacts/adam-windows-cpu-x86_64/adam.dll $FLUTTER_DIR/native_libraries/windows/adam_windows_x64.dll + + # Update version + sed -i "s/^version: .*/version: $VERSION/" $FLUTTER_DIR/pubspec.yaml + + # Publish to pub.dev + cd $FLUTTER_DIR + dart pub get + dart pub publish --force diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..42cae81 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,620 @@ +name: Build, Test and Release +on: + push: + branches: + - '**' + tags-ignore: + - '**' + workflow_dispatch: + +permissions: + contents: write + id-token: write + +env: + GGUF_MODEL_DIR: tests/models/unsloth/gemma-3-270m-it-GGUF + GGUF_MODEL_NAME: gemma-3-270m-it-UD-IQ2_M.gguf + GGUF_MODEL_URL: https://huggingface.co/unsloth/gemma-3-270m-it-GGUF/resolve/main/gemma-3-270m-it-UD-IQ2_M.gguf + WHISPER_MODEL_DIR: tests/models/ggerganov/whisper-tiny + WHISPER_MODEL_NAME: ggml-tiny.bin + WHISPER_MODEL_URL: https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-tiny.bin + AUDIO_TEST_DIR: tests/audio + AUDIO_TEST_WAV: tests/audio/jfk.wav + AUDIO_TEST_WAV_URL: https://github.com/ggml-org/whisper.cpp/raw/master/samples/jfk.wav + +jobs: + download-models: + if: ${{ !contains(github.event.head_commit.message, '[auto-update]') }} + outputs: + gguf-cache-key: gguf-${{ steps.meta.outputs.gguf-hash }} + gguf-model-path: ${{ env.GGUF_MODEL_DIR }}/${{ env.GGUF_MODEL_NAME }} + whisper-cache-key: whisper-${{ steps.meta.outputs.whisper-hash }} + whisper-model-path: ${{ env.WHISPER_MODEL_DIR }}/${{ env.WHISPER_MODEL_NAME }} + audio-cache-key: audio-${{ steps.meta.outputs.audio-hash }} + audio-test-path: ${{ env.AUDIO_TEST_WAV }} + name: Download models and test assets + runs-on: ubuntu-22.04 + steps: + - name: Compute URL hashes + id: meta + run: | + if command -v sha256sum >/dev/null 2>&1; then + gguf_hash=$(echo -n "${{ env.GGUF_MODEL_URL }}" | sha256sum | cut -d' ' -f1) + whisper_hash=$(echo -n "${{ env.WHISPER_MODEL_URL }}" | sha256sum | cut -d' ' -f1) + audio_hash=$(echo -n "${{ env.AUDIO_TEST_WAV_URL }}" | sha256sum | cut -d' ' -f1) + else + gguf_hash=$(echo -n "${{ env.GGUF_MODEL_URL }}" | shasum -a 256 | cut -d' ' -f1) + whisper_hash=$(echo -n "${{ env.WHISPER_MODEL_URL }}" | shasum -a 256 | cut -d' ' -f1) + audio_hash=$(echo -n "${{ env.AUDIO_TEST_WAV_URL }}" | shasum -a 256 | cut -d' ' -f1) + fi + echo "gguf-hash=$gguf_hash" >> "$GITHUB_OUTPUT" + echo "whisper-hash=$whisper_hash" >> "$GITHUB_OUTPUT" + echo "audio-hash=$audio_hash" >> "$GITHUB_OUTPUT" + + - name: Prepare directories + run: | + mkdir -p "${{ env.GGUF_MODEL_DIR }}" + mkdir -p "${{ env.WHISPER_MODEL_DIR }}" + mkdir -p "${{ env.AUDIO_TEST_DIR }}" + + - name: Restore GGUF cache + id: cache-gguf + uses: actions/cache@v4 + with: + path: ${{ env.GGUF_MODEL_DIR }}/${{ env.GGUF_MODEL_NAME }} + key: gguf-${{ steps.meta.outputs.gguf-hash }} + + - name: Download GGUF model + if: steps.cache-gguf.outputs.cache-hit != 'true' + run: curl -L --fail --retry 3 "${{ env.GGUF_MODEL_URL }}" -o "${{ env.GGUF_MODEL_DIR }}/${{ env.GGUF_MODEL_NAME }}" + + - name: Verify GGUF model + run: test -f "${{ env.GGUF_MODEL_DIR }}/${{ env.GGUF_MODEL_NAME }}" + + - name: Restore Whisper cache + id: cache-whisper + uses: actions/cache@v4 + with: + path: ${{ env.WHISPER_MODEL_DIR }}/${{ env.WHISPER_MODEL_NAME }} + key: whisper-${{ steps.meta.outputs.whisper-hash }} + + - name: Download Whisper model + if: steps.cache-whisper.outputs.cache-hit != 'true' + run: curl -L --fail --retry 3 "${{ env.WHISPER_MODEL_URL }}" -o "${{ env.WHISPER_MODEL_DIR }}/${{ env.WHISPER_MODEL_NAME }}" + + - name: Verify Whisper model + run: test -f "${{ env.WHISPER_MODEL_DIR }}/${{ env.WHISPER_MODEL_NAME }}" + + - name: Restore audio test file cache + id: cache-audio + uses: actions/cache@v4 + with: + path: ${{ env.AUDIO_TEST_WAV }} + key: audio-${{ steps.meta.outputs.audio-hash }} + + - name: Download audio test file + if: steps.cache-audio.outputs.cache-hit != 'true' + run: curl -L --fail --retry 3 "${{ env.AUDIO_TEST_WAV_URL }}" -o "${{ env.AUDIO_TEST_WAV }}" + + - name: Verify audio test file + run: test -f "${{ env.AUDIO_TEST_WAV }}" + + build: + if: ${{ !contains(github.event.head_commit.message, '[auto-update]') }} + needs: download-models + runs-on: ${{ matrix.os }} + container: ${{ matrix.container && matrix.container || '' }} + name: ${{ matrix.name }}${{ matrix.arch && format('-{0}', matrix.arch) || '' }} build${{ matrix.arch != 'arm64-v8a' && matrix.arch != 'armeabi-v7a' && matrix.name != 'ios-sim' && matrix.name != 'ios' && matrix.name != 'apple-xcframework' && matrix.name != 'android-aar' && ( matrix.name != 'macos' || matrix.arch != 'x86_64' ) && ' + test' || ''}} + timeout-minutes: 120 + strategy: + fail-fast: false + matrix: + include: + - os: macos-15 + name: macos + make: SKIP_UNITTEST=1 LLAMA="-DGGML_NATIVE=OFF -DGGML_METAL=ON -DGGML_ACCELERATE=ON -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=Apple" WHISPER="-DWHISPER_COREML=ON -DWHISPER_COREML_ALLOW_FALLBACK=ON" + - os: macos-15 + arch: x86_64 + name: macos + make: SKIP_UNITTEST=1 ARCH=x86_64 LLAMA="-DGGML_NATIVE=OFF -DGGML_METAL=ON -DGGML_ACCELERATE=ON -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=Apple" WHISPER="-DWHISPER_COREML=ON -DWHISPER_COREML_ALLOW_FALLBACK=ON" + - os: macos-15 + arch: arm64 + name: macos + make: SKIP_UNITTEST=1 ARCH=arm64 LLAMA="-DGGML_NATIVE=OFF -DGGML_METAL=ON -DGGML_ACCELERATE=ON -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=Apple" WHISPER="-DWHISPER_COREML=ON -DWHISPER_COREML_ALLOW_FALLBACK=ON" + - os: ubuntu-22.04 + arch: x86_64 + name: linux-cpu + make: LLAMA="-DGGML_NATIVE=OFF -DGGML_CPU=ON -DGGML_AVX2=ON" + - os: ubuntu-22.04 + arch: x86_64 + name: linux-gpu + make: LLAMA="-DGGML_NATIVE=OFF -DGGML_CPU=ON -DGGML_VULKAN=ON -DGGML_OPENCL=ON" + - os: ubuntu-22.04-arm + arch: arm64 + name: linux-cpu + make: LLAMA="-DGGML_NATIVE=OFF -DGGML_CPU=ON -DGGML_CPU_ARM_ARCH=armv8.2-a" + - os: ubuntu-22.04-arm + arch: arm64 + name: linux-gpu + make: LLAMA="-DGGML_NATIVE=OFF -DGGML_CPU=ON -DGGML_VULKAN=ON -DGGML_OPENCL=ON" + - os: ubuntu-22.04 + arch: x86_64 + name: linux-musl-cpu + container: alpine:latest + make: SKIP_UNITTEST=1 LLAMA="-DGGML_NATIVE=OFF -DGGML_CPU=ON -DGGML_AVX2=ON" + - os: ubuntu-22.04-arm + arch: arm64 + name: linux-musl-cpu + make: LLAMA="-DGGML_NATIVE=OFF -DGGML_CPU=ON -DGGML_CPU_ARM_ARCH=armv8.2-a" + - os: windows-2022 + arch: x86_64 + name: windows-cpu + make: SKIP_UNITTEST=1 LLAMA="-DGGML_NATIVE=OFF -DGGML_CPU=ON -DGGML_AVX2=ON" + - os: windows-2022 + arch: x86_64 + name: windows-gpu + make: SKIP_UNITTEST=1 LLAMA="-DGGML_NATIVE=OFF -DGGML_CPU=ON -DGGML_VULKAN=ON -DGGML_OPENCL=ON" + - os: ubuntu-22.04 + arch: x86_64 + name: android + make: SKIP_UNITTEST=1 PLATFORM=android ARCH=x86_64 + sqlite-amalgamation-zip: https://sqlite.org/2025/sqlite-amalgamation-3490100.zip + - os: ubuntu-22.04 + arch: arm64-v8a + name: android + make: SKIP_UNITTEST=1 PLATFORM=android ARCH=arm64-v8a + - os: ubuntu-22.04 + arch: armeabi-v7a + name: android + make: SKIP_UNITTEST=1 PLATFORM=android ARCH=armeabi-v7a + - os: macos-15 + name: ios + make: PLATFORM=ios LLAMA="-DGGML_NATIVE=OFF -DGGML_METAL=ON -DGGML_ACCELERATE=ON -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=Apple" WHISPER="-DWHISPER_COREML=ON -DWHISPER_COREML_ALLOW_FALLBACK=ON" + - os: macos-15 + name: ios-sim + make: PLATFORM=ios-sim LLAMA="-DGGML_NATIVE=OFF -DGGML_METAL=ON -DGGML_ACCELERATE=ON -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=Apple" WHISPER="-DWHISPER_COREML=ON -DWHISPER_COREML_ALLOW_FALLBACK=ON" + - os: macos-15 + name: apple-xcframework + make: xcframework LLAMA="-DGGML_NATIVE=OFF -DGGML_METAL=ON -DGGML_ACCELERATE=ON -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=Apple" WHISPER="-DWHISPER_COREML=ON -DWHISPER_COREML_ALLOW_FALLBACK=ON" + - os: ubuntu-22.04 + name: android-aar + make: aar + + defaults: + run: + shell: ${{ matrix.container && 'sh' || 'bash' }} + + steps: + + - name: linux-musl x86_64 install dependencies + if: contains(matrix.name, 'linux-musl') && matrix.arch == 'x86_64' + run: apk update && apk add --no-cache git gcc g++ make cmake sqlite musl-dev linux-headers python3 curl-dev openssl-dev + + - uses: actions/checkout@v4.2.2 + with: + submodules: true + + - name: Prepare test asset directories + run: | + mkdir -p "${{ env.GGUF_MODEL_DIR }}" + mkdir -p "${{ env.WHISPER_MODEL_DIR }}" + mkdir -p "${{ env.AUDIO_TEST_DIR }}" + + - name: Restore GGUF cache + uses: actions/cache@v4 + with: + path: ${{ needs.download-models.outputs.gguf-model-path }} + key: ${{ needs.download-models.outputs.gguf-cache-key }} + + - name: Restore Whisper cache + uses: actions/cache@v4 + with: + path: ${{ needs.download-models.outputs.whisper-model-path }} + key: ${{ needs.download-models.outputs.whisper-cache-key }} + + - name: Restore audio test file cache + uses: actions/cache@v4 + with: + path: ${{ needs.download-models.outputs.audio-test-path }} + key: ${{ needs.download-models.outputs.audio-cache-key }} + + - name: android setup java + if: matrix.name == 'android-aar' + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '17' + + - name: calculate cache version hashes for modules and dependencies + id: submodule-hashes + env: + MATRIX_MAKE: ${{ matrix.make && matrix.make || '' }} + run: | + LLAMA_HASH=$(git -C modules/llama.cpp rev-parse HEAD) + WHISPER_HASH=$(git -C modules/whisper.cpp rev-parse HEAD) + MINIAUDIO_HASH=$(git -C modules/miniaudio rev-parse HEAD) + MBEDTLS_HASH=$(git -C modules/mbedtls rev-parse HEAD) + CURL_HASH=$(git -C modules/curl rev-parse HEAD) + if command -v sha256sum >/dev/null 2>&1; then + MAKE_HASH=$(echo "$MATRIX_MAKE" | sha256sum | cut -d' ' -f1) + MAKEFILE_HASH=$(sha256sum Makefile | cut -d' ' -f1) + elif command -v shasum >/dev/null 2>&1; then + MAKE_HASH=$(echo "$MATRIX_MAKE" | shasum -a 256 | cut -d' ' -f1) + MAKEFILE_HASH=$(shasum -a 256 Makefile | cut -d' ' -f1) + else + MAKE_HASH=$(echo "$MATRIX_MAKE" | openssl dgst -sha256 | cut -d' ' -f2) + MAKEFILE_HASH=$(openssl dgst -sha256 Makefile | cut -d' ' -f2) + fi + echo "llama=$LLAMA_HASH" >> $GITHUB_OUTPUT + echo "whisper=$WHISPER_HASH" >> $GITHUB_OUTPUT + echo "miniaudio=$MINIAUDIO_HASH" >> $GITHUB_OUTPUT + echo "mbedtls=$MBEDTLS_HASH" >> $GITHUB_OUTPUT + echo "curl=$CURL_HASH" >> $GITHUB_OUTPUT + echo "make=$MAKE_HASH" >> $GITHUB_OUTPUT + echo "makefile=$MAKEFILE_HASH" >> $GITHUB_OUTPUT + + - uses: msys2/setup-msys2@v2.27.0 + if: matrix.os == 'windows-2022' + with: + msystem: mingw64 + install: >- + git + make + sqlite + mingw-w64-x86_64-cc + mingw-w64-x86_64-cmake + ${{ matrix.name == 'windows-gpu' && 'mingw-w64-x86_64-vulkan-headers' || '' }} + ${{ matrix.name == 'windows-gpu' && 'mingw-w64-x86_64-vulkan-loader' || '' }} + ${{ matrix.name == 'windows-gpu' && 'mingw-w64-x86_64-shaderc' || '' }} + ${{ matrix.name == 'windows-gpu' && 'mingw-w64-x86_64-opencl-headers' || '' }} + ${{ matrix.name == 'windows-gpu' && 'mingw-w64-x86_64-opencl-icd' || '' }} + + - name: macos install dependencies + if: matrix.name == 'macos' + run: brew link sqlite --force + + - name: linux install dependencies + if: startsWith(matrix.name, 'linux-cpu') || startsWith(matrix.name, 'linux-gpu') + run: sudo apt-get update && sudo apt-get install -y libssl-dev + + - name: linux-musl arm64 setup container + if: contains(matrix.name, 'linux-musl') && matrix.arch == 'arm64' + run: | + docker run -d --name alpine \ + --platform linux/arm64 \ + -v ${{ github.workspace }}:/workspace \ + -w /workspace \ + alpine:latest \ + tail -f /dev/null + docker exec alpine sh -c "apk update && apk add --no-cache gcc g++ make cmake sqlite musl-dev linux-headers python3 curl-dev openssl-dev" + + - name: linux install opencl + if: matrix.name == 'linux-gpu' + run: sudo apt-get install -y opencl-headers ocl-icd-opencl-dev + + - name: linux-x86_64 install vulkan + if: matrix.name == 'linux-gpu' && matrix.arch == 'x86_64' + run: | + wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - + sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-jammy.list https://packages.lunarg.com/vulkan/lunarg-vulkan-jammy.list + sudo apt-get update -y + sudo apt-get install -y mesa-vulkan-drivers + # Vulkan is no longer packed for Ubuntu + wget https://sdk.lunarg.com/sdk/download/latest/linux/vulkan-sdk.tar.xz?Human=true -O vulkan-sdk.tar.xz + tar -xf vulkan-sdk.tar.xz + cd $(ls -d 1.* | head -n1) + source setup-env.sh + echo "VULKAN_SDK=$VULKAN_SDK" >> $GITHUB_ENV + echo "PATH=$PATH" >> $GITHUB_ENV + echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV + echo "VK_ADD_LAYER_PATH=$VK_ADD_LAYER_PATH" >> $GITHUB_ENV + + - name: linux-arm64 install vulkan + if: matrix.name == 'linux-gpu' && matrix.arch == 'arm64' + run: | + sudo dpkg --add-architecture arm64 + + # Add arch-specific repositories for non-amd64 architectures + cat << EOF | sudo tee /etc/apt/sources.list.d/arm64-ports.list + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ noble main universe + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ noble-updates main universe + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ noble-security main universe + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ noble-backports main universe + EOF + + sudo apt-get update || true ;# Prevent failure due to missing URLs. + sudo apt-get install -y --no-install-recommends build-essential glslc crossbuild-essential-arm64 libvulkan-dev:arm64 + + - name: cache llama.cpp build + id: cache-llama + uses: actions/cache@v4 + with: + path: | + build/llama.cpp + build/llama.cpp.stamp + key: llama-${{ matrix.name }}-${{ matrix.os }}-${{ matrix.arch }}-${{ steps.submodule-hashes.outputs.llama }}-${{ hashFiles('modules/llama.cpp/**') }}-${{ steps.submodule-hashes.outputs.make }}-${{ steps.submodule-hashes.outputs.makefile }} + + - name: cache whisper.cpp build + id: cache-whisper + uses: actions/cache@v4 + with: + path: | + build/whisper.cpp + build/whisper.cpp.stamp + key: whisper-${{ matrix.name }}-${{ matrix.os }}-${{ matrix.arch }}-${{ steps.submodule-hashes.outputs.whisper }}-${{ hashFiles('modules/whisper.cpp/**') }}-${{ steps.submodule-hashes.outputs.make }}-${{ steps.submodule-hashes.outputs.makefile }} + + - name: cache miniaudio build + id: cache-miniaudio + uses: actions/cache@v4 + with: + path: | + build/miniaudio + build/miniaudio.stamp + key: miniaudio-${{ matrix.name }}-${{ matrix.os }}-${{ matrix.arch }}-${{ steps.submodule-hashes.outputs.miniaudio }}-${{ hashFiles('modules/miniaudio/**') }}-${{ steps.submodule-hashes.outputs.make }}-${{ steps.submodule-hashes.outputs.makefile }} + + - name: cache mbedtls build + if: contains(matrix.name, 'linux') || matrix.name == 'android' || contains(matrix.name, 'windows') + id: cache-mbedtls + uses: actions/cache@v4 + with: + path: | + build/mbedtls + build/mbedtls.stamp + key: mbedtls-${{ matrix.name }}-${{ matrix.os }}-${{ matrix.arch }}-${{ steps.submodule-hashes.outputs.mbedtls }}-${{ steps.submodule-hashes.outputs.make }}-${{ steps.submodule-hashes.outputs.makefile }} + + - name: cache curl build + if: contains(matrix.name, 'linux') || matrix.name == 'android' || contains(matrix.name, 'windows') + id: cache-curl + uses: actions/cache@v4 + with: + path: | + build/curl + build/curl.stamp + key: curl-${{ matrix.name }}-${{ matrix.os }}-${{ matrix.arch }}-${{ steps.submodule-hashes.outputs.curl }}-${{ steps.submodule-hashes.outputs.mbedtls }}-${{ steps.submodule-hashes.outputs.make }}-${{ steps.submodule-hashes.outputs.makefile }} + + - name: windows build llama.cpp + if: matrix.os == 'windows-2022' && steps.cache-llama.outputs.cache-hit != 'true' + shell: msys2 {0} + run: make build/llama.cpp.stamp ${{ matrix.make && matrix.make || ''}} + env: + VULKAN_SDK: "C:/msys64/mingw64" + + - name: unix build llama.cpp + if: matrix.os != 'windows-2022' && matrix.name != 'android-aar' && matrix.name != 'apple-xcframework' && steps.cache-llama.outputs.cache-hit != 'true' + run: ${{ contains(matrix.name, 'linux-musl') && matrix.arch == 'arm64' && 'docker exec alpine' || '' }} make build/llama.cpp.stamp ${{ matrix.make && matrix.make || ''}} + + - name: windows build whisper.cpp + if: matrix.os == 'windows-2022' && steps.cache-whisper.outputs.cache-hit != 'true' + shell: msys2 {0} + run: make build/whisper.cpp.stamp ${{ matrix.make && matrix.make || ''}} + env: + VULKAN_SDK: "C:/msys64/mingw64" + + - name: unix build whisper.cpp + if: matrix.os != 'windows-2022' && matrix.name != 'android-aar' && matrix.name != 'apple-xcframework' && steps.cache-whisper.outputs.cache-hit != 'true' + run: ${{ contains(matrix.name, 'linux-musl') && matrix.arch == 'arm64' && 'docker exec alpine' || '' }} make build/whisper.cpp.stamp ${{ matrix.make && matrix.make || ''}} + + - name: windows build miniaudio + if: matrix.os == 'windows-2022' && steps.cache-miniaudio.outputs.cache-hit != 'true' + shell: msys2 {0} + run: make build/miniaudio.stamp ${{ matrix.make && matrix.make || ''}} + + - name: unix build miniaudio + if: matrix.os != 'windows-2022' && matrix.name != 'android-aar' && matrix.name != 'apple-xcframework' && steps.cache-miniaudio.outputs.cache-hit != 'true' + run: ${{ contains(matrix.name, 'linux-musl') && matrix.arch == 'arm64' && 'docker exec alpine' || '' }} make build/miniaudio.stamp ${{ matrix.make && matrix.make || ''}} + + - name: unix build mbedtls + curl + if: (contains(matrix.name, 'linux') || matrix.name == 'android') && matrix.name != 'android-aar' && (steps.cache-mbedtls.outputs.cache-hit != 'true' || steps.cache-curl.outputs.cache-hit != 'true') + run: ${{ contains(matrix.name, 'linux-musl') && matrix.arch == 'arm64' && 'docker exec alpine' || '' }} make build/mbedtls.stamp build/curl.stamp ${{ matrix.make && matrix.make || ''}} + + - name: windows build mbedtls + curl + if: contains(matrix.name, 'windows') && (steps.cache-mbedtls.outputs.cache-hit != 'true' || steps.cache-curl.outputs.cache-hit != 'true') + shell: msys2 {0} + run: make build/mbedtls.stamp build/curl.stamp ${{ matrix.make && matrix.make || ''}} + + - name: windows build adam extension + if: matrix.os == 'windows-2022' + run: make extension ${{ matrix.make && matrix.make || ''}} + shell: msys2 {0} + env: + VULKAN_SDK: "C:/msys64/mingw64" + + - name: unix build adam extension + if: matrix.os != 'windows-2022' && matrix.name != 'android-aar' && matrix.name != 'apple-xcframework' + run: ${{ contains(matrix.name, 'linux-musl') && matrix.arch == 'arm64' && 'docker exec alpine' || '' }} make extension ${{ matrix.make && matrix.make || ''}} + + - name: build aar/xcframework + if: matrix.name == 'android-aar' || matrix.name == 'apple-xcframework' + run: make ${{ matrix.make && matrix.make || ''}} + + - name: create keychain for codesign + if: matrix.os == 'macos-15' + run: | + echo "${{ secrets.APPLE_CERTIFICATE }}" | base64 --decode > certificate.p12 + security create-keychain -p "${{ secrets.KEYCHAIN_PASSWORD }}" build.keychain + security default-keychain -s build.keychain + security unlock-keychain -p "${{ secrets.KEYCHAIN_PASSWORD }}" build.keychain + security import certificate.p12 -k build.keychain -P "${{ secrets.CERTIFICATE_PASSWORD }}" -T /usr/bin/codesign + security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "${{ secrets.KEYCHAIN_PASSWORD }}" build.keychain + + - name: codesign and notarize dylib + if: matrix.os == 'macos-15' && matrix.name != 'apple-xcframework' + run: | + codesign --sign "${{ secrets.APPLE_TEAM_ID }}" --timestamp --options runtime dist/adam.dylib + ditto -c -k dist/adam.dylib dist/adam.zip + xcrun notarytool submit dist/adam.zip --apple-id "${{ secrets.APPLE_ID }}" --password "${{ secrets.APPLE_PASSWORD }}" --team-id "${{ secrets.APPLE_TEAM_ID }}" --wait + rm dist/adam.zip + + - name: codesign and notarize xcframework + if: matrix.name == 'apple-xcframework' + run: | + find dist/adam.xcframework -name "*.framework" -exec echo "Signing: {}" \; -exec codesign --sign "${{ secrets.APPLE_TEAM_ID }}" --timestamp --options runtime {} \; # Sign each individual framework FIRST + codesign --sign "${{ secrets.APPLE_TEAM_ID }}" --timestamp --options runtime dist/adam.xcframework # Then sign the xcframework wrapper + ditto -c -k --keepParent dist/adam.xcframework dist/adam.xcframework.zip + xcrun notarytool submit dist/adam.xcframework.zip --apple-id "${{ secrets.APPLE_ID }}" --password "${{ secrets.APPLE_PASSWORD }}" --team-id "${{ secrets.APPLE_TEAM_ID }}" --wait + rm -rf dist/adam.xcframework + + - name: cleanup keychain for codesign + if: matrix.os == 'macos-15' + run: | + rm certificate.p12 + security delete-keychain build.keychain + + - name: android setup test environment + if: matrix.name == 'android' && matrix.arch == 'x86_64' + run: | + + echo "::group::enable kvm group perms" + echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules + sudo udevadm control --reload-rules + sudo udevadm trigger --name-match=kvm + echo "::endgroup::" + + echo "::group::download and build sqlite3 without SQLITE_OMIT_LOAD_EXTENSION" + curl -O ${{ matrix.sqlite-amalgamation-zip }} + unzip sqlite-amalgamation-*.zip + export ${{ matrix.make }} + $ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.arch }}-linux-android26-clang sqlite-amalgamation-*/shell.c sqlite-amalgamation-*/sqlite3.c -o sqlite3 -ldl + # remove unused folders to save up space + rm -rf sqlite-amalgamation-*.zip sqlite-amalgamation-* + echo "::endgroup::" + + echo "::group::prepare the test script" + make test PLATFORM=$PLATFORM ARCH=$ARCH || echo "It should fail. Running remaining commands in the emulator" + cat > commands.sh << EOF + mv -f /data/local/tmp/sqlite3 /system/xbin + cd /data/local/tmp + $(make test PLATFORM=$PLATFORM ARCH=$ARCH -n) + EOF + # remove big unused folders to avoid emulator errors + echo "::endgroup::" + + - name: android test adam extension + if: matrix.name == 'android' && matrix.arch == 'x86_64' + uses: reactivecircus/android-emulator-runner@v2.34.0 + with: + api-level: 26 + arch: ${{ matrix.arch }} + script: | + adb root + adb remount + adb push ${{ github.workspace }}/commands.sh /data/local/tmp/ + adb push ${{ github.workspace }}/sqlite3 /data/local/tmp/ + adb push ${{ github.workspace }}/dist /data/local/tmp/ + adb push ${{ github.workspace }}/Makefile /data/local/tmp/ + adb shell "sh /data/local/tmp/commands.sh" + + - name: windows test adam extension + if: matrix.os == 'windows-2022' + run: make test ${{ matrix.make && matrix.make || ''}} + shell: msys2 {0} + env: + VULKAN_SDK: "C:/msys64/mingw64" + + - name: unix test adam extension + if: contains(matrix.name, 'linux') || ( matrix.name == 'macos' && matrix.arch != 'x86_64' ) + run: ${{ contains(matrix.name, 'linux-musl') && matrix.arch == 'arm64' && 'docker exec alpine' || '' }} make test ${{ matrix.make && matrix.make || ''}} + + - uses: actions/upload-artifact@v4.6.2 + if: always() + with: + name: adam-${{ matrix.name }}${{ matrix.arch && format('-{0}', matrix.arch) || '' }} + path: dist/adam.* + if-no-files-found: error + + release: + runs-on: ubuntu-22.04 + name: release + needs: build + if: github.ref == 'refs/heads/main' + + steps: + + - uses: actions/checkout@v4.2.2 + + - uses: actions/download-artifact@v4.2.1 + with: + path: artifacts + + - name: zip artifacts + run: | + VERSION=$(make version) + for folder in "artifacts"/*; do + if [ -d "$folder" ]; then + name=$(basename "$folder") + if [[ "$name" != "adam-apple-xcframework" && "$name" != "adam-android-aar" ]]; then + tar -czf "${name}-${VERSION}.tar.gz" -C "$folder" . + fi + if [[ "$name" == "adam-apple-xcframework" ]]; then + # Use the ditto-created zip that preserves macOS symlinks and extract for other steps + cp "$folder/adam.xcframework.zip" "${name}-${VERSION}.zip" + unzip -q "$folder/adam.xcframework.zip" -d "$folder/" + elif [[ "$name" != "adam-android-aar" ]]; then + (cd "$folder" && zip -rq "../../${name}-${VERSION}.zip" .) + else + cp "$folder"/*.aar "${name}-${VERSION}.aar" + fi + fi + done + + - name: release tag version from adam.h + id: tag + run: | + VERSION=$(make version) + if [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + LATEST_RELEASE=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" https://api.github.com/repos/${{ github.repository }}/releases/latest) + LATEST=$(echo "$LATEST_RELEASE" | jq -r '.name') + if [[ "$VERSION" != "$LATEST" || "$GITHUB_EVENT_NAME" == "workflow_dispatch" ]]; then + echo "version=$VERSION" >> $GITHUB_OUTPUT + else + echo "::warning file=src/adam.h::To release a new version, please update the ADAM_VERSION_STRING in src/adam.h to be different than the latest $LATEST" + fi + exit 0 + fi + echo "❌ ADAM_VERSION_STRING not found in src/adam.h" + exit 1 + + - uses: actions/setup-java@v4 + if: steps.tag.outputs.version != '' + with: + distribution: 'temurin' + java-version: '17' + + - name: release android aar to maven central + if: steps.tag.outputs.version != '' + run: cd packages/android && ./gradlew publishAggregationToCentralPortal -PSIGNING_KEY="${{ secrets.SIGNING_KEY }}" -PSIGNING_PASSWORD="${{ secrets.SIGNING_PASSWORD }}" -PSONATYPE_USERNAME="${{ secrets.MAVEN_CENTRAL_USERNAME }}" -PSONATYPE_PASSWORD="${{ secrets.MAVEN_CENTRAL_TOKEN }}" -PVERSION="${{ steps.tag.outputs.version }}" -PAAR_PATH="../../artifacts/adam-android-aar/adam.aar" + + - name: update Package.swift checksum and version + if: steps.tag.outputs.version != '' + run: | + VERSION=${{ steps.tag.outputs.version }} + ZIP="adam-apple-xcframework-${VERSION}.zip" + if [ -f "$ZIP" ]; then + CHECKSUM=$(swift package compute-checksum "$ZIP") + URL="https://github.com/sqliteai/adam/releases/download/${VERSION}/${ZIP}" + sed -i "s|url: \".*apple-xcframework.*\"|url: \"${URL}\"|" Package.swift + sed -i "s|checksum: \".*\"|checksum: \"${CHECKSUM}\"|" Package.swift + git config --global user.email "$GITHUB_ACTOR@users.noreply.github.com" + git config --global user.name "$GITHUB_ACTOR" + git add Package.swift + git commit -m "Update Package.swift checksum for ${VERSION} [auto-update]" || true + git push origin main || true + fi + + - uses: softprops/action-gh-release@v2.2.1 + if: steps.tag.outputs.version != '' + with: + token: ${{ secrets.RELEASE_PAT }} + body: | + # Packages + + [**Flutter/Dart**](https://pub.dev/packages/sqlite_adam): `flutter pub add sqlite_adam:${{ steps.tag.outputs.version }}` or `dart pub add sqlite_adam:${{ steps.tag.outputs.version }}` + [**Android**](https://central.sonatype.com/artifact/ai.sqlite/adam): `ai.sqlite:adam:${{ steps.tag.outputs.version }}` + [**Swift**](https://github.com/sqliteai/adam#swift-package): [Installation Guide](https://github.com/sqliteai/adam#swift-package) + + --- + + generate_release_notes: true + tag_name: ${{ steps.tag.outputs.version }} + files: adam-*-${{ steps.tag.outputs.version }}.* + make_latest: true diff --git a/.gitignore b/.gitignore index 0cc82ad..bd03553 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,8 @@ test_chat test_voice_interactive test_voice_talk adam +build/ +dist/ # Models *.gguf @@ -33,6 +35,14 @@ PLAN.md *~ .vscode/ .idea/ +*.iml + +# Gradle / Android (packages/android) +.gradle/ +local.properties + +# Dart / Flutter (packages/flutter) +.dart_tool/ # Dependency build artifacts deps/*/build/ diff --git a/Makefile b/Makefile index 2aecbd0..212a06d 100644 --- a/Makefile +++ b/Makefile @@ -6,28 +6,57 @@ UNAME_S := $(shell uname -s) CC ?= cc # ============================================================================ -# Modules (git submodules in modules/) +# Platform / arch detection (overridable from CI: PLATFORM=android ARCH=arm64-v8a) +# ============================================================================ + +ifeq ($(OS),Windows_NT) + PLATFORM ?= windows + HOST := windows + CPUS := $(shell powershell -Command "[Environment]::ProcessorCount" 2>/dev/null || echo 4) +else + HOST := $(shell uname -s | tr '[:upper:]' '[:lower:]') + ifeq ($(HOST),darwin) + PLATFORM ?= macos + CPUS := $(shell sysctl -n hw.ncpu 2>/dev/null || echo 4) + else + PLATFORM ?= $(HOST) + CPUS := $(shell nproc 2>/dev/null || echo 4) + endif +endif + +# CMake options pass-through from CI matrix +LLAMA ?= +WHISPER ?= +MINIAUDIO ?= + +# ============================================================================ +# Modules (git submodules in modules/) and shared build/ tree # ============================================================================ MBEDTLS_DIR := $(ADAM_ROOT)modules/mbedtls CURL_DIR := $(ADAM_ROOT)modules/curl -MBEDTLS_BUILD := $(MBEDTLS_DIR)/build -CURL_BUILD := $(CURL_DIR)/build MINIAUDIO_DIR := $(ADAM_ROOT)modules/miniaudio LLAMA_DIR := $(ADAM_ROOT)modules/llama.cpp -LLAMA_BUILD := $(LLAMA_DIR)/build WHISPER_DIR := $(ADAM_ROOT)modules/whisper.cpp -WHISPER_BUILD := $(WHISPER_DIR)/build SQLITE_MEMORY_DIR := $(ADAM_ROOT)modules/sqlite-memory SQLITE_VECTOR_DIR := $(ADAM_ROOT)modules/sqlite-vector +# All dependency builds live under build/ at the repo root. +BUILD_DIR := $(ADAM_ROOT)build +DIST_DIR := $(ADAM_ROOT)dist +LLAMA_BUILD := $(BUILD_DIR)/llama.cpp +WHISPER_BUILD := $(BUILD_DIR)/whisper.cpp +MINIAUDIO_BUILD := $(BUILD_DIR)/miniaudio +MBEDTLS_BUILD := $(BUILD_DIR)/mbedtls +CURL_BUILD := $(BUILD_DIR)/curl + # ============================================================================ # Compiler settings # ============================================================================ SQLITE_DIR := $(ADAM_ROOT)modules/sqlite -CFLAGS := -std=c11 -D_POSIX_C_SOURCE=200809L -Wall -Wextra -Wpedantic -O2 +CFLAGS := -std=c11 -D_POSIX_C_SOURCE=200809L -Wall -Wextra -Wpedantic -O2 -fPIC CFLAGS += -Isrc -I$(MINIAUDIO_DIR) -I$(SQLITE_DIR) CFLAGS += -I$(LLAMA_DIR)/include -I$(LLAMA_DIR)/ggml/include -I$(LLAMA_DIR)/tools/mtmd CFLAGS += -I$(WHISPER_DIR)/include @@ -45,7 +74,12 @@ SQLITE_FLAGS := -DSQLITE_THREADSAFE=1 \ -DSQLITE_USE_ALLOCA \ -DSQLITE_OMIT_AUTOINIT +# Android's bionic libc has pthread built in — no separate libpthread.so to link. +ifeq ($(PLATFORM),android) +LDFLAGS := -lz +else LDFLAGS := -lpthread -lz +endif # ============================================================================ # Platform-specific: Apple (NSURLSession) vs Other (libcurl + mbedtls) @@ -61,21 +95,87 @@ LLAMA_LIBS := $(LLAMA_BUILD)/tools/mtmd/libmtmd.a \ # Only libwhisper.a is needed — ggml symbols come from LLAMA_LIBS. WHISPER_LIBS := $(WHISPER_BUILD)/src/libwhisper.a -ifeq ($(UNAME_S),Darwin) - # Apple: use NSURLSession — no curl/mbedtls needed - CFLAGS += -DADAM_NO_CURL +# Apple platforms (macos, ios, ios-sim) all use NSURLSession. +# _DARWIN_C_SOURCE re-exposes BSD extensions (e.g. memmem) that the +# global _POSIX_C_SOURCE=200809L would otherwise hide. +ifneq (,$(filter $(PLATFORM),macos ios ios-sim)) + CFLAGS += -DADAM_NO_CURL -D_DARWIN_C_SOURCE=1 LDFLAGS += -framework Foundation LDFLAGS += -framework SystemConfiguration -framework Security - LDFLAGS += -framework CoreAudio -framework AudioToolbox + LDFLAGS += -framework CoreAudio -framework AudioToolbox -framework AVFoundation LDFLAGS += -framework Metal -framework MetalKit -framework Accelerate LDFLAGS += -lstdc++ NET_SRC := src/adam_net_apple.m TTS_SYS_SRC := src/adam_tts_system.m LLAMA_LIBS += $(LLAMA_BUILD)/ggml/src/ggml-metal/libggml-metal.a - LLAMA_LIBS += $(LLAMA_BUILD)/ggml/src/ggml-blas/libggml-blas.a - LDFLAGS += -framework AVFoundation + # Pick up ggml-blas if llama.cpp was configured with -DGGML_BLAS=ON + # (libggml.a then references blas backend symbols that need this lib). + GGML_BLAS_LIB := $(wildcard $(LLAMA_BUILD)/ggml/src/ggml-blas/libggml-blas.a) + ifneq ($(GGML_BLAS_LIB),) + LLAMA_LIBS += $(GGML_BLAS_LIB) + endif + + # PLATFORM_CFLAGS holds -arch + -isysroot bits that must apply to *every* + # compilation unit in libadam.a (otherwise sqlite3.o, sqlite-vector, + # sqlite-memory get built host-arch and the static archive has mixed + # architectures). `-x objective-c` is added only to CFLAGS — for iOS, + # miniaudio.h pulls in which is Obj-C only. + ifeq ($(PLATFORM),macos) + ifndef ARCH + PLATFORM_CFLAGS := -arch x86_64 -arch arm64 + else + PLATFORM_CFLAGS := -arch $(ARCH) + endif + CFLAGS += $(PLATFORM_CFLAGS) + LDFLAGS += $(PLATFORM_CFLAGS) + else ifeq ($(PLATFORM),ios) + APPLE_SDK := -isysroot $(shell xcrun --sdk iphoneos --show-sdk-path) -miphoneos-version-min=14.0 + PLATFORM_CFLAGS := -arch arm64 $(APPLE_SDK) + CFLAGS += $(PLATFORM_CFLAGS) -x objective-c + LDFLAGS += $(PLATFORM_CFLAGS) + else ifeq ($(PLATFORM),ios-sim) + APPLE_SDK := -isysroot $(shell xcrun --sdk iphonesimulator --show-sdk-path) -miphonesimulator-version-min=14.0 + PLATFORM_CFLAGS := -arch x86_64 -arch arm64 $(APPLE_SDK) + CFLAGS += $(PLATFORM_CFLAGS) -x objective-c + LDFLAGS += $(PLATFORM_CFLAGS) + endif + + LIBS := $(WHISPER_LIBS) $(LLAMA_LIBS) + # Pick up CoreML stub when whisper was built with -DWHISPER_COREML=ON. + WHISPER_COREML_LIB := $(wildcard $(WHISPER_BUILD)/src/libwhisper.coreml.a) + ifneq ($(WHISPER_COREML_LIB),) + LIBS += $(WHISPER_COREML_LIB) + LDFLAGS += -framework CoreML + endif +else ifeq ($(PLATFORM),android) + # Android: cross-compile via NDK, use libcurl + mbedtls. + ifndef ARCH + $(error Android ARCH must be set to ARCH=x86_64, ARCH=arm64-v8a, or ARCH=armeabi-v7a) + endif + ifndef ANDROID_NDK + $(error ANDROID_NDK must point to the Android NDK install) + endif + ANDROID_NDK_BIN := $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST)-x86_64/bin + ifneq (,$(filter $(ARCH),arm64 arm64-v8a)) + NDK_TRIPLE := aarch64-linux-android26 + else ifeq ($(ARCH),armeabi-v7a) + NDK_TRIPLE := armv7a-linux-androideabi26 + else + NDK_TRIPLE := $(ARCH)-linux-android26 + endif + CC := $(ANDROID_NDK_BIN)/$(NDK_TRIPLE)-clang + # Host ar/ranlib choke on ELF objects from the NDK; use llvm-ar from the NDK. + AR := $(ANDROID_NDK_BIN)/llvm-ar + CFLAGS += -I$(CURL_DIR)/include -I$(MBEDTLS_DIR)/include + LDFLAGS += -ldl -lm + NET_SRC := src/adam_net_curl.c + TTS_SYS_SRC := src/adam_tts_system.c LIBS := $(WHISPER_LIBS) $(LLAMA_LIBS) -else ifeq ($(UNAME_S),Linux) + LIBS += $(CURL_BUILD)/lib/libcurl.a + LIBS += $(MBEDTLS_BUILD)/library/libmbedtls.a + LIBS += $(MBEDTLS_BUILD)/library/libmbedx509.a + LIBS += $(MBEDTLS_BUILD)/library/libmbedcrypto.a +else ifeq ($(PLATFORM),linux) # Linux: use libcurl + mbedtls CFLAGS += -I$(CURL_DIR)/include -I$(MBEDTLS_DIR)/include LDFLAGS += -ldl -lm -lstdc++ @@ -91,7 +191,8 @@ else CFLAGS += -I$(CURL_DIR)/include -I$(MBEDTLS_DIR)/include NET_SRC := src/adam_net_curl.c TTS_SYS_SRC := src/adam_tts_system.c - LIBS := $(CURL_BUILD)/lib/libcurl.a + LIBS := $(WHISPER_LIBS) $(LLAMA_LIBS) + LIBS += $(CURL_BUILD)/lib/libcurl.a LIBS += $(MBEDTLS_BUILD)/library/libmbedtls.a LIBS += $(MBEDTLS_BUILD)/library/libmbedx509.a LIBS += $(MBEDTLS_BUILD)/library/libmbedcrypto.a @@ -148,21 +249,24 @@ endif # Targets # ============================================================================ -.PHONY: all clean test live voice talk chat memory vision deps mbedtls curl llama whisper +.PHONY: all clean test live voice talk chat memory vision deps \ + mbedtls curl llama whisper extension xcframework aar version all: libadam.a adam # --- Static library --- +AR ?= ar + libadam.a: $(OBJS) $(NET_OBJ) $(TTS_SYS_OBJ) $(SQLITE_OBJ) $(SQLITE_VECTOR_OBJS) $(SQLITE_MEMORY_OBJS) $(SQLITE_MEMORY_HTTP_OBJ) - ar rcs $@ $^ + $(AR) rcs $@ $^ src/%.o: src/%.c $(CC) $(CFLAGS) -c $< -o $@ # SQLite amalgamation — compiled with its own flags (no -Wpedantic, etc.) $(SQLITE_OBJ): $(SQLITE_DIR)/sqlite3.c - $(CC) -std=c11 -O2 $(SQLITE_FLAGS) -c $< -o $@ + $(CC) -std=c11 -O2 -fPIC $(PLATFORM_CFLAGS) $(SQLITE_FLAGS) -c $< -o $@ # Objective-C compilation for Apple platform files src/adam_net_apple.o: src/adam_net_apple.m @@ -173,11 +277,11 @@ src/adam_tts_system.o: src/adam_tts_system.m # sqlite-vector — compiled with -DSQLITE_CORE (no -Wpedantic) $(SQLITE_VECTOR_DIR)/src/%.o: $(SQLITE_VECTOR_DIR)/src/%.c - $(CC) -std=c11 -O3 -DSQLITE_CORE -I$(SQLITE_VECTOR_DIR)/src -I$(SQLITE_VECTOR_DIR)/libs -I$(SQLITE_DIR) -c $< -o $@ + $(CC) -std=c11 -O3 -fPIC $(PLATFORM_CFLAGS) -DSQLITE_CORE -I$(SQLITE_VECTOR_DIR)/src -I$(SQLITE_VECTOR_DIR)/libs -I$(SQLITE_DIR) -c $< -o $@ # sqlite-memory — compiled with -DSQLITE_CORE (no -Wpedantic) $(SQLITE_MEMORY_DIR)/src/%.o: $(SQLITE_MEMORY_DIR)/src/%.c - $(CC) $(DBMEM_CFLAGS) -c $< -o $@ + $(CC) -fPIC $(PLATFORM_CFLAGS) $(DBMEM_CFLAGS) -c $< -o $@ # --- CLI --- @@ -259,35 +363,80 @@ test_vision: libadam.a test/test_vision.c # --- Dependencies --- -deps: llama whisper +# Cross-compile cmake options derived from PLATFORM/ARCH. +# These compose with whatever the CI matrix passes via $(LLAMA)/$(WHISPER)/$(MINIAUDIO). +ifeq ($(PLATFORM),macos) + ifndef ARCH + PLATFORM_OPTS := -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 + else + PLATFORM_OPTS := -DCMAKE_OSX_ARCHITECTURES="$(ARCH)" -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 + endif +else ifeq ($(PLATFORM),ios) + PLATFORM_OPTS := -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 +else ifeq ($(PLATFORM),ios-sim) + PLATFORM_OPTS := -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" +else ifeq ($(PLATFORM),android) + ifndef ARCH + $(error Android ARCH must be set to ARCH=x86_64, ARCH=arm64-v8a, or ARCH=armeabi-v7a) + endif + ifndef ANDROID_NDK + $(error ANDROID_NDK must point to the Android NDK install) + endif + ANDROID_NDK_BIN := $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST)-x86_64/bin + PLATFORM_OPTS := -DCMAKE_TOOLCHAIN_FILE=$(ANDROID_NDK)/build/cmake/android.toolchain.cmake \ + -DANDROID_ABI=$(ARCH) -DANDROID_PLATFORM=android-26 \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DGGML_OPENMP=OFF -DGGML_LLAMAFILE=OFF +else + PLATFORM_OPTS := +endif + +deps: build/llama.cpp.stamp build/whisper.cpp.stamp build/miniaudio.stamp ifeq ($(UNAME_S),Linux) -deps: mbedtls curl +deps: build/mbedtls.stamp build/curl.stamp endif -llama: +# Stamp targets: cacheable in CI and idempotent for local dev. +$(BUILD_DIR)/llama.cpp.stamp: + @mkdir -p $(BUILD_DIR) cmake -B $(LLAMA_BUILD) -S $(LLAMA_DIR) \ -DBUILD_SHARED_LIBS=OFF -DLLAMA_BUILD_TESTS=OFF \ -DLLAMA_BUILD_EXAMPLES=OFF -DLLAMA_BUILD_SERVER=OFF \ - -DCMAKE_BUILD_TYPE=Release - cmake --build $(LLAMA_BUILD) -j$$(sysctl -n hw.ncpu 2>/dev/null || nproc) --target llama --target ggml --target mtmd - -whisper: - @# whisper.cpp/ggml must be symlinked to llama.cpp/ggml + -DCMAKE_BUILD_TYPE=Release \ + $(PLATFORM_OPTS) $(LLAMA) + cmake --build $(LLAMA_BUILD) --config Release -j$(CPUS) --target llama --target ggml --target mtmd + touch $@ + +$(BUILD_DIR)/whisper.cpp.stamp: $(BUILD_DIR)/llama.cpp.stamp + @mkdir -p $(BUILD_DIR) + @# whisper.cpp/ggml must be symlinked to llama.cpp/ggml so whisper compiles + @# against the same ggml that llama.cpp is built with. @test -L $(WHISPER_DIR)/ggml || (rm -rf $(WHISPER_DIR)/ggml && ln -s ../llama.cpp/ggml $(WHISPER_DIR)/ggml) cmake -B $(WHISPER_BUILD) -S $(WHISPER_DIR) \ -DBUILD_SHARED_LIBS=OFF -DWHISPER_BUILD_TESTS=OFF \ -DWHISPER_BUILD_EXAMPLES=OFF \ - -DCMAKE_BUILD_TYPE=Release - cmake --build $(WHISPER_BUILD) -j$$(sysctl -n hw.ncpu 2>/dev/null || nproc) --target whisper - -mbedtls: + -DCMAKE_BUILD_TYPE=Release \ + $(PLATFORM_OPTS) $(LLAMA) $(WHISPER) + cmake --build $(WHISPER_BUILD) --config Release -j$(CPUS) --target whisper + touch $@ + +$(BUILD_DIR)/miniaudio.stamp: + @mkdir -p $(MINIAUDIO_BUILD) + @# miniaudio is header-only — the stamp exists so CI can cache the slot + @# uniformly with llama/whisper. + touch $@ + +$(BUILD_DIR)/mbedtls.stamp: + @mkdir -p $(BUILD_DIR) cd $(MBEDTLS_DIR) && git submodule update --init cmake -B $(MBEDTLS_BUILD) -S $(MBEDTLS_DIR) \ -DENABLE_TESTING=OFF -DENABLE_PROGRAMS=OFF \ - -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON - cmake --build $(MBEDTLS_BUILD) -j$$(sysctl -n hw.ncpu 2>/dev/null || nproc) + -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + $(PLATFORM_OPTS) + cmake --build $(MBEDTLS_BUILD) --config Release -j$(CPUS) + touch $@ -curl: mbedtls +$(BUILD_DIR)/curl.stamp: $(BUILD_DIR)/mbedtls.stamp cmake -B $(CURL_BUILD) -S $(CURL_DIR) \ -DCURL_USE_MBEDTLS=ON -DCURL_USE_OPENSSL=OFF \ -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON \ @@ -298,8 +447,16 @@ curl: mbedtls -DMBEDTLS_INCLUDE_DIR=$(MBEDTLS_DIR)/include \ -DMBEDTLS_LIBRARY=$(MBEDTLS_BUILD)/library/libmbedtls.a \ -DMBEDX509_LIBRARY=$(MBEDTLS_BUILD)/library/libmbedx509.a \ - -DMBEDCRYPTO_LIBRARY=$(MBEDTLS_BUILD)/library/libmbedcrypto.a - cmake --build $(CURL_BUILD) -j$$(sysctl -n hw.ncpu 2>/dev/null || nproc) + -DMBEDCRYPTO_LIBRARY=$(MBEDTLS_BUILD)/library/libmbedcrypto.a \ + $(PLATFORM_OPTS) + cmake --build $(CURL_BUILD) --config Release -j$(CPUS) + touch $@ + +# Backwards-compatible aliases so existing developer commands still work. +llama: $(BUILD_DIR)/llama.cpp.stamp +whisper: $(BUILD_DIR)/whisper.cpp.stamp +mbedtls: $(BUILD_DIR)/mbedtls.stamp +curl: $(BUILD_DIR)/curl.stamp # --- WASM (Emscripten) --- @@ -322,10 +479,137 @@ adam.js: $(WASM_SRCS) -sMODULARIZE=1 -sEXPORT_NAME=AdamModule \ -o $@ +# ============================================================================ +# CI / packaging targets — built by .github/workflows/main.yml +# ============================================================================ + +# Print the version string from src/adam.h. Consumed by the release job. +version: + @sed -n 's/^#define ADAM_VERSION_STRING[[:space:]]*"\([^"]*\)".*/\1/p' src/adam.h + +# Loadable SQLite extension: dist/adam.{dylib,so,dll}. +# Wraps extensions/sqlite/Makefile after libadam.a + dependencies are built. +ifeq ($(PLATFORM),windows) + EXT_FILE := adam.dll +else ifeq ($(PLATFORM),macos) + EXT_FILE := adam.dylib +else ifeq ($(PLATFORM),ios) + EXT_FILE := adam.dylib +else ifeq ($(PLATFORM),ios-sim) + EXT_FILE := adam.dylib +else + EXT_FILE := adam.so +endif + +# Non-Apple platforms (linux, windows, android) need libcurl + mbedtls. +EXT_DEPS := $(BUILD_DIR)/llama.cpp.stamp $(BUILD_DIR)/whisper.cpp.stamp $(BUILD_DIR)/miniaudio.stamp +ifeq (,$(filter $(PLATFORM),macos ios ios-sim)) + EXT_DEPS += $(BUILD_DIR)/mbedtls.stamp $(BUILD_DIR)/curl.stamp +endif + +extension: $(DIST_DIR)/$(EXT_FILE) + +$(DIST_DIR)/$(EXT_FILE): $(EXT_DEPS) libadam.a + @mkdir -p $(DIST_DIR) + $(MAKE) -C extensions/sqlite all PLATFORM=$(PLATFORM) ARCH=$(ARCH) + cp extensions/sqlite/$(EXT_FILE) $(DIST_DIR)/$(EXT_FILE) + +# Apple XCFramework — builds adam.dylib three times (macos, ios, ios-sim) and +# bundles them into dist/adam.xcframework with framework metadata. +LIB_NAMES := ios.dylib ios-sim.dylib macos.dylib +FMWK_NAMES := ios-arm64 ios-arm64_x86_64-simulator macos-arm64_x86_64 + +.NOTPARALLEL: %.dylib +%.dylib: + @# Clean enough to force a per-platform rebuild WITHOUT wiping dist/ + @# (each iteration produces a renamed dylib in dist/ that the xcframework + @# bundling step needs). + rm -rf $(BUILD_DIR) libadam.a src/*.o $(SQLITE_OBJ) $(SQLITE_VECTOR_OBJS) $(SQLITE_MEMORY_OBJS) + $(MAKE) -C extensions/sqlite clean + $(MAKE) extension PLATFORM=$* LLAMA="$(LLAMA)" WHISPER="$(WHISPER)" MINIAUDIO="$(MINIAUDIO)" + mv $(DIST_DIR)/adam.dylib $(DIST_DIR)/$@ + +define ADAM_PLIST +\ +\ +\ +\ +CFBundleDevelopmentRegionen\ +CFBundleExecutableadam\ +CFBundleIdentifierai.sqlite.adam\ +CFBundleInfoDictionaryVersion6.0\ +CFBundlePackageTypeFMWK\ +CFBundleSignature????\ +CFBundleVersion$(shell make -s version)\ +CFBundleShortVersionString$(shell make -s version)\ +MinimumOSVersion11.0\ + +endef + +define ADAM_MODULEMAP +framework module adam {\ + umbrella header \"adam.h\"\ + export *\ +} +endef + +$(DIST_DIR)/%.xcframework: $(LIB_NAMES) + @$(foreach i,1 2,\ + lib=$(word $(i),$(LIB_NAMES)); \ + fmwk=$(word $(i),$(FMWK_NAMES)); \ + mkdir -p $(DIST_DIR)/$$fmwk/adam.framework/Headers; \ + mkdir -p $(DIST_DIR)/$$fmwk/adam.framework/Modules; \ + cp src/adam.h $(DIST_DIR)/$$fmwk/adam.framework/Headers; \ + printf "$(ADAM_PLIST)" > $(DIST_DIR)/$$fmwk/adam.framework/Info.plist; \ + printf "$(ADAM_MODULEMAP)" > $(DIST_DIR)/$$fmwk/adam.framework/Modules/module.modulemap; \ + mv $(DIST_DIR)/$$lib $(DIST_DIR)/$$fmwk/adam.framework/adam; \ + install_name_tool -id "@rpath/adam.framework/adam" $(DIST_DIR)/$$fmwk/adam.framework/adam; \ + ) + @lib=$(word 3,$(LIB_NAMES)); \ + fmwk=$(word 3,$(FMWK_NAMES)); \ + mkdir -p $(DIST_DIR)/$$fmwk/adam.framework/Versions/A/Headers; \ + mkdir -p $(DIST_DIR)/$$fmwk/adam.framework/Versions/A/Modules; \ + mkdir -p $(DIST_DIR)/$$fmwk/adam.framework/Versions/A/Resources; \ + cp src/adam.h $(DIST_DIR)/$$fmwk/adam.framework/Versions/A/Headers; \ + printf "$(ADAM_PLIST)" > $(DIST_DIR)/$$fmwk/adam.framework/Versions/A/Resources/Info.plist; \ + printf "$(ADAM_MODULEMAP)" > $(DIST_DIR)/$$fmwk/adam.framework/Versions/A/Modules/module.modulemap; \ + mv $(DIST_DIR)/$$lib $(DIST_DIR)/$$fmwk/adam.framework/Versions/A/adam; \ + install_name_tool -id "@rpath/adam.framework/adam" $(DIST_DIR)/$$fmwk/adam.framework/Versions/A/adam; \ + ln -sf A $(DIST_DIR)/$$fmwk/adam.framework/Versions/Current; \ + ln -sf Versions/Current/adam $(DIST_DIR)/$$fmwk/adam.framework/adam; \ + ln -sf Versions/Current/Headers $(DIST_DIR)/$$fmwk/adam.framework/Headers; \ + ln -sf Versions/Current/Modules $(DIST_DIR)/$$fmwk/adam.framework/Modules; \ + ln -sf Versions/Current/Resources $(DIST_DIR)/$$fmwk/adam.framework/Resources; + xcodebuild -create-xcframework $(foreach fmwk,$(FMWK_NAMES),-framework $(DIST_DIR)/$(fmwk)/adam.framework) -output $@ + rm -rf $(foreach fmwk,$(FMWK_NAMES),$(DIST_DIR)/$(fmwk)) + +xcframework: $(DIST_DIR)/adam.xcframework + +# Android AAR — builds adam.so for arm64-v8a + x86_64, drops them into +# packages/android/src/main/jniLibs/, then runs Gradle to assemble the AAR. +AAR_ARM64 := packages/android/src/main/jniLibs/arm64-v8a/ +AAR_X86 := packages/android/src/main/jniLibs/x86_64/ +aar: + mkdir -p $(AAR_ARM64) $(AAR_X86) + $(MAKE) clean + $(MAKE) extension PLATFORM=android ARCH=arm64-v8a + mv $(DIST_DIR)/adam.so $(AAR_ARM64) + $(MAKE) clean + $(MAKE) extension PLATFORM=android ARCH=x86_64 + mv $(DIST_DIR)/adam.so $(AAR_X86) + cd packages/android && ./gradlew clean assembleRelease + @mkdir -p $(DIST_DIR) + cp packages/android/build/outputs/aar/android-release.aar $(DIST_DIR)/adam.aar + # --- Clean --- clean: - rm -f $(OBJS) $(NET_OBJ) $(TTS_SYS_OBJ) $(SQLITE_OBJ) libadam.a adam test_adam test_live test_chat test_memory test_evolve test_voice_interactive test_voice_talk test_tools test_vision + rm -f $(OBJS) $(SQLITE_OBJ) libadam.a adam test_adam test_live test_chat test_memory test_evolve test_voice_interactive test_voice_talk test_tools test_vision + @# Wipe ALL platform-specific net/tts objects, not just the current PLATFORM's, + @# so switching PLATFORM=android → PLATFORM=ios doesn't leave stale arch objects. + rm -f src/adam_net_apple.o src/adam_net_curl.o src/adam_tts_system.o rm -f $(SQLITE_VECTOR_OBJS) $(SQLITE_MEMORY_OBJS) $(SQLITE_MEMORY_HTTP_OBJ) rm -rf *.dSYM rm -f adam.js adam.wasm + rm -rf $(BUILD_DIR) $(DIST_DIR) + $(MAKE) -C extensions/sqlite clean 2>/dev/null || true diff --git a/extensions/postgres/Makefile b/extensions/postgres/Makefile index f5d3d25..5e4a9a2 100644 --- a/extensions/postgres/Makefile +++ b/extensions/postgres/Makefile @@ -14,10 +14,10 @@ OBJS = pg_adam.o \ ../src/adam_ext_schema.o \ ../src/adam_ext_chat.o -# Adam library and dependencies +# Adam library and dependencies (build tree shared with extensions/sqlite via top-level build/). ADAM_LIB := $(ADAM_ROOT)/libadam.a -LLAMA_BUILD := $(ADAM_ROOT)/modules/llama.cpp/build -WHISPER_BUILD := $(ADAM_ROOT)/modules/whisper.cpp/build +LLAMA_BUILD := $(ADAM_ROOT)/build/llama.cpp +WHISPER_BUILD := $(ADAM_ROOT)/build/whisper.cpp SHLIB_LINK := $(ADAM_LIB) \ $(WHISPER_BUILD)/src/libwhisper.a \ @@ -39,10 +39,10 @@ ifeq ($(UNAME_S),Darwin) -framework AVFoundation else SHLIB_LINK := -Wl,--no-as-needed $(SHLIB_LINK) -lgomp \ - $(ADAM_ROOT)/modules/curl/build/lib/libcurl.a \ - $(ADAM_ROOT)/modules/mbedtls/build/library/libmbedtls.a \ - $(ADAM_ROOT)/modules/mbedtls/build/library/libmbedx509.a \ - $(ADAM_ROOT)/modules/mbedtls/build/library/libmbedcrypto.a \ + $(ADAM_ROOT)/build/curl/lib/libcurl.a \ + $(ADAM_ROOT)/build/mbedtls/library/libmbedtls.a \ + $(ADAM_ROOT)/build/mbedtls/library/libmbedx509.a \ + $(ADAM_ROOT)/build/mbedtls/library/libmbedcrypto.a \ -ldl -lm endif diff --git a/extensions/sqlite/Makefile b/extensions/sqlite/Makefile index ce6c81a..a83d89a 100644 --- a/extensions/sqlite/Makefile +++ b/extensions/sqlite/Makefile @@ -1,10 +1,50 @@ # SQLite Adam Extension -# Builds adam.dylib (macOS) / adam.so (Linux) loadable extension +# Builds the loadable extension: adam.dylib (macOS/iOS) / adam.so (Linux/Android) / adam.dll (Windows) +# +# Driven by the top-level Makefile via `make extension`. Honors PLATFORM and ARCH +# the same way the parent does so cross-compile (Android, iOS) works end-to-end. ADAM_ROOT := ../.. -UNAME_S := $(shell uname -s) -CC ?= cc +# ---------------------------------------------------------------------------- +# Platform / arch detection (matches top-level Makefile) +# ---------------------------------------------------------------------------- +ifeq ($(OS),Windows_NT) + PLATFORM ?= windows + HOST := windows +else + HOST := $(shell uname -s | tr '[:upper:]' '[:lower:]') + ifeq ($(HOST),darwin) + PLATFORM ?= macos + else + PLATFORM ?= $(HOST) + endif +endif + +# Compiler — Android overrides via NDK toolchain; everything else uses cc. +CC ?= cc + +ifeq ($(PLATFORM),android) + ifndef ARCH + $(error Android ARCH must be set to ARCH=x86_64, ARCH=arm64-v8a, or ARCH=armeabi-v7a) + endif + ifndef ANDROID_NDK + $(error ANDROID_NDK must point to the Android NDK install) + endif + ANDROID_NDK_BIN := $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST)-x86_64/bin + ifneq (,$(filter $(ARCH),arm64 arm64-v8a)) + NDK_TRIPLE := aarch64-linux-android26 + else ifeq ($(ARCH),armeabi-v7a) + NDK_TRIPLE := armv7a-linux-androideabi26 + else + NDK_TRIPLE := $(ARCH)-linux-android26 + endif + CC := $(ANDROID_NDK_BIN)/$(NDK_TRIPLE)-clang +endif + +# ---------------------------------------------------------------------------- +# Common flags +# ---------------------------------------------------------------------------- CFLAGS := -std=c11 -Wall -Wextra -O2 -fPIC CFLAGS += -I$(ADAM_ROOT)/src CFLAGS += -I$(ADAM_ROOT)/modules/sqlite @@ -25,8 +65,11 @@ SQLITE_SRCS := sqlite_adam.c ADAM_LIB := $(ADAM_ROOT)/libadam.a -LLAMA_BUILD := $(ADAM_ROOT)/modules/llama.cpp/build -WHISPER_BUILD := $(ADAM_ROOT)/modules/whisper.cpp/build +# Dependency builds live under the top-level build/ tree. +LLAMA_BUILD := $(ADAM_ROOT)/build/llama.cpp +WHISPER_BUILD := $(ADAM_ROOT)/build/whisper.cpp +MBEDTLS_BUILD := $(ADAM_ROOT)/build/mbedtls +CURL_BUILD := $(ADAM_ROOT)/build/curl LLAMA_LIBS := $(LLAMA_BUILD)/tools/mtmd/libmtmd.a \ $(LLAMA_BUILD)/src/libllama.a \ @@ -35,28 +78,102 @@ LLAMA_LIBS := $(LLAMA_BUILD)/tools/mtmd/libmtmd.a \ $(LLAMA_BUILD)/ggml/src/libggml-base.a WHISPER_LIBS := $(WHISPER_BUILD)/src/libwhisper.a -LDFLAGS := -lpthread -lz +# Pick up CoreML stub when whisper was built with -DWHISPER_COREML=ON. +# wildcard returns empty when the file isn't there, so non-CoreML builds +# are unaffected. +WHISPER_COREML_LIB := $(wildcard $(WHISPER_BUILD)/src/libwhisper.coreml.a) +ifneq ($(WHISPER_COREML_LIB),) + WHISPER_LIBS += $(WHISPER_COREML_LIB) + COREML_FRAMEWORK := -framework CoreML +endif + +# Pick up ggml-blas if llama.cpp was configured with -DGGML_BLAS=ON. +GGML_BLAS_LIB := $(wildcard $(LLAMA_BUILD)/ggml/src/ggml-blas/libggml-blas.a) +ifneq ($(GGML_BLAS_LIB),) + LLAMA_LIBS += $(GGML_BLAS_LIB) +endif -ifeq ($(UNAME_S),Darwin) +# Android's bionic libc has pthread built in — no separate libpthread.so to link. +ifeq ($(PLATFORM),android) + LDFLAGS := -lz +else + LDFLAGS := -lpthread -lz +endif + +# ---------------------------------------------------------------------------- +# Per-platform link / ext settings +# ---------------------------------------------------------------------------- +ifeq ($(PLATFORM),macos) + EXT := dylib CFLAGS += -DADAM_NO_CURL - EXT := dylib - LDFLAGS += -dynamiclib + ifndef ARCH + CFLAGS += -arch x86_64 -arch arm64 + LDFLAGS += -arch x86_64 -arch arm64 + else + CFLAGS += -arch $(ARCH) + LDFLAGS += -arch $(ARCH) + endif + LDFLAGS += -dynamiclib -headerpad_max_install_names LDFLAGS += -framework Foundation -framework SystemConfiguration -framework Security + LDFLAGS += -framework CoreAudio -framework AudioToolbox -framework AVFoundation + LDFLAGS += -framework Metal -framework MetalKit -framework Accelerate $(COREML_FRAMEWORK) + LDFLAGS += -lstdc++ + LLAMA_LIBS += $(LLAMA_BUILD)/ggml/src/ggml-metal/libggml-metal.a + LIBS := $(WHISPER_LIBS) $(LLAMA_LIBS) +else ifeq ($(PLATFORM),ios) + EXT := dylib + CFLAGS += -DADAM_NO_CURL -arch arm64 -x objective-c + CFLAGS += -isysroot $(shell xcrun --sdk iphoneos --show-sdk-path) -miphoneos-version-min=14.0 + LDFLAGS += -dynamiclib -headerpad_max_install_names + LDFLAGS += -isysroot $(shell xcrun --sdk iphoneos --show-sdk-path) -miphoneos-version-min=14.0 + LDFLAGS += -framework Foundation -framework Security -framework AVFoundation + LDFLAGS += -framework CoreAudio -framework AudioToolbox + LDFLAGS += -framework Metal -framework Accelerate $(COREML_FRAMEWORK) + LDFLAGS += -lstdc++ + LLAMA_LIBS += $(LLAMA_BUILD)/ggml/src/ggml-metal/libggml-metal.a + LIBS := $(WHISPER_LIBS) $(LLAMA_LIBS) +else ifeq ($(PLATFORM),ios-sim) + EXT := dylib + CFLAGS += -DADAM_NO_CURL -arch x86_64 -arch arm64 -x objective-c + CFLAGS += -isysroot $(shell xcrun --sdk iphonesimulator --show-sdk-path) -miphonesimulator-version-min=14.0 + LDFLAGS += -arch x86_64 -arch arm64 -dynamiclib -headerpad_max_install_names + LDFLAGS += -isysroot $(shell xcrun --sdk iphonesimulator --show-sdk-path) -miphonesimulator-version-min=14.0 + LDFLAGS += -framework Foundation -framework Security -framework AVFoundation LDFLAGS += -framework CoreAudio -framework AudioToolbox - LDFLAGS += -framework Metal -framework MetalKit -framework Accelerate - LDFLAGS += -lstdc++ -framework AVFoundation + LDFLAGS += -framework Metal -framework Accelerate $(COREML_FRAMEWORK) + LDFLAGS += -lstdc++ LLAMA_LIBS += $(LLAMA_BUILD)/ggml/src/ggml-metal/libggml-metal.a - LLAMA_LIBS += $(LLAMA_BUILD)/ggml/src/ggml-blas/libggml-blas.a LIBS := $(WHISPER_LIBS) $(LLAMA_LIBS) +else ifeq ($(PLATFORM),windows) + EXT := dll + CFLAGS += -I$(ADAM_ROOT)/modules/curl/include -I$(ADAM_ROOT)/modules/mbedtls/include + LDFLAGS += -shared -lbcrypt -static-libgcc + LDFLAGS += -Wl,--push-state,-Bstatic,-lstdc++,-lwinpthread,--pop-state + LIBS := $(WHISPER_LIBS) $(LLAMA_LIBS) + LIBS += $(CURL_BUILD)/lib/libcurl.a + LIBS += $(MBEDTLS_BUILD)/library/libmbedtls.a + LIBS += $(MBEDTLS_BUILD)/library/libmbedx509.a + LIBS += $(MBEDTLS_BUILD)/library/libmbedcrypto.a +else ifeq ($(PLATFORM),android) + EXT := so + # -static-libstdc++ has no effect with NDK clang in this link config; omitted. + LDFLAGS += -shared -ldl -lm -Wl,-z,max-page-size=16384 + CFLAGS += -I$(ADAM_ROOT)/modules/curl/include -I$(ADAM_ROOT)/modules/mbedtls/include + LIBS := $(WHISPER_LIBS) $(LLAMA_LIBS) + LIBS += $(CURL_BUILD)/lib/libcurl.a + LIBS += $(MBEDTLS_BUILD)/library/libmbedtls.a + LIBS += $(MBEDTLS_BUILD)/library/libmbedx509.a + LIBS += $(MBEDTLS_BUILD)/library/libmbedcrypto.a else - EXT := so + # linux (default) + EXT := so LDFLAGS += -shared -ldl -lm -lstdc++ CFLAGS += -I$(ADAM_ROOT)/modules/curl/include -I$(ADAM_ROOT)/modules/mbedtls/include LIBS := $(WHISPER_LIBS) $(LLAMA_LIBS) - LIBS += $(ADAM_ROOT)/modules/curl/build/lib/libcurl.a - LIBS += $(ADAM_ROOT)/modules/mbedtls/build/library/libmbedtls.a - LIBS += $(ADAM_ROOT)/modules/mbedtls/build/library/libmbedx509.a - LIBS += $(ADAM_ROOT)/modules/mbedtls/build/library/libmbedcrypto.a + LIBS += $(CURL_BUILD)/lib/libcurl.a + LIBS += $(MBEDTLS_BUILD)/library/libmbedtls.a + LIBS += $(MBEDTLS_BUILD)/library/libmbedx509.a + LIBS += $(MBEDTLS_BUILD)/library/libmbedcrypto.a endif .PHONY: all clean test @@ -64,8 +181,11 @@ endif all: adam.$(EXT) adam.$(EXT): $(SQLITE_SRCS) $(SHARED_SRCS) $(ADAM_LIB) + @# `-x none` resets the language after the source files so subsequent + @# .a files aren't reinterpreted as source (e.g. when CFLAGS includes + @# `-x objective-c` for iOS). $(CC) $(CFLAGS) $(LDFLAGS) $(SQLITE_SRCS) $(SHARED_SRCS) \ - $(ADAM_LIB) $(LIBS) -o $@ + -x none $(ADAM_LIB) $(LIBS) -o $@ test: adam.$(EXT) @echo "Testing adam SQLite extension..." @@ -77,4 +197,4 @@ test: adam.$(EXT) @rm -f /tmp/adam_ext_test.sql clean: - rm -f adam.$(EXT) adam.dylib adam.so + rm -f adam.dylib adam.so adam.dll adam.lib adam.def diff --git a/packages/android/build.gradle b/packages/android/build.gradle new file mode 100644 index 0000000..68c8c0e --- /dev/null +++ b/packages/android/build.gradle @@ -0,0 +1,121 @@ +buildscript { + repositories { + google() + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:8.5.2' + } +} + +plugins { + id 'com.gradleup.nmcp.aggregation' version '1.2.0' +} + +apply plugin: 'com.android.library' +apply plugin: 'maven-publish' +apply plugin: 'signing' + +android { + namespace 'ai.sqlite.adam' + compileSdk 34 + + defaultConfig { + minSdk 26 + targetSdk 34 + } + + buildTypes { + release { + minifyEnabled false + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + sourceSets { + main { + jniLibs.srcDirs = ['src/main/jniLibs'] + } + } +} + +repositories { + google() + mavenCentral() + maven { url 'https://jitpack.io' } +} + +dependencies { +} + +afterEvaluate { + publishing { + publications { + release(MavenPublication) { + groupId = 'ai.sqlite' + artifactId = 'adam' + version = project.hasProperty('VERSION') ? project.VERSION : ['make', 'version'].execute(null, file('../..')).text.trim() + + artifact(project.hasProperty('AAR_PATH') ? project.AAR_PATH : "$buildDir/outputs/aar/android-release.aar") + + // Maven Central metadata + pom { + name = 'adam' + description = 'Adam is an embeddable AI agent library for SQLite, providing on-device chat, voice, vision, memory, and tool-calling. Works on iOS, Android, Windows, Linux, and macOS.' + url = 'https://github.com/sqliteai/adam' + + licenses { + license { + name = 'Elastic License 2.0' + url = 'https://www.elastic.co/licensing/elastic-license' + } + } + + developers { + developer { + id = 'sqliteai' + name = 'SQLite Cloud, Inc.' + email = 'info@sqlitecloud.io' + organization = 'SQLite Cloud, Inc.' + organizationUrl = 'https://sqlite.ai' + } + } + + scm { + connection = 'scm:git:git://github.com/sqliteai/adam.git' + developerConnection = 'scm:git:ssh://github.com:sqliteai/adam.git' + url = 'https://github.com/sqliteai/adam/tree/main' + } + } + } + } + } + + // Signing configuration for Maven Central + signing { + required { project.hasProperty("SIGNING_KEY") } + if (project.hasProperty("SIGNING_KEY")) { + useInMemoryPgpKeys( + project.property("SIGNING_KEY").toString(), + project.property("SIGNING_PASSWORD").toString() + ) + sign publishing.publications.release + } + } +} + +// Maven Central publishing via NMCP aggregation +nmcpAggregation { + if (project.hasProperty("SONATYPE_USERNAME") && project.hasProperty("SONATYPE_PASSWORD")) { + centralPortal { + username = project.property("SONATYPE_USERNAME") + password = project.property("SONATYPE_PASSWORD") + publishingType = "AUTOMATIC" + } + publishAllProjectsProbablyBreakingProjectIsolation() + } +} diff --git a/packages/android/gradle.properties b/packages/android/gradle.properties new file mode 100644 index 0000000..ca684b2 --- /dev/null +++ b/packages/android/gradle.properties @@ -0,0 +1,2 @@ +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +android.useAndroidX=true \ No newline at end of file diff --git a/packages/android/gradle/wrapper/gradle-wrapper.jar b/packages/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..8bdaf60c75ab801e22807dde59e12a8735a34077 GIT binary patch literal 45457 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 c82=K%QXLKFx%@O{wJjEi6Y56o#$)Bpeg literal 0 HcmV?d00001 diff --git a/packages/android/gradle/wrapper/gradle-wrapper.properties b/packages/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..df97d72 --- /dev/null +++ b/packages/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/packages/android/gradlew b/packages/android/gradlew new file mode 100755 index 0000000..adff685 --- /dev/null +++ b/packages/android/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/packages/android/gradlew.bat b/packages/android/gradlew.bat new file mode 100644 index 0000000..e509b2d --- /dev/null +++ b/packages/android/gradlew.bat @@ -0,0 +1,93 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/packages/android/src/main/AndroidManifest.xml b/packages/android/src/main/AndroidManifest.xml new file mode 100644 index 0000000..8bdb7e1 --- /dev/null +++ b/packages/android/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + diff --git a/packages/flutter/.pubignore b/packages/flutter/.pubignore new file mode 100644 index 0000000..36c5a16 --- /dev/null +++ b/packages/flutter/.pubignore @@ -0,0 +1,7 @@ +# Only ignore development files, NOT native_libraries +.dart_tool/ +pubspec.lock + +# Explicitly include native_libraries (override any parent .gitignore) +!native_libraries/ +!native_libraries/** diff --git a/packages/flutter/LICENSE b/packages/flutter/LICENSE new file mode 120000 index 0000000..30cff74 --- /dev/null +++ b/packages/flutter/LICENSE @@ -0,0 +1 @@ +../../LICENSE \ No newline at end of file diff --git a/packages/flutter/README.md b/packages/flutter/README.md new file mode 100644 index 0000000..bee37e4 --- /dev/null +++ b/packages/flutter/README.md @@ -0,0 +1,74 @@ +# sqlite_adam + +Adam is an embeddable AI agent library for SQLite, providing on-device chat, voice, vision, memory, and tool-calling. It works seamlessly on iOS, Android, Windows, Linux, and macOS, integrating directly with your embedded SQLite database. + +## Installation + +``` +dart pub add sqlite_adam +``` + +Requires Dart 3.10+ / Flutter 3.38+. + +## Usage + +### With `sqlite3` + +```dart +import 'package:sqlite3/sqlite3.dart'; +import 'package:sqlite_adam/sqlite_adam.dart'; + +void main() { + // Load once at startup. + sqlite3.loadSqliteAdamExtension(); + + final db = sqlite3.openInMemory(); + + // Configure the agent (see API.md for the full list of options). + db.execute("SELECT adam_config('provider', 'anthropic')"); + db.execute("SELECT adam_config('api_key', 'sk-...')"); + + // Run the agent. + final result = db.select("SELECT adam('Say hello in 3 words')"); + print(result.first[0]); + + db.dispose(); +} +``` + +### With `drift` + +```dart +import 'package:sqlite3/sqlite3.dart'; +import 'package:sqlite_adam/sqlite_adam.dart'; +import 'package:drift/native.dart'; + +Sqlite3 loadExtensions() { + sqlite3.loadSqliteAdamExtension(); + return sqlite3; +} + +// Use when creating the database: +NativeDatabase.createInBackground( + File(path), + sqlite3: loadExtensions, +); +``` + +## Supported platforms + +| Platform | Architectures | +|----------|---------------| +| Android | arm64, x64 | +| iOS | arm64 (device + simulator) | +| macOS | arm64, x64 | +| Linux | arm64, x64 | +| Windows | x64 | + +## API + +See the full [Adam API documentation](https://github.com/sqliteai/adam/blob/main/API.md). + +## License + +See [LICENSE](LICENSE). diff --git a/packages/flutter/analysis_options.yaml b/packages/flutter/analysis_options.yaml new file mode 100644 index 0000000..572dd23 --- /dev/null +++ b/packages/flutter/analysis_options.yaml @@ -0,0 +1 @@ +include: package:lints/recommended.yaml diff --git a/packages/flutter/hook/build.dart b/packages/flutter/hook/build.dart new file mode 100644 index 0000000..f060df1 --- /dev/null +++ b/packages/flutter/hook/build.dart @@ -0,0 +1,139 @@ +// Copyright (c) 2026 SQLite Cloud, Inc. +// Licensed under the Elastic License 2.0 (see LICENSE). + +import 'dart:io'; + +import 'package:code_assets/code_assets.dart'; +import 'package:hooks/hooks.dart'; +import 'package:path/path.dart' as p; + +void main(List args) async { + await build(args, (input, output) async { + if (!input.config.buildCodeAssets) return; + + final codeConfig = input.config.code; + final os = codeConfig.targetOS; + final arch = codeConfig.targetArchitecture; + + final binaryPath = _resolveBinaryPath(os, arch, codeConfig); + if (binaryPath == null) { + throw UnsupportedError('sqlite_adam does not support $os $arch.'); + } + + final nativeLibDir = p.join( + input.packageRoot.toFilePath(), + 'native_libraries', + ); + final file = File(p.join(nativeLibDir, binaryPath)); + if (!file.existsSync()) { + throw StateError( + 'Pre-built binary not found: ${file.path}. ' + 'Run the CI pipeline to populate native_libraries/.', + ); + } + + output.dependencies.add(file.uri); + + final assetFile = await _prepareAssetFile( + input: input, + os: os, + arch: arch, + config: codeConfig, + file: file, + ); + + output.assets.code.add( + CodeAsset( + package: input.packageName, + name: 'src/native/sqlite_adam_extension.dart', + linkMode: DynamicLoadingBundled(), + file: assetFile.uri, + ), + ); + }); +} + +Future _prepareAssetFile({ + required BuildInput input, + required OS os, + required Architecture arch, + required CodeConfig config, + required File file, +}) async { + if (os != OS.iOS || config.iOS.targetSdk == IOSSdk.iPhoneOS) { + return file; + } + + final thinArch = switch (arch) { + Architecture.arm64 => 'arm64', + Architecture.x64 => 'x86_64', + _ => null, + }; + if (thinArch == null) { + return file; + } + + final outputName = 'adam_ios_sim_$thinArch.dylib'; + final outputFile = File.fromUri(input.outputDirectory.resolve(outputName)); + await outputFile.parent.create(recursive: true); + + final result = await Process.run('/usr/bin/lipo', [ + file.path, + '-thin', + thinArch, + '-output', + outputFile.path, + ]); + if (result.exitCode != 0) { + throw StateError( + 'Failed to thin sqlite_adam iOS simulator binary for $thinArch: ' + '${result.stderr}', + ); + } + + return outputFile; +} + +String? _resolveBinaryPath(OS os, Architecture arch, CodeConfig config) { + if (os == OS.android) { + return switch (arch) { + Architecture.arm64 => 'android/adam_android_arm64.so', + Architecture.x64 => 'android/adam_android_x64.so', + _ => null, + }; + } + + if (os == OS.iOS) { + final sdk = config.iOS.targetSdk; + if (sdk == IOSSdk.iPhoneOS) { + return 'ios/adam_ios_arm64.dylib'; + } + // Simulator: fat binary (arm64 + x64) + return 'ios-sim/adam_ios-sim.dylib'; + } + + if (os == OS.macOS) { + return switch (arch) { + Architecture.arm64 => 'mac/adam_mac_arm64.dylib', + Architecture.x64 => 'mac/adam_mac_x64.dylib', + _ => null, + }; + } + + if (os == OS.linux) { + return switch (arch) { + Architecture.x64 => 'linux/adam_linux_x64.so', + Architecture.arm64 => 'linux/adam_linux_arm64.so', + _ => null, + }; + } + + if (os == OS.windows) { + return switch (arch) { + Architecture.x64 => 'windows/adam_windows_x64.dll', + _ => null, + }; + } + + return null; +} diff --git a/packages/flutter/lib/sqlite_adam.dart b/packages/flutter/lib/sqlite_adam.dart new file mode 100644 index 0000000..73d0cb9 --- /dev/null +++ b/packages/flutter/lib/sqlite_adam.dart @@ -0,0 +1,6 @@ +// Copyright (c) 2026 SQLite Cloud, Inc. +// Licensed under the Elastic License 2.0 (see LICENSE). + +library sqlite_adam; + +export 'src/sqlite_adam.dart'; diff --git a/packages/flutter/lib/src/sqlite_adam.dart b/packages/flutter/lib/src/sqlite_adam.dart new file mode 100644 index 0000000..bac653e --- /dev/null +++ b/packages/flutter/lib/src/sqlite_adam.dart @@ -0,0 +1,37 @@ +// Copyright (c) 2026 SQLite Cloud, Inc. +// Licensed under the Elastic License 2.0 (see LICENSE). + +import 'dart:ffi'; + +import 'package:sqlite3/sqlite3.dart'; + +// @Native resolves from the code asset declared in hook/build.dart. +// The asset ID is 'package:sqlite_adam/src/native/sqlite_adam_extension.dart'. +@Native, Pointer, Pointer)>( + assetId: 'package:sqlite_adam/src/native/sqlite_adam_extension.dart', +) +external int sqlite3_adam_init( + Pointer db, + Pointer pzErrMsg, + Pointer pApi, +); + +extension SqliteAdamExtension on Sqlite3 { + /// Loads the adam SQLite extension. + /// + /// Call once at app startup. All subsequently opened databases + /// will have the `adam_*` SQL functions available. + /// + /// Works with both `sqlite3` package and `drift` ORM. + void loadSqliteAdamExtension() { + ensureExtensionLoaded( + SqliteExtension( + Native.addressOf< + NativeFunction< + Int Function(Pointer, Pointer, Pointer)>>( + sqlite3_adam_init, + ).cast(), + ), + ); + } +} diff --git a/packages/flutter/pubspec.yaml b/packages/flutter/pubspec.yaml new file mode 100644 index 0000000..a026fa9 --- /dev/null +++ b/packages/flutter/pubspec.yaml @@ -0,0 +1,22 @@ +name: sqlite_adam +version: 0.7.0 +description: > + Adam is an embeddable AI agent library for SQLite, providing on-device + chat, voice, vision, memory, and tool-calling. It works seamlessly on + iOS, Android, Windows, Linux, and macOS, integrating directly with + your embedded SQLite database. +homepage: https://github.com/sqliteai/adam +repository: https://github.com/sqliteai/adam + +environment: + sdk: ^3.10.0 + +dependencies: + code_assets: ^1.0.0 + hooks: ^1.0.0 + path: ^1.8.0 + sqlite3: ^3.0.0 + +dev_dependencies: + lints: ^5.0.0 + test: ^1.24.0 From a57b57a72193ea309048ce4b484df0c8506db8fa Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Fri, 8 May 2026 18:12:51 +0200 Subject: [PATCH 02/39] feat: update Makefile for relative build paths and add adam.swift --- Makefile | 6 ++++-- Package.swift | 30 ++++++++++++++++++++++++++++++ packages/swift/adam.swift | 15 +++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 Package.swift create mode 100644 packages/swift/adam.swift diff --git a/Makefile b/Makefile index 212a06d..b2df9f1 100644 --- a/Makefile +++ b/Makefile @@ -42,8 +42,10 @@ SQLITE_MEMORY_DIR := $(ADAM_ROOT)modules/sqlite-memory SQLITE_VECTOR_DIR := $(ADAM_ROOT)modules/sqlite-vector # All dependency builds live under build/ at the repo root. -BUILD_DIR := $(ADAM_ROOT)build -DIST_DIR := $(ADAM_ROOT)dist +# Kept relative (not $(ADAM_ROOT)build) so target names like +# `build/llama.cpp.stamp` match what the CI workflow invokes directly. +BUILD_DIR := build +DIST_DIR := dist LLAMA_BUILD := $(BUILD_DIR)/llama.cpp WHISPER_BUILD := $(BUILD_DIR)/whisper.cpp MINIAUDIO_BUILD := $(BUILD_DIR)/miniaudio diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..f03225e --- /dev/null +++ b/Package.swift @@ -0,0 +1,30 @@ +// swift-tools-version: 6.1 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "adam", + platforms: [.macOS(.v11), .iOS(.v14)], + products: [ + .library( + name: "adam", + targets: ["adam"]) + ], + targets: [ + .binaryTarget( + name: "adamBinary", + // The url + checksum below are auto-updated by .github/workflows/main.yml + // on every release (see the "update Package.swift checksum and version" + // step). The placeholder values let `swift package describe` succeed + // before the first release; consumers should pin to a tagged version. + url: "https://github.com/sqliteai/adam/releases/download/0.7.0/adam-apple-xcframework-0.7.0.zip", + checksum: "0000000000000000000000000000000000000000000000000000000000000000" + ), + .target( + name: "adam", + dependencies: ["adamBinary"], + path: "packages/swift" + ), + ] +) diff --git a/packages/swift/adam.swift b/packages/swift/adam.swift new file mode 100644 index 0000000..62f035c --- /dev/null +++ b/packages/swift/adam.swift @@ -0,0 +1,15 @@ +// adam.swift +// Provides the path to the adam SQLite extension for use with sqlite3_load_extension. + +import Foundation + +public struct adam { + /// Returns the absolute path to the adam dylib for use with sqlite3_load_extension. + public static var path: String { + #if os(macOS) + return Bundle.main.bundlePath + "/Contents/Frameworks/adam.framework/adam" + #else + return Bundle.main.bundlePath + "/Frameworks/adam.framework/adam" + #endif + } +} From acd0c811bafd150c4fb384c9e1ea99839222bbf3 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Mon, 11 May 2026 15:34:26 +0200 Subject: [PATCH 03/39] feat: enhance Makefile for platform-specific Objective-C compilation and testing --- Makefile | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b2df9f1..8a3fe87 100644 --- a/Makefile +++ b/Makefile @@ -270,12 +270,17 @@ src/%.o: src/%.c $(SQLITE_OBJ): $(SQLITE_DIR)/sqlite3.c $(CC) -std=c11 -O2 -fPIC $(PLATFORM_CFLAGS) $(SQLITE_FLAGS) -c $< -o $@ -# Objective-C compilation for Apple platform files +# Objective-C compilation for Apple platform files. Gated on PLATFORM — +# otherwise the explicit .m → .o rule overrides the .c pattern rule on Linux, +# making gcc try to invoke cc1obj on adam_tts_system.m even though TTS_SYS_SRC +# is set to adam_tts_system.c there. +ifneq (,$(filter $(PLATFORM),macos ios ios-sim)) src/adam_net_apple.o: src/adam_net_apple.m $(CC) $(CFLAGS) -c $< -o $@ src/adam_tts_system.o: src/adam_tts_system.m $(CC) $(CFLAGS) -c $< -o $@ +endif # sqlite-vector — compiled with -DSQLITE_CORE (no -Wpedantic) $(SQLITE_VECTOR_DIR)/src/%.o: $(SQLITE_VECTOR_DIR)/src/%.c @@ -293,8 +298,25 @@ adam: libadam.a src/main.c # --- Tests --- -test: test_adam +# `test` runs an extension-load smoke test against dist/adam.{dylib,so,dll}. +# Pass SKIP_UNITTEST=1 to skip the test_adam CLI binary (heavy: drags in +# fsanitize, miniaudio twice on strict linkers, needs API keys to actually +# run). CI passes SKIP_UNITTEST=1 on platforms where the binary build +# would conflict (e.g. NDK ld.lld rejecting duplicate miniaudio symbols). +SQLITE3 ?= sqlite3 +SKIP_UNITTEST ?= 0 + +TEST_DEPS := $(DIST_DIR)/$(EXT_FILE) +ifeq ($(SKIP_UNITTEST),0) +TEST_DEPS += test_adam +endif + +test: $(TEST_DEPS) + @echo "Running sqlite3 CLI smoke test (load + adam_version)..." + $(SQLITE3) ":memory:" -cmd ".bail on" ".load ./$(DIST_DIR)/adam" "SELECT adam_version();" +ifeq ($(SKIP_UNITTEST),0) ./test_adam +endif test_adam: libadam.a test/test_adam.c $(CC) $(CFLAGS) -O0 -g -fsanitize=address,undefined \ @@ -431,8 +453,13 @@ $(BUILD_DIR)/miniaudio.stamp: $(BUILD_DIR)/mbedtls.stamp: @mkdir -p $(BUILD_DIR) cd $(MBEDTLS_DIR) && git submodule update --init + @# MBEDTLS_FATAL_WARNINGS=OFF: mbedtls 3.6.5 has a `%d` printf format + @# vs `time_t` mismatch on MinGW that hits -Werror=format. Same upstream + @# code is fine on glibc/macOS where time_t is `long`, so disable globally + @# rather than per-platform. cmake -B $(MBEDTLS_BUILD) -S $(MBEDTLS_DIR) \ -DENABLE_TESTING=OFF -DENABLE_PROGRAMS=OFF \ + -DMBEDTLS_FATAL_WARNINGS=OFF \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ $(PLATFORM_OPTS) cmake --build $(MBEDTLS_BUILD) --config Release -j$(CPUS) From 9f095614760cdd7d3032f13aa6529fc66d5012a3 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Mon, 11 May 2026 15:51:13 +0200 Subject: [PATCH 04/39] feat: add additional compiler flags for sqlite-memory module --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 8a3fe87..040f1ae 100644 --- a/Makefile +++ b/Makefile @@ -238,6 +238,7 @@ SQLITE_MEMORY_OBJS := $(patsubst $(SQLITE_MEMORY_DIR)/src/%.c,$(SQLITE_MEMORY_DI # sqlite-memory common flags DBMEM_CFLAGS := -std=c11 -O2 -DSQLITE_CORE -DDBMEM_OMIT_REMOTE_ENGINE \ + -D_POSIX_C_SOURCE=200809L -D_GNU_SOURCE \ -I$(SQLITE_MEMORY_DIR)/src -I$(SQLITE_VECTOR_DIR)/src \ -I$(SQLITE_VECTOR_DIR)/libs -I$(SQLITE_DIR) \ -I$(LLAMA_DIR)/include -I$(LLAMA_DIR)/ggml/include From 2cd4f7083d14ad389eea2308792f58541c6511f7 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Mon, 11 May 2026 15:59:11 +0200 Subject: [PATCH 05/39] fix: update Android ARCH error messages to remove armeabi-v7a option --- .github/workflows/main.yml | 12 +++++++----- Makefile | 6 ++---- extensions/sqlite/Makefile | 4 +--- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 42cae81..b0149d7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -104,8 +104,14 @@ jobs: needs: download-models runs-on: ${{ matrix.os }} container: ${{ matrix.container && matrix.container || '' }} - name: ${{ matrix.name }}${{ matrix.arch && format('-{0}', matrix.arch) || '' }} build${{ matrix.arch != 'arm64-v8a' && matrix.arch != 'armeabi-v7a' && matrix.name != 'ios-sim' && matrix.name != 'ios' && matrix.name != 'apple-xcframework' && matrix.name != 'android-aar' && ( matrix.name != 'macos' || matrix.arch != 'x86_64' ) && ' + test' || ''}} + name: ${{ matrix.name }}${{ matrix.arch && format('-{0}', matrix.arch) || '' }} build${{ matrix.arch != 'arm64-v8a' && matrix.name != 'ios-sim' && matrix.name != 'ios' && matrix.name != 'apple-xcframework' && matrix.name != 'android-aar' && ( matrix.name != 'macos' || matrix.arch != 'x86_64' ) && ' + test' || ''}} timeout-minutes: 120 + env: + # Skip the test_adam CLI binary build everywhere in CI — both libadam.a + # and libmtmd.a embed miniaudio (mtmd-helper.cpp pulls it in too), and + # strict linkers (NDK ld.lld, GNU ld) refuse the duplicate symbol. + # Local `make test` still builds it by default. + SKIP_UNITTEST: 1 strategy: fail-fast: false matrix: @@ -163,10 +169,6 @@ jobs: arch: arm64-v8a name: android make: SKIP_UNITTEST=1 PLATFORM=android ARCH=arm64-v8a - - os: ubuntu-22.04 - arch: armeabi-v7a - name: android - make: SKIP_UNITTEST=1 PLATFORM=android ARCH=armeabi-v7a - os: macos-15 name: ios make: PLATFORM=ios LLAMA="-DGGML_NATIVE=OFF -DGGML_METAL=ON -DGGML_ACCELERATE=ON -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=Apple" WHISPER="-DWHISPER_COREML=ON -DWHISPER_COREML_ALLOW_FALLBACK=ON" diff --git a/Makefile b/Makefile index 040f1ae..febd538 100644 --- a/Makefile +++ b/Makefile @@ -152,7 +152,7 @@ ifneq (,$(filter $(PLATFORM),macos ios ios-sim)) else ifeq ($(PLATFORM),android) # Android: cross-compile via NDK, use libcurl + mbedtls. ifndef ARCH - $(error Android ARCH must be set to ARCH=x86_64, ARCH=arm64-v8a, or ARCH=armeabi-v7a) + $(error Android ARCH must be set to ARCH=x86_64 or ARCH=arm64-v8a) endif ifndef ANDROID_NDK $(error ANDROID_NDK must point to the Android NDK install) @@ -160,8 +160,6 @@ else ifeq ($(PLATFORM),android) ANDROID_NDK_BIN := $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST)-x86_64/bin ifneq (,$(filter $(ARCH),arm64 arm64-v8a)) NDK_TRIPLE := aarch64-linux-android26 - else ifeq ($(ARCH),armeabi-v7a) - NDK_TRIPLE := armv7a-linux-androideabi26 else NDK_TRIPLE := $(ARCH)-linux-android26 endif @@ -402,7 +400,7 @@ else ifeq ($(PLATFORM),ios-sim) PLATFORM_OPTS := -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" else ifeq ($(PLATFORM),android) ifndef ARCH - $(error Android ARCH must be set to ARCH=x86_64, ARCH=arm64-v8a, or ARCH=armeabi-v7a) + $(error Android ARCH must be set to ARCH=x86_64 or ARCH=arm64-v8a) endif ifndef ANDROID_NDK $(error ANDROID_NDK must point to the Android NDK install) diff --git a/extensions/sqlite/Makefile b/extensions/sqlite/Makefile index a83d89a..6f6f73d 100644 --- a/extensions/sqlite/Makefile +++ b/extensions/sqlite/Makefile @@ -26,7 +26,7 @@ CC ?= cc ifeq ($(PLATFORM),android) ifndef ARCH - $(error Android ARCH must be set to ARCH=x86_64, ARCH=arm64-v8a, or ARCH=armeabi-v7a) + $(error Android ARCH must be set to ARCH=x86_64 or ARCH=arm64-v8a) endif ifndef ANDROID_NDK $(error ANDROID_NDK must point to the Android NDK install) @@ -34,8 +34,6 @@ ifeq ($(PLATFORM),android) ANDROID_NDK_BIN := $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST)-x86_64/bin ifneq (,$(filter $(ARCH),arm64 arm64-v8a)) NDK_TRIPLE := aarch64-linux-android26 - else ifeq ($(ARCH),armeabi-v7a) - NDK_TRIPLE := armv7a-linux-androideabi26 else NDK_TRIPLE := $(ARCH)-linux-android26 endif From 0494266609a09d7b7af0df8e35fd9f5a3be31598 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Mon, 11 May 2026 16:04:03 +0200 Subject: [PATCH 06/39] feat: update Makefile for Android to use C++ driver and static libc++ linking --- Makefile | 2 +- extensions/sqlite/Makefile | 13 ++++++++++--- src/adam_audio.c | 6 ++++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index febd538..591f704 100644 --- a/Makefile +++ b/Makefile @@ -236,7 +236,7 @@ SQLITE_MEMORY_OBJS := $(patsubst $(SQLITE_MEMORY_DIR)/src/%.c,$(SQLITE_MEMORY_DI # sqlite-memory common flags DBMEM_CFLAGS := -std=c11 -O2 -DSQLITE_CORE -DDBMEM_OMIT_REMOTE_ENGINE \ - -D_POSIX_C_SOURCE=200809L -D_GNU_SOURCE \ + -D_POSIX_C_SOURCE=200809L -D_GNU_SOURCE -D_DARWIN_C_SOURCE=1 \ -I$(SQLITE_MEMORY_DIR)/src -I$(SQLITE_VECTOR_DIR)/src \ -I$(SQLITE_VECTOR_DIR)/libs -I$(SQLITE_DIR) \ -I$(LLAMA_DIR)/include -I$(LLAMA_DIR)/ggml/include diff --git a/extensions/sqlite/Makefile b/extensions/sqlite/Makefile index 6f6f73d..722273e 100644 --- a/extensions/sqlite/Makefile +++ b/extensions/sqlite/Makefile @@ -37,7 +37,12 @@ ifeq ($(PLATFORM),android) else NDK_TRIPLE := $(ARCH)-linux-android26 endif - CC := $(ANDROID_NDK_BIN)/$(NDK_TRIPLE)-clang + # Use the C++ driver for the final link so the libc++ runtime gets + # pulled in. libllama / libmtmd contain C++ code referencing typeinfo + # symbols (e.g. _ZTISt13runtime_error); without the C++ driver + + # -static-libstdc++, dlopen fails at load with "cannot locate symbol". + # clang++ still compiles .c sources as C based on extension. + CC := $(ANDROID_NDK_BIN)/$(NDK_TRIPLE)-clang++ endif # ---------------------------------------------------------------------------- @@ -154,8 +159,10 @@ else ifeq ($(PLATFORM),windows) LIBS += $(MBEDTLS_BUILD)/library/libmbedcrypto.a else ifeq ($(PLATFORM),android) EXT := so - # -static-libstdc++ has no effect with NDK clang in this link config; omitted. - LDFLAGS += -shared -ldl -lm -Wl,-z,max-page-size=16384 + # -static-libstdc++ now takes effect because the final link uses clang++ + # (see PLATFORM=android block above); it bundles libc++_static into + # adam.so so it loads on devices without the NDK shared C++ runtime. + LDFLAGS += -shared -static-libstdc++ -ldl -lm -Wl,-z,max-page-size=16384 CFLAGS += -I$(ADAM_ROOT)/modules/curl/include -I$(ADAM_ROOT)/modules/mbedtls/include LIBS := $(WHISPER_LIBS) $(LLAMA_LIBS) LIBS += $(CURL_BUILD)/lib/libcurl.a diff --git a/src/adam_audio.c b/src/adam_audio.c index 6cfa997..96d4b13 100644 --- a/src/adam_audio.c +++ b/src/adam_audio.c @@ -26,6 +26,12 @@ #include #include #include +#ifdef _WIN32 + #include + #define getpid _getpid +#else + #include +#endif // ============================================================================ // MARK: - Audio Playback From 8e94871a23cc8aacd605ed5af63a1c78bc7e5c9e Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Mon, 11 May 2026 16:17:10 +0200 Subject: [PATCH 07/39] feat: update Makefile for SQLite extension to use C++ driver and add feature-test macros --- Makefile | 2 +- extensions/sqlite/Makefile | 41 +++++++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 591f704..56f6677 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ CURL_BUILD := $(BUILD_DIR)/curl SQLITE_DIR := $(ADAM_ROOT)modules/sqlite -CFLAGS := -std=c11 -D_POSIX_C_SOURCE=200809L -Wall -Wextra -Wpedantic -O2 -fPIC +CFLAGS := -std=c11 -D_POSIX_C_SOURCE=200809L -D_GNU_SOURCE -Wall -Wextra -Wpedantic -O2 -fPIC CFLAGS += -Isrc -I$(MINIAUDIO_DIR) -I$(SQLITE_DIR) CFLAGS += -I$(LLAMA_DIR)/include -I$(LLAMA_DIR)/ggml/include -I$(LLAMA_DIR)/tools/mtmd CFLAGS += -I$(WHISPER_DIR)/include diff --git a/extensions/sqlite/Makefile b/extensions/sqlite/Makefile index 722273e..f68bb7b 100644 --- a/extensions/sqlite/Makefile +++ b/extensions/sqlite/Makefile @@ -37,18 +37,26 @@ ifeq ($(PLATFORM),android) else NDK_TRIPLE := $(ARCH)-linux-android26 endif - # Use the C++ driver for the final link so the libc++ runtime gets - # pulled in. libllama / libmtmd contain C++ code referencing typeinfo - # symbols (e.g. _ZTISt13runtime_error); without the C++ driver + - # -static-libstdc++, dlopen fails at load with "cannot locate symbol". - # clang++ still compiles .c sources as C based on extension. - CC := $(ANDROID_NDK_BIN)/$(NDK_TRIPLE)-clang++ + CC := $(ANDROID_NDK_BIN)/$(NDK_TRIPLE)-clang + # The final link uses the C++ driver so the libc++ runtime gets pulled + # in. libllama / libmtmd embed C++ types whose typeinfo symbols (e.g. + # _ZTISt13runtime_error) would otherwise be missing — dlopen would fail + # at load with "cannot locate symbol". $(LD) is only used at link time + # so -std=c11 in the per-source compile rules doesn't clash with C++. + LD := $(ANDROID_NDK_BIN)/$(NDK_TRIPLE)-clang++ +else + LD := $(CC) endif # ---------------------------------------------------------------------------- # Common flags # ---------------------------------------------------------------------------- +# Feature-test macros: keep BSD/GNU/POSIX extensions visible on every libc. +# glibc strict-C11 hides strdup / strcasecmp / clock_gettime; Apple needs +# _DARWIN_C_SOURCE; MinGW needs _GNU_SOURCE for strndup. Defining all three +# is safe — each platform only honors the ones it knows about. CFLAGS := -std=c11 -Wall -Wextra -O2 -fPIC +CFLAGS += -D_POSIX_C_SOURCE=200809L -D_GNU_SOURCE -D_DARWIN_C_SOURCE=1 CFLAGS += -I$(ADAM_ROOT)/src CFLAGS += -I$(ADAM_ROOT)/modules/sqlite CFLAGS += -I$(ADAM_ROOT)/modules/miniaudio @@ -185,12 +193,20 @@ endif all: adam.$(EXT) -adam.$(EXT): $(SQLITE_SRCS) $(SHARED_SRCS) $(ADAM_LIB) - @# `-x none` resets the language after the source files so subsequent - @# .a files aren't reinterpreted as source (e.g. when CFLAGS includes - @# `-x objective-c` for iOS). - $(CC) $(CFLAGS) $(LDFLAGS) $(SQLITE_SRCS) $(SHARED_SRCS) \ - -x none $(ADAM_LIB) $(LIBS) -o $@ +SQLITE_OBJS := $(SQLITE_SRCS:.c=.o) +SHARED_OBJS := $(SHARED_SRCS:.c=.o) + +# Compile rules — use $(CC) (the C driver) with -std=c11. +$(SQLITE_OBJS): %.o: %.c + $(CC) $(CFLAGS) -c $< -o $@ + +$(SHARED_OBJS): %.o: %.c + $(CC) $(CFLAGS) -c $< -o $@ + +# Link rule — use $(LD), which is $(CC) everywhere except Android where it +# is clang++ so that -static-libstdc++ pulls in libc++_static. +adam.$(EXT): $(SQLITE_OBJS) $(SHARED_OBJS) $(ADAM_LIB) + $(LD) $(LDFLAGS) $(SQLITE_OBJS) $(SHARED_OBJS) $(ADAM_LIB) $(LIBS) -o $@ test: adam.$(EXT) @echo "Testing adam SQLite extension..." @@ -203,3 +219,4 @@ test: adam.$(EXT) clean: rm -f adam.dylib adam.so adam.dll adam.lib adam.def + rm -f $(SQLITE_OBJS) $(SHARED_OBJS) From 83ffacca62a4beae720da8553b29ee8b22387bd0 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Wed, 13 May 2026 14:21:00 +0200 Subject: [PATCH 08/39] feat: update CFLAGS in Makefiles to use gnu11 standard for compatibility --- Makefile | 22 +++++++++++++++------- extensions/sqlite/Makefile | 2 +- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 56f6677..299d5b7 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ CURL_BUILD := $(BUILD_DIR)/curl SQLITE_DIR := $(ADAM_ROOT)modules/sqlite -CFLAGS := -std=c11 -D_POSIX_C_SOURCE=200809L -D_GNU_SOURCE -Wall -Wextra -Wpedantic -O2 -fPIC +CFLAGS := -std=gnu11 -D_POSIX_C_SOURCE=200809L -D_GNU_SOURCE -Wall -Wextra -Wpedantic -O2 -fPIC CFLAGS += -Isrc -I$(MINIAUDIO_DIR) -I$(SQLITE_DIR) CFLAGS += -I$(LLAMA_DIR)/include -I$(LLAMA_DIR)/ggml/include -I$(LLAMA_DIR)/tools/mtmd CFLAGS += -I$(WHISPER_DIR)/include @@ -235,7 +235,7 @@ SQLITE_MEMORY_SRCS := $(SQLITE_MEMORY_DIR)/src/sqlite-memory.c \ SQLITE_MEMORY_OBJS := $(patsubst $(SQLITE_MEMORY_DIR)/src/%.c,$(SQLITE_MEMORY_DIR)/src/%.o,$(SQLITE_MEMORY_SRCS)) # sqlite-memory common flags -DBMEM_CFLAGS := -std=c11 -O2 -DSQLITE_CORE -DDBMEM_OMIT_REMOTE_ENGINE \ +DBMEM_CFLAGS := -std=gnu11 -O2 -DSQLITE_CORE -DDBMEM_OMIT_REMOTE_ENGINE \ -D_POSIX_C_SOURCE=200809L -D_GNU_SOURCE -D_DARWIN_C_SOURCE=1 \ -I$(SQLITE_MEMORY_DIR)/src -I$(SQLITE_VECTOR_DIR)/src \ -I$(SQLITE_VECTOR_DIR)/libs -I$(SQLITE_DIR) \ @@ -267,7 +267,7 @@ src/%.o: src/%.c # SQLite amalgamation — compiled with its own flags (no -Wpedantic, etc.) $(SQLITE_OBJ): $(SQLITE_DIR)/sqlite3.c - $(CC) -std=c11 -O2 -fPIC $(PLATFORM_CFLAGS) $(SQLITE_FLAGS) -c $< -o $@ + $(CC) -std=gnu11 -O2 -fPIC $(PLATFORM_CFLAGS) $(SQLITE_FLAGS) -c $< -o $@ # Objective-C compilation for Apple platform files. Gated on PLATFORM — # otherwise the explicit .m → .o rule overrides the .c pattern rule on Linux, @@ -283,7 +283,7 @@ endif # sqlite-vector — compiled with -DSQLITE_CORE (no -Wpedantic) $(SQLITE_VECTOR_DIR)/src/%.o: $(SQLITE_VECTOR_DIR)/src/%.c - $(CC) -std=c11 -O3 -fPIC $(PLATFORM_CFLAGS) -DSQLITE_CORE -I$(SQLITE_VECTOR_DIR)/src -I$(SQLITE_VECTOR_DIR)/libs -I$(SQLITE_DIR) -c $< -o $@ + $(CC) -std=gnu11 -O3 -fPIC $(PLATFORM_CFLAGS) -DSQLITE_CORE -I$(SQLITE_VECTOR_DIR)/src -I$(SQLITE_VECTOR_DIR)/libs -I$(SQLITE_DIR) -c $< -o $@ # sqlite-memory — compiled with -DSQLITE_CORE (no -Wpedantic) $(SQLITE_MEMORY_DIR)/src/%.o: $(SQLITE_MEMORY_DIR)/src/%.c @@ -422,10 +422,16 @@ endif # Stamp targets: cacheable in CI and idempotent for local dev. $(BUILD_DIR)/llama.cpp.stamp: @mkdir -p $(BUILD_DIR) + @# -DCMAKE_POSITION_INDEPENDENT_CODE=ON: the resulting .a archives are + @# linked into the shared extension (dist/adam.{dylib,so,dll}), so every + @# object must be PIC. GNU ld on Linux/Windows rejects non-PIC TLS + @# relocations; macOS arm64 is implicitly PIC; Android's PLATFORM_OPTS + @# already includes this — but pass it unconditionally to be safe. cmake -B $(LLAMA_BUILD) -S $(LLAMA_DIR) \ -DBUILD_SHARED_LIBS=OFF -DLLAMA_BUILD_TESTS=OFF \ -DLLAMA_BUILD_EXAMPLES=OFF -DLLAMA_BUILD_SERVER=OFF \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC \ $(PLATFORM_OPTS) $(LLAMA) cmake --build $(LLAMA_BUILD) --config Release -j$(CPUS) --target llama --target ggml --target mtmd touch $@ @@ -438,7 +444,8 @@ $(BUILD_DIR)/whisper.cpp.stamp: $(BUILD_DIR)/llama.cpp.stamp cmake -B $(WHISPER_BUILD) -S $(WHISPER_DIR) \ -DBUILD_SHARED_LIBS=OFF -DWHISPER_BUILD_TESTS=OFF \ -DWHISPER_BUILD_EXAMPLES=OFF \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC \ $(PLATFORM_OPTS) $(LLAMA) $(WHISPER) cmake --build $(WHISPER_BUILD) --config Release -j$(CPUS) --target whisper touch $@ @@ -471,7 +478,8 @@ $(BUILD_DIR)/curl.stamp: $(BUILD_DIR)/mbedtls.stamp -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DUSE_NGHTTP2=OFF \ -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF \ -DBUILD_SHARED_LIBS=OFF -DBUILD_CURL_EXE=OFF -DBUILD_TESTING=OFF \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC \ -DMBEDTLS_INCLUDE_DIR=$(MBEDTLS_DIR)/include \ -DMBEDTLS_LIBRARY=$(MBEDTLS_BUILD)/library/libmbedtls.a \ -DMBEDX509_LIBRARY=$(MBEDTLS_BUILD)/library/libmbedx509.a \ diff --git a/extensions/sqlite/Makefile b/extensions/sqlite/Makefile index f68bb7b..98000e2 100644 --- a/extensions/sqlite/Makefile +++ b/extensions/sqlite/Makefile @@ -55,7 +55,7 @@ endif # glibc strict-C11 hides strdup / strcasecmp / clock_gettime; Apple needs # _DARWIN_C_SOURCE; MinGW needs _GNU_SOURCE for strndup. Defining all three # is safe — each platform only honors the ones it knows about. -CFLAGS := -std=c11 -Wall -Wextra -O2 -fPIC +CFLAGS := -std=gnu11 -Wall -Wextra -O2 -fPIC CFLAGS += -D_POSIX_C_SOURCE=200809L -D_GNU_SOURCE -D_DARWIN_C_SOURCE=1 CFLAGS += -I$(ADAM_ROOT)/src CFLAGS += -I$(ADAM_ROOT)/modules/sqlite From 71d6661b127d712e57463cff6b0152db167c752d Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Wed, 13 May 2026 15:25:05 +0200 Subject: [PATCH 09/39] feat: implement portable strndup function for compatibility across platforms --- extensions/sqlite/Makefile | 14 ++++++++------ src/adam_session.c | 21 +++++++++++++++++++-- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/extensions/sqlite/Makefile b/extensions/sqlite/Makefile index 98000e2..e5a6c7b 100644 --- a/extensions/sqlite/Makefile +++ b/extensions/sqlite/Makefile @@ -38,14 +38,16 @@ ifeq ($(PLATFORM),android) NDK_TRIPLE := $(ARCH)-linux-android26 endif CC := $(ANDROID_NDK_BIN)/$(NDK_TRIPLE)-clang - # The final link uses the C++ driver so the libc++ runtime gets pulled - # in. libllama / libmtmd embed C++ types whose typeinfo symbols (e.g. - # _ZTISt13runtime_error) would otherwise be missing — dlopen would fail - # at load with "cannot locate symbol". $(LD) is only used at link time - # so -std=c11 in the per-source compile rules doesn't clash with C++. LD := $(ANDROID_NDK_BIN)/$(NDK_TRIPLE)-clang++ else - LD := $(CC) + # Use the C++ driver for the final link on every platform. libllama / + # libmtmd / libwhisper are C++ archives that reference typeinfo symbols + # like _ZTVN10__cxxabiv117__class_type_infoE. With the C driver and GNU + # ld's --as-needed default, the -lstdc++ in LDFLAGS gets dropped (it + # appears before the objects), and dlopen fails at load. macOS' linker + # is permissive enough that `cc` happened to work there, but we make it + # consistent. `c++` resolves to clang++ on Apple, g++ on Linux/MinGW. + LD := c++ endif # ---------------------------------------------------------------------------- diff --git a/src/adam_session.c b/src/adam_session.c index 9586c2d..6b6a19e 100644 --- a/src/adam_session.c +++ b/src/adam_session.c @@ -18,6 +18,23 @@ #include #include +// Portable strndup. POSIX 2008 (glibc / musl / Apple / Android bionic / +// MinGW-UCRT) all expose strndup, so we alias straight to the system call. +// Only MSVCRT-based MinGW (msys2 `mingw64` toolchain, what GitHub Actions +// uses by default) doesn't ship strndup at all — fall back there. +#if defined(__MINGW32__) && !defined(_UCRT) +static inline char *adam_strndup(const char *s, size_t n) { + char *p = (char *)malloc(n + 1); + if (!p) return NULL; + size_t i; + for (i = 0; i < n && s[i]; i++) p[i] = s[i]; + p[i] = '\0'; + return p; +} +#else +#define adam_strndup strndup +#endif + // Internal: get the sqlite3* handle from adam_memory_t (defined in adam_memory.c) extern sqlite3 *adam_memory_db(adam_memory_t *mem); @@ -127,7 +144,7 @@ static void deserialize_tool_calls(const char *json, if (id_key && id_key < obj_end) { const char *v = strchr(id_key + 5, '"'); if (v) { v++; const char *e = strchr(v, '"'); - if (e) { calls[idx].id = strndup(v, (size_t)(e - v)); } + if (e) { calls[idx].id = adam_strndup(v, (size_t)(e - v)); } } } @@ -136,7 +153,7 @@ static void deserialize_tool_calls(const char *json, if (name_key && name_key < obj_end) { const char *v = strchr(name_key + 7, '"'); if (v) { v++; const char *e = strchr(v, '"'); - if (e) { calls[idx].name = strndup(v, (size_t)(e - v)); } + if (e) { calls[idx].name = adam_strndup(v, (size_t)(e - v)); } } } From bb34c1132da19d77854beb9599ad7b98cb782988 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Wed, 13 May 2026 15:46:55 +0200 Subject: [PATCH 10/39] feat: add portable memmem implementation for MinGW compatibility --- Makefile | 2 ++ src/adam_local.c | 26 ++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 299d5b7..f726f6a 100644 --- a/Makefile +++ b/Makefile @@ -432,6 +432,7 @@ $(BUILD_DIR)/llama.cpp.stamp: -DLLAMA_BUILD_EXAMPLES=OFF -DLLAMA_BUILD_SERVER=OFF \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC \ + -DGGML_OPENMP=OFF \ $(PLATFORM_OPTS) $(LLAMA) cmake --build $(LLAMA_BUILD) --config Release -j$(CPUS) --target llama --target ggml --target mtmd touch $@ @@ -446,6 +447,7 @@ $(BUILD_DIR)/whisper.cpp.stamp: $(BUILD_DIR)/llama.cpp.stamp -DWHISPER_BUILD_EXAMPLES=OFF \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC \ + -DGGML_OPENMP=OFF \ $(PLATFORM_OPTS) $(LLAMA) $(WHISPER) cmake --build $(WHISPER_BUILD) --config Release -j$(CPUS) --target whisper touch $@ diff --git a/src/adam_local.c b/src/adam_local.c index 927b694..7c9e04f 100644 --- a/src/adam_local.c +++ b/src/adam_local.c @@ -28,6 +28,28 @@ #include #endif +// Portable memmem. memmem is a GNU/BSD extension that glibc / musl / Apple +// / Android bionic / MinGW-UCRT expose, but MSVCRT-based MinGW (msys2's +// default `mingw64` toolchain) doesn't ship it at all. Fall back there. +#if defined(__MINGW32__) && !defined(_UCRT) +static void *adam_memmem(const void *haystack, size_t haystacklen, + const void *needle, size_t needlelen) { + if (needlelen == 0) return (void *)haystack; + if (haystacklen < needlelen) return NULL; + const unsigned char *h = (const unsigned char *)haystack; + const unsigned char *n = (const unsigned char *)needle; + size_t last = haystacklen - needlelen; + for (size_t i = 0; i <= last; i++) { + if (h[i] == n[0] && memcmp(h + i, n, needlelen) == 0) { + return (void *)(h + i); + } + } + return NULL; +} +#else +#define adam_memmem memmem +#endif + // ============================================================================ // MARK: - Helpers // ============================================================================ @@ -383,8 +405,8 @@ static size_t parse_local_tool_calls(arena_t *arena, const char *text, // Find "name" and "arguments" manually (avoid jsmn dependency) const char *name_key = "\"name\""; const char *args_key = "\"arguments\""; - const char *nk = memmem(json_start, json_len, name_key, 6); - const char *ak = memmem(json_start, json_len, args_key, 11); + const char *nk = adam_memmem(json_start, json_len, name_key, 6); + const char *ak = adam_memmem(json_start, json_len, args_key, 11); if (nk && tc_idx < count) { // Extract name: find the string value after "name": From 595feaaf8f3a725a83c340261a4bfbb8d4ac708b Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Wed, 13 May 2026 16:17:19 +0200 Subject: [PATCH 11/39] feat: update Vulkan installation process and improve Makefile for static library prefix --- .github/workflows/main.yml | 20 +++++++------------- Makefile | 2 ++ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b0149d7..dcc8429 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -297,19 +297,13 @@ jobs: - name: linux-x86_64 install vulkan if: matrix.name == 'linux-gpu' && matrix.arch == 'x86_64' run: | - wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - - sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-jammy.list https://packages.lunarg.com/vulkan/lunarg-vulkan-jammy.list + # libvulkan-dev: loader + headers (cmake's FindVulkan picks them + # up from /usr/lib + /usr/include). shaderc: provides glslc which + # ggml-vulkan uses to compile shaders at build time. The previous + # LunarG SDK download approach broke because the tarball stopped + # shipping the libvulkan.so symlink cmake looks for. sudo apt-get update -y - sudo apt-get install -y mesa-vulkan-drivers - # Vulkan is no longer packed for Ubuntu - wget https://sdk.lunarg.com/sdk/download/latest/linux/vulkan-sdk.tar.xz?Human=true -O vulkan-sdk.tar.xz - tar -xf vulkan-sdk.tar.xz - cd $(ls -d 1.* | head -n1) - source setup-env.sh - echo "VULKAN_SDK=$VULKAN_SDK" >> $GITHUB_ENV - echo "PATH=$PATH" >> $GITHUB_ENV - echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV - echo "VK_ADD_LAYER_PATH=$VK_ADD_LAYER_PATH" >> $GITHUB_ENV + sudo apt-get install -y mesa-vulkan-drivers libvulkan-dev shaderc - name: linux-arm64 install vulkan if: matrix.name == 'linux-gpu' && matrix.arch == 'arm64' @@ -325,7 +319,7 @@ jobs: EOF sudo apt-get update || true ;# Prevent failure due to missing URLs. - sudo apt-get install -y --no-install-recommends build-essential glslc crossbuild-essential-arm64 libvulkan-dev:arm64 + sudo apt-get install -y --no-install-recommends build-essential shaderc crossbuild-essential-arm64 libvulkan-dev:arm64 - name: cache llama.cpp build id: cache-llama diff --git a/Makefile b/Makefile index f726f6a..d8946e0 100644 --- a/Makefile +++ b/Makefile @@ -431,6 +431,7 @@ $(BUILD_DIR)/llama.cpp.stamp: -DBUILD_SHARED_LIBS=OFF -DLLAMA_BUILD_TESTS=OFF \ -DLLAMA_BUILD_EXAMPLES=OFF -DLLAMA_BUILD_SERVER=OFF \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DCMAKE_STATIC_LIBRARY_PREFIX=lib \ -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC \ -DGGML_OPENMP=OFF \ $(PLATFORM_OPTS) $(LLAMA) @@ -446,6 +447,7 @@ $(BUILD_DIR)/whisper.cpp.stamp: $(BUILD_DIR)/llama.cpp.stamp -DBUILD_SHARED_LIBS=OFF -DWHISPER_BUILD_TESTS=OFF \ -DWHISPER_BUILD_EXAMPLES=OFF \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DCMAKE_STATIC_LIBRARY_PREFIX=lib \ -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC \ -DGGML_OPENMP=OFF \ $(PLATFORM_OPTS) $(LLAMA) $(WHISPER) From 4fc477dc9c1355b3eabda1ed32a466af18705625 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Wed, 13 May 2026 16:34:51 +0200 Subject: [PATCH 12/39] feat: enhance Vulkan installation in CI and improve Makefile for dynamic library handling --- .github/workflows/main.yml | 19 +++++++++++++------ extensions/sqlite/Makefile | 14 ++++++++++---- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dcc8429..62c62c6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -297,13 +297,20 @@ jobs: - name: linux-x86_64 install vulkan if: matrix.name == 'linux-gpu' && matrix.arch == 'x86_64' run: | - # libvulkan-dev: loader + headers (cmake's FindVulkan picks them - # up from /usr/lib + /usr/include). shaderc: provides glslc which - # ggml-vulkan uses to compile shaders at build time. The previous - # LunarG SDK download approach broke because the tarball stopped - # shipping the libvulkan.so symlink cmake looks for. + # libvulkan-dev from apt: provides the loader (libvulkan.so) + + # headers; cmake's FindVulkan picks them up from /usr/lib + + # /usr/include. ggml-vulkan does + # `find_package(Vulkan COMPONENTS glslc REQUIRED)` so it needs + # the glslc binary too — but `shaderc` isn't packaged on jammy + # (only on noble/24.04+). Grab just the glslc binary from the + # LunarG SDK tarball and drop it into /usr/local/bin. sudo apt-get update -y - sudo apt-get install -y mesa-vulkan-drivers libvulkan-dev shaderc + sudo apt-get install -y mesa-vulkan-drivers libvulkan-dev + wget -q https://sdk.lunarg.com/sdk/download/latest/linux/vulkan-sdk.tar.xz -O /tmp/vulkan-sdk.tar.xz + mkdir /tmp/vulkan-sdk && tar -xf /tmp/vulkan-sdk.tar.xz -C /tmp/vulkan-sdk + SDK_DIR=$(ls -d /tmp/vulkan-sdk/1.* | head -n1) + sudo install -m 755 "$SDK_DIR/x86_64/bin/glslc" /usr/local/bin/glslc + rm -rf /tmp/vulkan-sdk /tmp/vulkan-sdk.tar.xz - name: linux-arm64 install vulkan if: matrix.name == 'linux-gpu' && matrix.arch == 'arm64' diff --git a/extensions/sqlite/Makefile b/extensions/sqlite/Makefile index e5a6c7b..88ef082 100644 --- a/extensions/sqlite/Makefile +++ b/extensions/sqlite/Makefile @@ -84,11 +84,16 @@ WHISPER_BUILD := $(ADAM_ROOT)/build/whisper.cpp MBEDTLS_BUILD := $(ADAM_ROOT)/build/mbedtls CURL_BUILD := $(ADAM_ROOT)/build/curl +# ggml's CMakeLists sets VERSION/SOVERSION on its static targets, which +# on Windows MinGW + Ninja causes cmake to drop the `lib` prefix even +# with -DCMAKE_STATIC_LIBRARY_PREFIX=lib in the cache. Resolve each lib +# via $(wildcard …) so we pick up whichever name was produced. +ggml_lib = $(firstword $(wildcard $(LLAMA_BUILD)/ggml/src/lib$(1).a $(LLAMA_BUILD)/ggml/src/$(1).a)) LLAMA_LIBS := $(LLAMA_BUILD)/tools/mtmd/libmtmd.a \ $(LLAMA_BUILD)/src/libllama.a \ - $(LLAMA_BUILD)/ggml/src/libggml.a \ - $(LLAMA_BUILD)/ggml/src/libggml-cpu.a \ - $(LLAMA_BUILD)/ggml/src/libggml-base.a + $(call ggml_lib,ggml) \ + $(call ggml_lib,ggml-cpu) \ + $(call ggml_lib,ggml-base) WHISPER_LIBS := $(WHISPER_BUILD)/src/libwhisper.a # Pick up CoreML stub when whisper was built with -DWHISPER_COREML=ON. @@ -101,7 +106,8 @@ ifneq ($(WHISPER_COREML_LIB),) endif # Pick up ggml-blas if llama.cpp was configured with -DGGML_BLAS=ON. -GGML_BLAS_LIB := $(wildcard $(LLAMA_BUILD)/ggml/src/ggml-blas/libggml-blas.a) +# Check both naming conventions (lib prefix may be stripped on Windows MinGW). +GGML_BLAS_LIB := $(firstword $(wildcard $(LLAMA_BUILD)/ggml/src/ggml-blas/libggml-blas.a $(LLAMA_BUILD)/ggml/src/ggml-blas/ggml-blas.a)) ifneq ($(GGML_BLAS_LIB),) LLAMA_LIBS += $(GGML_BLAS_LIB) endif From cb101aa3f57b666539b46359d82719a016c4146f Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Wed, 13 May 2026 17:05:43 +0200 Subject: [PATCH 13/39] feat: update Vulkan installation in CI and enhance Makefile for static library linking --- .github/workflows/main.yml | 21 ++++++++++++--------- Makefile | 7 +++++-- extensions/sqlite/Makefile | 11 +++++++++-- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 62c62c6..dccab3a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -297,20 +297,23 @@ jobs: - name: linux-x86_64 install vulkan if: matrix.name == 'linux-gpu' && matrix.arch == 'x86_64' run: | - # libvulkan-dev from apt: provides the loader (libvulkan.so) + - # headers; cmake's FindVulkan picks them up from /usr/lib + - # /usr/include. ggml-vulkan does - # `find_package(Vulkan COMPONENTS glslc REQUIRED)` so it needs - # the glslc binary too — but `shaderc` isn't packaged on jammy - # (only on noble/24.04+). Grab just the glslc binary from the - # LunarG SDK tarball and drop it into /usr/local/bin. + # ggml-vulkan.cpp uses Vulkan symbols (PipelineRobustnessCreateInfoEXT, + # CooperativeMatrixFeaturesKHR, LayerSettingEXT, eMesaDozen, …) + # introduced in 1.4+. jammy's libvulkan-dev ships 1.3.204, too old. + # Install the LunarG SDK fully (headers + loader + glslc) under + # /opt/vulkan-sdk and create the libvulkan.so symlink the tarball + # forgot, so cmake's FindVulkan resolves cleanly via VULKAN_SDK. sudo apt-get update -y - sudo apt-get install -y mesa-vulkan-drivers libvulkan-dev + sudo apt-get install -y mesa-vulkan-drivers wget -q https://sdk.lunarg.com/sdk/download/latest/linux/vulkan-sdk.tar.xz -O /tmp/vulkan-sdk.tar.xz mkdir /tmp/vulkan-sdk && tar -xf /tmp/vulkan-sdk.tar.xz -C /tmp/vulkan-sdk SDK_DIR=$(ls -d /tmp/vulkan-sdk/1.* | head -n1) - sudo install -m 755 "$SDK_DIR/x86_64/bin/glslc" /usr/local/bin/glslc + sudo cp -r "$SDK_DIR/x86_64" /opt/vulkan-sdk + sudo ln -sf libvulkan.so.1 /opt/vulkan-sdk/lib/libvulkan.so rm -rf /tmp/vulkan-sdk /tmp/vulkan-sdk.tar.xz + echo "VULKAN_SDK=/opt/vulkan-sdk" >> $GITHUB_ENV + echo "/opt/vulkan-sdk/bin" >> $GITHUB_PATH + echo "LD_LIBRARY_PATH=/opt/vulkan-sdk/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> $GITHUB_ENV - name: linux-arm64 install vulkan if: matrix.name == 'linux-gpu' && matrix.arch == 'arm64' diff --git a/Makefile b/Makefile index d8946e0..b51076d 100644 --- a/Makefile +++ b/Makefile @@ -187,8 +187,11 @@ else ifeq ($(PLATFORM),linux) LIBS += $(MBEDTLS_BUILD)/library/libmbedx509.a LIBS += $(MBEDTLS_BUILD)/library/libmbedcrypto.a else - # Windows/other: use libcurl + mbedtls - CFLAGS += -I$(CURL_DIR)/include -I$(MBEDTLS_DIR)/include + # Windows/other: use libcurl + mbedtls. + # -DCURL_STATICLIB: curl.h on Windows declares functions as dllimport + # by default; without this macro, references to curl_* become __imp_* + # which a static libcurl.a can't resolve. + CFLAGS += -I$(CURL_DIR)/include -I$(MBEDTLS_DIR)/include -DCURL_STATICLIB NET_SRC := src/adam_net_curl.c TTS_SYS_SRC := src/adam_tts_system.c LIBS := $(WHISPER_LIBS) $(LLAMA_LIBS) diff --git a/extensions/sqlite/Makefile b/extensions/sqlite/Makefile index 88ef082..88e4a1d 100644 --- a/extensions/sqlite/Makefile +++ b/extensions/sqlite/Makefile @@ -165,14 +165,21 @@ else ifeq ($(PLATFORM),ios-sim) LIBS := $(WHISPER_LIBS) $(LLAMA_LIBS) else ifeq ($(PLATFORM),windows) EXT := dll - CFLAGS += -I$(ADAM_ROOT)/modules/curl/include -I$(ADAM_ROOT)/modules/mbedtls/include - LDFLAGS += -shared -lbcrypt -static-libgcc + # -DCURL_STATICLIB: curl.h on Windows declares functions as dllimport + # by default; we link the static libcurl.a so undo that. + CFLAGS += -I$(ADAM_ROOT)/modules/curl/include -I$(ADAM_ROOT)/modules/mbedtls/include -DCURL_STATICLIB + LDFLAGS += -shared -static-libgcc LDFLAGS += -Wl,--push-state,-Bstatic,-lstdc++,-lwinpthread,--pop-state LIBS := $(WHISPER_LIBS) $(LLAMA_LIBS) LIBS += $(CURL_BUILD)/lib/libcurl.a LIBS += $(MBEDTLS_BUILD)/library/libmbedtls.a LIBS += $(MBEDTLS_BUILD)/library/libmbedx509.a LIBS += $(MBEDTLS_BUILD)/library/libmbedcrypto.a + # -lbcrypt MUST come after libmbedcrypto.a — GNU ld processes libs + # left-to-right and only resolves symbols already referenced. mbedcrypto + # references BCryptGenRandom; if -lbcrypt sat earlier (in LDFLAGS), it + # would be discarded before mbedcrypto was processed. + LIBS += -lbcrypt else ifeq ($(PLATFORM),android) EXT := so # -static-libstdc++ now takes effect because the final link uses clang++ From f50367449d090365ae32c0015d676b48248c1156 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Wed, 13 May 2026 18:20:52 +0200 Subject: [PATCH 14/39] feat: update Makefile for platform-specific linking and library order --- extensions/sqlite/Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/extensions/sqlite/Makefile b/extensions/sqlite/Makefile index 88e4a1d..0f1a86f 100644 --- a/extensions/sqlite/Makefile +++ b/extensions/sqlite/Makefile @@ -112,9 +112,13 @@ ifneq ($(GGML_BLAS_LIB),) LLAMA_LIBS += $(GGML_BLAS_LIB) endif -# Android's bionic libc has pthread built in — no separate libpthread.so to link. +# Default link libs. Windows is fully overridden in its branch below +# because -lpthread doesn't exist on MinGW (we use -lwinpthread instead) +# and -lz needs to sit after the static libs, not before. ifeq ($(PLATFORM),android) LDFLAGS := -lz +else ifeq ($(PLATFORM),windows) + LDFLAGS := else LDFLAGS := -lpthread -lz endif @@ -175,11 +179,11 @@ else ifeq ($(PLATFORM),windows) LIBS += $(MBEDTLS_BUILD)/library/libmbedtls.a LIBS += $(MBEDTLS_BUILD)/library/libmbedx509.a LIBS += $(MBEDTLS_BUILD)/library/libmbedcrypto.a - # -lbcrypt MUST come after libmbedcrypto.a — GNU ld processes libs - # left-to-right and only resolves symbols already referenced. mbedcrypto - # references BCryptGenRandom; if -lbcrypt sat earlier (in LDFLAGS), it - # would be discarded before mbedcrypto was processed. - LIBS += -lbcrypt + # System libs MUST come after the static archives that reference them + # (GNU ld is single-pass left-to-right). curl needs Winsock + crypt32; + # mbedtls needs bcrypt for BCryptGenRandom; curl uses zlib for gzip + # content-encoding. + LIBS += -lws2_32 -lcrypt32 -lbcrypt -lz else ifeq ($(PLATFORM),android) EXT := so # -static-libstdc++ now takes effect because the final link uses clang++ From 19180ced677e07adb620050ffcf206cc15840b93 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Wed, 13 May 2026 19:03:18 +0200 Subject: [PATCH 15/39] feat: enhance Makefile to support GPU backends with Vulkan and OpenCL libraries --- extensions/sqlite/Makefile | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/extensions/sqlite/Makefile b/extensions/sqlite/Makefile index 0f1a86f..7952719 100644 --- a/extensions/sqlite/Makefile +++ b/extensions/sqlite/Makefile @@ -105,12 +105,20 @@ ifneq ($(WHISPER_COREML_LIB),) COREML_FRAMEWORK := -framework CoreML endif -# Pick up ggml-blas if llama.cpp was configured with -DGGML_BLAS=ON. +# Pick up GPU backends if llama.cpp was configured with the matching flag. # Check both naming conventions (lib prefix may be stripped on Windows MinGW). -GGML_BLAS_LIB := $(firstword $(wildcard $(LLAMA_BUILD)/ggml/src/ggml-blas/libggml-blas.a $(LLAMA_BUILD)/ggml/src/ggml-blas/ggml-blas.a)) +GGML_BLAS_LIB := $(firstword $(wildcard $(LLAMA_BUILD)/ggml/src/ggml-blas/libggml-blas.a $(LLAMA_BUILD)/ggml/src/ggml-blas/ggml-blas.a)) +GGML_VULKAN_LIB := $(firstword $(wildcard $(LLAMA_BUILD)/ggml/src/ggml-vulkan/libggml-vulkan.a $(LLAMA_BUILD)/ggml/src/ggml-vulkan/ggml-vulkan.a)) +GGML_OPENCL_LIB := $(firstword $(wildcard $(LLAMA_BUILD)/ggml/src/ggml-opencl/libggml-opencl.a $(LLAMA_BUILD)/ggml/src/ggml-opencl/ggml-opencl.a)) ifneq ($(GGML_BLAS_LIB),) LLAMA_LIBS += $(GGML_BLAS_LIB) endif +ifneq ($(GGML_VULKAN_LIB),) + LLAMA_LIBS += $(GGML_VULKAN_LIB) +endif +ifneq ($(GGML_OPENCL_LIB),) + LLAMA_LIBS += $(GGML_OPENCL_LIB) +endif # Default link libs. Windows is fully overridden in its branch below # because -lpthread doesn't exist on MinGW (we use -lwinpthread instead) @@ -208,6 +216,17 @@ else LIBS += $(MBEDTLS_BUILD)/library/libmbedcrypto.a endif +# Vulkan / OpenCL runtime loaders. Must come AFTER the ggml-vulkan/-opencl +# static libs in LIBS (single-pass GNU ld). Only added when the matching +# backend was built (wildcard above resolved); Apple's Metal path skips +# these — neither GGML_VULKAN_LIB nor GGML_OPENCL_LIB is set on Apple. +ifneq ($(GGML_VULKAN_LIB),) + LIBS += -lvulkan +endif +ifneq ($(GGML_OPENCL_LIB),) + LIBS += -lOpenCL +endif + .PHONY: all clean test all: adam.$(EXT) From 242171cc05372e45d9a32753ed9006b6c1111b42 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Thu, 14 May 2026 10:21:39 +0200 Subject: [PATCH 16/39] feat: update Makefile to use correct Vulkan library flag for Windows platform --- extensions/sqlite/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/extensions/sqlite/Makefile b/extensions/sqlite/Makefile index 7952719..bc93ec6 100644 --- a/extensions/sqlite/Makefile +++ b/extensions/sqlite/Makefile @@ -220,8 +220,15 @@ endif # static libs in LIBS (single-pass GNU ld). Only added when the matching # backend was built (wildcard above resolved); Apple's Metal path skips # these — neither GGML_VULKAN_LIB nor GGML_OPENCL_LIB is set on Apple. +# On Windows the Vulkan loader DLL is `vulkan-1.dll` (with the -1 suffix +# baked in) and the corresponding import library is libvulkan-1.dll.a, so +# the linker flag is `-lvulkan-1`, not `-lvulkan`. ifneq ($(GGML_VULKAN_LIB),) - LIBS += -lvulkan + ifeq ($(PLATFORM),windows) + LIBS += -lvulkan-1 + else + LIBS += -lvulkan + endif endif ifneq ($(GGML_OPENCL_LIB),) LIBS += -lOpenCL From 4f13bd42f3285817d59959db6c044b6139931445 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Thu, 14 May 2026 10:53:39 +0200 Subject: [PATCH 17/39] feat: add zlib-dev dependency for linux-musl and docker builds --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dccab3a..cb63d9a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -190,7 +190,7 @@ jobs: - name: linux-musl x86_64 install dependencies if: contains(matrix.name, 'linux-musl') && matrix.arch == 'x86_64' - run: apk update && apk add --no-cache git gcc g++ make cmake sqlite musl-dev linux-headers python3 curl-dev openssl-dev + run: apk update && apk add --no-cache git gcc g++ make cmake sqlite musl-dev linux-headers python3 curl-dev openssl-dev zlib-dev - uses: actions/checkout@v4.2.2 with: @@ -288,7 +288,7 @@ jobs: -w /workspace \ alpine:latest \ tail -f /dev/null - docker exec alpine sh -c "apk update && apk add --no-cache gcc g++ make cmake sqlite musl-dev linux-headers python3 curl-dev openssl-dev" + docker exec alpine sh -c "apk update && apk add --no-cache gcc g++ make cmake sqlite musl-dev linux-headers python3 curl-dev openssl-dev zlib-dev" - name: linux install opencl if: matrix.name == 'linux-gpu' From 857c097ce648340df4ee028255482ff30c37d10f Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Thu, 14 May 2026 11:34:37 +0200 Subject: [PATCH 18/39] feat: update Makefile to correctly link -lz for Linux and Android platforms --- extensions/sqlite/Makefile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/extensions/sqlite/Makefile b/extensions/sqlite/Makefile index bc93ec6..2522dc6 100644 --- a/extensions/sqlite/Makefile +++ b/extensions/sqlite/Makefile @@ -120,15 +120,18 @@ ifneq ($(GGML_OPENCL_LIB),) LLAMA_LIBS += $(GGML_OPENCL_LIB) endif -# Default link libs. Windows is fully overridden in its branch below -# because -lpthread doesn't exist on MinGW (we use -lwinpthread instead) -# and -lz needs to sit after the static libs, not before. +# Default link libs. -lz is appended to LIBS (not LDFLAGS) for every +# platform that uses libcurl — libcurl references inflate*, and with +# single-pass GNU ld + --as-needed, -lz must sit AFTER libcurl.a or +# libz.so gets dropped from DT_NEEDED. glibc loaders happen to find +# inflateEnd through the global namespace anyway; musl is strict and +# fails dlopen with "Error relocating: inflateEnd: symbol not found". ifeq ($(PLATFORM),android) - LDFLAGS := -lz + LDFLAGS := else ifeq ($(PLATFORM),windows) LDFLAGS := else - LDFLAGS := -lpthread -lz + LDFLAGS := -lpthread endif # ---------------------------------------------------------------------------- @@ -204,6 +207,7 @@ else ifeq ($(PLATFORM),android) LIBS += $(MBEDTLS_BUILD)/library/libmbedtls.a LIBS += $(MBEDTLS_BUILD)/library/libmbedx509.a LIBS += $(MBEDTLS_BUILD)/library/libmbedcrypto.a + LIBS += -lz else # linux (default) EXT := so @@ -214,6 +218,7 @@ else LIBS += $(MBEDTLS_BUILD)/library/libmbedtls.a LIBS += $(MBEDTLS_BUILD)/library/libmbedx509.a LIBS += $(MBEDTLS_BUILD)/library/libmbedcrypto.a + LIBS += -lz endif # Vulkan / OpenCL runtime loaders. Must come AFTER the ggml-vulkan/-opencl From 73dbc100aabd4a2aa990e7ec182df254f32a1f29 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Thu, 14 May 2026 11:57:58 +0200 Subject: [PATCH 19/39] feat: add git dependency to Alpine Docker setup in CI workflow --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cb63d9a..69a1a26 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -288,7 +288,7 @@ jobs: -w /workspace \ alpine:latest \ tail -f /dev/null - docker exec alpine sh -c "apk update && apk add --no-cache gcc g++ make cmake sqlite musl-dev linux-headers python3 curl-dev openssl-dev zlib-dev" + docker exec alpine sh -c "apk update && apk add --no-cache git gcc g++ make cmake sqlite musl-dev linux-headers python3 curl-dev openssl-dev zlib-dev" - name: linux install opencl if: matrix.name == 'linux-gpu' From 0da300bbee0d60834b0fa6dae6d9de0c3686492f Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Thu, 14 May 2026 13:02:34 +0200 Subject: [PATCH 20/39] feat: configure git safe.directory in Alpine Docker setup for proper permissions --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 69a1a26..2f0d389 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -289,6 +289,11 @@ jobs: alpine:latest \ tail -f /dev/null docker exec alpine sh -c "apk update && apk add --no-cache git gcc g++ make cmake sqlite musl-dev linux-headers python3 curl-dev openssl-dev zlib-dev" + # Tell git inside the container that the bind-mounted workspace is + # safe — git runs as root in the container while the files are + # owned by the runner user, which trips git's "dubious ownership" + # check. + docker exec alpine git config --global --add safe.directory '*' - name: linux install opencl if: matrix.name == 'linux-gpu' From 47fbb9845f05adf4ed0454cf2fef64f66c0d28e5 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Thu, 14 May 2026 13:23:33 +0200 Subject: [PATCH 21/39] feat: update linux-musl arm64 test command to skip unit tests in Alpine Docker --- .github/workflows/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2f0d389..8fe9769 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -524,7 +524,11 @@ jobs: - name: unix test adam extension if: contains(matrix.name, 'linux') || ( matrix.name == 'macos' && matrix.arch != 'x86_64' ) - run: ${{ contains(matrix.name, 'linux-musl') && matrix.arch == 'arm64' && 'docker exec alpine' || '' }} make test ${{ matrix.make && matrix.make || ''}} + # -e SKIP_UNITTEST passes the job-level env into the linux-musl arm64 + # docker container so `make test` skips the test_adam CLI binary + # (which links -fsanitize=address/undefined — libasan/ubsan aren't in + # Alpine — and also hits the duplicate miniaudio symbol from libmtmd). + run: ${{ contains(matrix.name, 'linux-musl') && matrix.arch == 'arm64' && 'docker exec -e SKIP_UNITTEST alpine' || '' }} make test ${{ matrix.make && matrix.make || ''}} - uses: actions/upload-artifact@v4.6.2 if: always() From f522cca977fa2f5fc8828b06edb4dbdd1a23bc5f Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Thu, 14 May 2026 13:41:10 +0200 Subject: [PATCH 22/39] feat: update Vulkan installation steps in CI workflow for compatibility --- .github/workflows/main.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8fe9769..bbd6398 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -304,21 +304,25 @@ jobs: run: | # ggml-vulkan.cpp uses Vulkan symbols (PipelineRobustnessCreateInfoEXT, # CooperativeMatrixFeaturesKHR, LayerSettingEXT, eMesaDozen, …) - # introduced in 1.4+. jammy's libvulkan-dev ships 1.3.204, too old. - # Install the LunarG SDK fully (headers + loader + glslc) under - # /opt/vulkan-sdk and create the libvulkan.so symlink the tarball - # forgot, so cmake's FindVulkan resolves cleanly via VULKAN_SDK. + # introduced in 1.4+. Jammy's libvulkan-dev ships 1.3.204 headers + # (too old), but its loader libvulkan.so is forward-compatible — + # 1.4 functions get resolved through vkGetInstanceProcAddr at + # runtime, not at link time. So: apt for the loader + drivers, + # LunarG SDK for the 1.4 headers + glslc, and a symlink so cmake's + # FindVulkan resolves Vulkan_LIBRARY against the apt-installed + # loader when VULKAN_SDK is set. sudo apt-get update -y - sudo apt-get install -y mesa-vulkan-drivers + sudo apt-get install -y mesa-vulkan-drivers libvulkan-dev wget -q https://sdk.lunarg.com/sdk/download/latest/linux/vulkan-sdk.tar.xz -O /tmp/vulkan-sdk.tar.xz mkdir /tmp/vulkan-sdk && tar -xf /tmp/vulkan-sdk.tar.xz -C /tmp/vulkan-sdk SDK_DIR=$(ls -d /tmp/vulkan-sdk/1.* | head -n1) - sudo cp -r "$SDK_DIR/x86_64" /opt/vulkan-sdk - sudo ln -sf libvulkan.so.1 /opt/vulkan-sdk/lib/libvulkan.so + sudo mkdir -p /opt/vulkan-sdk/lib + sudo cp -r "$SDK_DIR/x86_64/include" /opt/vulkan-sdk/include + sudo cp -r "$SDK_DIR/x86_64/bin" /opt/vulkan-sdk/bin + sudo ln -sf /usr/lib/x86_64-linux-gnu/libvulkan.so /opt/vulkan-sdk/lib/libvulkan.so rm -rf /tmp/vulkan-sdk /tmp/vulkan-sdk.tar.xz echo "VULKAN_SDK=/opt/vulkan-sdk" >> $GITHUB_ENV echo "/opt/vulkan-sdk/bin" >> $GITHUB_PATH - echo "LD_LIBRARY_PATH=/opt/vulkan-sdk/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> $GITHUB_ENV - name: linux-arm64 install vulkan if: matrix.name == 'linux-gpu' && matrix.arch == 'arm64' From 60edb871f28220f9ac5bcae2d80492d2387afd51 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Thu, 14 May 2026 15:39:55 +0200 Subject: [PATCH 23/39] feat: update installation command for Vulkan to use glslc package --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bbd6398..0c3542f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -338,7 +338,9 @@ jobs: EOF sudo apt-get update || true ;# Prevent failure due to missing URLs. - sudo apt-get install -y --no-install-recommends build-essential shaderc crossbuild-essential-arm64 libvulkan-dev:arm64 + # On noble the binary package providing /usr/bin/glslc is `glslc` + # (the `shaderc` name is only the source package). + sudo apt-get install -y --no-install-recommends build-essential glslc crossbuild-essential-arm64 libvulkan-dev:arm64 - name: cache llama.cpp build id: cache-llama From 1b006b1848f9634e82a4f151f540d42ade58e30b Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Fri, 15 May 2026 12:56:03 +0200 Subject: [PATCH 24/39] feat: update CI build configuration to disable sanitizers and refine unit test handling --- .github/workflows/main.yml | 36 ++++++++++++------------- Makefile | 54 ++++++++++++++++++++++++++++++++------ 2 files changed, 64 insertions(+), 26 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0c3542f..529e509 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -107,26 +107,26 @@ jobs: name: ${{ matrix.name }}${{ matrix.arch && format('-{0}', matrix.arch) || '' }} build${{ matrix.arch != 'arm64-v8a' && matrix.name != 'ios-sim' && matrix.name != 'ios' && matrix.name != 'apple-xcframework' && matrix.name != 'android-aar' && ( matrix.name != 'macos' || matrix.arch != 'x86_64' ) && ' + test' || ''}} timeout-minutes: 120 env: - # Skip the test_adam CLI binary build everywhere in CI — both libadam.a - # and libmtmd.a embed miniaudio (mtmd-helper.cpp pulls it in too), and - # strict linkers (NDK ld.lld, GNU ld) refuse the duplicate symbol. - # Local `make test` still builds it by default. - SKIP_UNITTEST: 1 + # SANITIZE=0 disables -fsanitize=address,undefined for the test_adam + # binary. Libasan/libubsan aren't shipped in Alpine musl or MinGW, + # and ASan + cross-arch emulators tend to fight. Local dev keeps + # sanitizers on by default; CI keeps the test fast and portable. + SANITIZE: 0 strategy: fail-fast: false matrix: include: - os: macos-15 name: macos - make: SKIP_UNITTEST=1 LLAMA="-DGGML_NATIVE=OFF -DGGML_METAL=ON -DGGML_ACCELERATE=ON -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=Apple" WHISPER="-DWHISPER_COREML=ON -DWHISPER_COREML_ALLOW_FALLBACK=ON" + make: LLAMA="-DGGML_NATIVE=OFF -DGGML_METAL=ON -DGGML_ACCELERATE=ON -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=Apple" WHISPER="-DWHISPER_COREML=ON -DWHISPER_COREML_ALLOW_FALLBACK=ON" - os: macos-15 arch: x86_64 name: macos - make: SKIP_UNITTEST=1 ARCH=x86_64 LLAMA="-DGGML_NATIVE=OFF -DGGML_METAL=ON -DGGML_ACCELERATE=ON -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=Apple" WHISPER="-DWHISPER_COREML=ON -DWHISPER_COREML_ALLOW_FALLBACK=ON" + make: ARCH=x86_64 LLAMA="-DGGML_NATIVE=OFF -DGGML_METAL=ON -DGGML_ACCELERATE=ON -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=Apple" WHISPER="-DWHISPER_COREML=ON -DWHISPER_COREML_ALLOW_FALLBACK=ON" - os: macos-15 arch: arm64 name: macos - make: SKIP_UNITTEST=1 ARCH=arm64 LLAMA="-DGGML_NATIVE=OFF -DGGML_METAL=ON -DGGML_ACCELERATE=ON -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=Apple" WHISPER="-DWHISPER_COREML=ON -DWHISPER_COREML_ALLOW_FALLBACK=ON" + make: ARCH=arm64 LLAMA="-DGGML_NATIVE=OFF -DGGML_METAL=ON -DGGML_ACCELERATE=ON -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=Apple" WHISPER="-DWHISPER_COREML=ON -DWHISPER_COREML_ALLOW_FALLBACK=ON" - os: ubuntu-22.04 arch: x86_64 name: linux-cpu @@ -147,7 +147,7 @@ jobs: arch: x86_64 name: linux-musl-cpu container: alpine:latest - make: SKIP_UNITTEST=1 LLAMA="-DGGML_NATIVE=OFF -DGGML_CPU=ON -DGGML_AVX2=ON" + make: LLAMA="-DGGML_NATIVE=OFF -DGGML_CPU=ON -DGGML_AVX2=ON" - os: ubuntu-22.04-arm arch: arm64 name: linux-musl-cpu @@ -155,20 +155,20 @@ jobs: - os: windows-2022 arch: x86_64 name: windows-cpu - make: SKIP_UNITTEST=1 LLAMA="-DGGML_NATIVE=OFF -DGGML_CPU=ON -DGGML_AVX2=ON" + make: LLAMA="-DGGML_NATIVE=OFF -DGGML_CPU=ON -DGGML_AVX2=ON" - os: windows-2022 arch: x86_64 name: windows-gpu - make: SKIP_UNITTEST=1 LLAMA="-DGGML_NATIVE=OFF -DGGML_CPU=ON -DGGML_VULKAN=ON -DGGML_OPENCL=ON" + make: LLAMA="-DGGML_NATIVE=OFF -DGGML_CPU=ON -DGGML_VULKAN=ON -DGGML_OPENCL=ON" - os: ubuntu-22.04 arch: x86_64 name: android - make: SKIP_UNITTEST=1 PLATFORM=android ARCH=x86_64 + make: PLATFORM=android ARCH=x86_64 sqlite-amalgamation-zip: https://sqlite.org/2025/sqlite-amalgamation-3490100.zip - os: ubuntu-22.04 arch: arm64-v8a name: android - make: SKIP_UNITTEST=1 PLATFORM=android ARCH=arm64-v8a + make: PLATFORM=android ARCH=arm64-v8a - os: macos-15 name: ios make: PLATFORM=ios LLAMA="-DGGML_NATIVE=OFF -DGGML_METAL=ON -DGGML_ACCELERATE=ON -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=Apple" WHISPER="-DWHISPER_COREML=ON -DWHISPER_COREML_ALLOW_FALLBACK=ON" @@ -519,6 +519,8 @@ jobs: adb push ${{ github.workspace }}/sqlite3 /data/local/tmp/ adb push ${{ github.workspace }}/dist /data/local/tmp/ adb push ${{ github.workspace }}/Makefile /data/local/tmp/ + adb push ${{ github.workspace }}/test_adam /data/local/tmp/ + adb shell "chmod +x /data/local/tmp/test_adam" adb shell "sh /data/local/tmp/commands.sh" - name: windows test adam extension @@ -530,11 +532,9 @@ jobs: - name: unix test adam extension if: contains(matrix.name, 'linux') || ( matrix.name == 'macos' && matrix.arch != 'x86_64' ) - # -e SKIP_UNITTEST passes the job-level env into the linux-musl arm64 - # docker container so `make test` skips the test_adam CLI binary - # (which links -fsanitize=address/undefined — libasan/ubsan aren't in - # Alpine — and also hits the duplicate miniaudio symbol from libmtmd). - run: ${{ contains(matrix.name, 'linux-musl') && matrix.arch == 'arm64' && 'docker exec -e SKIP_UNITTEST alpine' || '' }} make test ${{ matrix.make && matrix.make || ''}} + # SANITIZE=0 is the job-level default — pass it explicitly into the + # linux-musl arm64 docker container (libasan/ubsan aren't in Alpine). + run: ${{ contains(matrix.name, 'linux-musl') && matrix.arch == 'arm64' && 'docker exec -e SANITIZE alpine' || '' }} make test ${{ matrix.make && matrix.make || ''}} - uses: actions/upload-artifact@v4.6.2 if: always() diff --git a/Makefile b/Makefile index b51076d..394083e 100644 --- a/Makefile +++ b/Makefile @@ -300,13 +300,51 @@ adam: libadam.a src/main.c # --- Tests --- -# `test` runs an extension-load smoke test against dist/adam.{dylib,so,dll}. -# Pass SKIP_UNITTEST=1 to skip the test_adam CLI binary (heavy: drags in -# fsanitize, miniaudio twice on strict linkers, needs API keys to actually -# run). CI passes SKIP_UNITTEST=1 on platforms where the binary build -# would conflict (e.g. NDK ld.lld rejecting duplicate miniaudio symbols). -SQLITE3 ?= sqlite3 +# `test` runs an extension-load smoke test against dist/adam.{dylib,so,dll} +# plus the test_adam mock-LLM unit-test binary. +# +# SANITIZE=0 disables -fsanitize=address,undefined for environments where +# libasan/libubsan aren't shipped (Alpine musl, MinGW). Local dev keeps +# sanitizers on by default. +# +# SKIP_UNITTEST=1 falls back to smoke-test-only — kept as an escape hatch +# for any platform where the test_adam binary can't be produced at all. +SQLITE3 ?= sqlite3 SKIP_UNITTEST ?= 0 +SANITIZE ?= 1 + +ifeq ($(SANITIZE),1) +TEST_SANITIZE := -fsanitize=address,undefined +else +TEST_SANITIZE := +endif + +# libadam.a contains miniaudio (via adam_audio.o) and libmtmd.a also embeds +# miniaudio (via mtmd-helper.cpp.o). Strict linkers (GNU ld, lld) reject +# the duplicate ma_atomic_global_lock symbol; Apple's ld merges silently. +# `--allow-multiple-definition` makes GNU ld / lld pick the first +# definition and continue — only needed for the test_adam link (the +# shared-extension link uses --gc-sections + archive semantics that avoid +# pulling mtmd-helper.o on most platforms). +ifneq (,$(filter $(PLATFORM),macos ios ios-sim)) +TEST_MULDEF := +else +TEST_MULDEF := -Wl,--allow-multiple-definition +endif + +# llama.cpp/whisper.cpp objects are C++. On Apple, `cc` auto-links libc++ +# when it sees C++ symbols. On Android NDK and Linux, we need the C++ +# driver explicitly so libstdc++/libc++ is brought in. +ifeq ($(PLATFORM),android) +TEST_LD := $(ANDROID_NDK_BIN)/$(NDK_TRIPLE)-clang++ +TEST_LD_EXTRA := -static-libstdc++ +else ifneq (,$(filter $(PLATFORM),macos ios ios-sim)) +TEST_LD := $(CC) +TEST_LD_EXTRA := +else +TEST_LD := c++ +TEST_LD_EXTRA := +endif TEST_DEPS := $(DIST_DIR)/$(EXT_FILE) ifeq ($(SKIP_UNITTEST),0) @@ -321,8 +359,8 @@ ifeq ($(SKIP_UNITTEST),0) endif test_adam: libadam.a test/test_adam.c - $(CC) $(CFLAGS) -O0 -g -fsanitize=address,undefined \ - test/test_adam.c -L. -ladam $(LIBS) $(LDFLAGS) -o $@ + $(CC) $(CFLAGS) -O0 -g $(TEST_SANITIZE) -c test/test_adam.c -o test_adam.o + $(TEST_LD) $(PLATFORM_CFLAGS) test_adam.o -L. -ladam $(LIBS) $(LDFLAGS) $(TEST_SANITIZE) $(TEST_LD_EXTRA) $(TEST_MULDEF) -o $@ live: test_live ./test_live From 53fc0dc173a78d7e79aee148480cb1bac081f974 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Fri, 15 May 2026 13:13:55 +0200 Subject: [PATCH 25/39] feat: refine build job naming and update macOS test conditions for better clarity --- .github/workflows/main.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 529e509..72c73c6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -104,7 +104,7 @@ jobs: needs: download-models runs-on: ${{ matrix.os }} container: ${{ matrix.container && matrix.container || '' }} - name: ${{ matrix.name }}${{ matrix.arch && format('-{0}', matrix.arch) || '' }} build${{ matrix.arch != 'arm64-v8a' && matrix.name != 'ios-sim' && matrix.name != 'ios' && matrix.name != 'apple-xcframework' && matrix.name != 'android-aar' && ( matrix.name != 'macos' || matrix.arch != 'x86_64' ) && ' + test' || ''}} + name: ${{ matrix.name }}${{ matrix.arch && format('-{0}', matrix.arch) || '' }} build${{ matrix.arch != 'arm64-v8a' && matrix.name != 'ios-sim' && matrix.name != 'ios' && matrix.name != 'apple-xcframework' && matrix.name != 'android-aar' && ' + test' || ''}} timeout-minutes: 120 env: # SANITIZE=0 disables -fsanitize=address,undefined for the test_adam @@ -531,7 +531,11 @@ jobs: VULKAN_SDK: "C:/msys64/mingw64" - name: unix test adam extension - if: contains(matrix.name, 'linux') || ( matrix.name == 'macos' && matrix.arch != 'x86_64' ) + if: contains(matrix.name, 'linux') || matrix.name == 'macos' + # The macos-15 runner is arm64; the macos x86_64 matrix entry produces + # a pure x86_64 binary and runs it via Rosetta 2 (preinstalled on the + # runner image). + # # SANITIZE=0 is the job-level default — pass it explicitly into the # linux-musl arm64 docker container (libasan/ubsan aren't in Alpine). run: ${{ contains(matrix.name, 'linux-musl') && matrix.arch == 'arm64' && 'docker exec -e SANITIZE alpine' || '' }} make test ${{ matrix.make && matrix.make || ''}} From 6d8d6b9c59b08f81c38d372008ec60365ca1e43a Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Fri, 15 May 2026 13:22:51 +0200 Subject: [PATCH 26/39] feat: add macOS x86_64 build step for sqlite3 shell to support architecture compatibility --- .github/workflows/main.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 72c73c6..1dc44aa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -275,6 +275,22 @@ jobs: if: matrix.name == 'macos' run: brew link sqlite --force + - name: macos x86_64 build x86_64 sqlite3 shell + # The macos-15 runner is arm64; Homebrew's sqlite3 is arm64-only. To + # exercise `.load ./dist/adam.dylib` against an x86_64 dylib (this + # matrix entry's artifact) we need an x86_64 sqlite3 binary — + # Rosetta translates whole processes, not individual dlopen calls. + if: matrix.name == 'macos' && matrix.arch == 'x86_64' + run: | + curl -sLO https://sqlite.org/2025/sqlite-amalgamation-3490100.zip + unzip -q sqlite-amalgamation-*.zip + cd sqlite-amalgamation-* + cc -arch x86_64 -O2 -DSQLITE_ENABLE_LOAD_EXTENSION \ + shell.c sqlite3.c -o "$GITHUB_WORKSPACE/sqlite3_x86_64" + cd .. + rm -rf sqlite-amalgamation-*.zip sqlite-amalgamation-* + echo "SQLITE3=$GITHUB_WORKSPACE/sqlite3_x86_64" >> "$GITHUB_ENV" + - name: linux install dependencies if: startsWith(matrix.name, 'linux-cpu') || startsWith(matrix.name, 'linux-gpu') run: sudo apt-get update && sudo apt-get install -y libssl-dev From f049c2c91b537a8ffbac67e7abe1be69674f2a7d Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Fri, 15 May 2026 14:39:30 +0200 Subject: [PATCH 27/39] feat: replace mkdir with platform-specific adam_mkdir for cross-platform compatibility --- test/test_adam.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/test_adam.c b/test/test_adam.c index f58d74a..a5ba069 100644 --- a/test/test_adam.c +++ b/test/test_adam.c @@ -24,6 +24,12 @@ #include #include +#ifdef _WIN32 +#include +#define adam_mkdir(p, m) _mkdir(p) +#else +#define adam_mkdir(p, m) mkdir((p), (m)) +#endif #ifndef ADAM_NO_PTHREADS #include @@ -3625,7 +3631,7 @@ TEST(tool_list_directory_sandbox) { ASSERT_EQ(adam_settings_allow_dir(s, "/tmp"), ADAM_OK); // Create test directory with a file - mkdir("/tmp/adam_test_dir", 0755); + adam_mkdir("/tmp/adam_test_dir", 0755); FILE *f = fopen("/tmp/adam_test_dir/test.txt", "w"); if (f) { fputs("x", f); fclose(f); } From 7d0cb22436fdbd21bddf62651be00673e96b7999 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Fri, 15 May 2026 17:15:23 +0200 Subject: [PATCH 28/39] feat: enhance LLAMA_LIBS to support MinGW Ninja by resolving ggml library variants --- Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 394083e..74a323b 100644 --- a/Makefile +++ b/Makefile @@ -87,11 +87,17 @@ endif # Platform-specific: Apple (NSURLSession) vs Other (libcurl + mbedtls) # ============================================================================ +# MinGW Ninja sometimes ignores -DCMAKE_STATIC_LIBRARY_PREFIX=lib for ggml +# sub-targets and emits `ggml.a` / `ggml-cpu.a` / `ggml-base.a` without +# the `lib` prefix. `ggml_lib` resolves to whichever variant exists so +# the LLAMA_LIBS list works on every platform. +ggml_lib = $(firstword $(wildcard $(LLAMA_BUILD)/ggml/src/lib$(1).a $(LLAMA_BUILD)/ggml/src/$(1).a)) + LLAMA_LIBS := $(LLAMA_BUILD)/tools/mtmd/libmtmd.a \ $(LLAMA_BUILD)/src/libllama.a \ - $(LLAMA_BUILD)/ggml/src/libggml.a \ - $(LLAMA_BUILD)/ggml/src/libggml-cpu.a \ - $(LLAMA_BUILD)/ggml/src/libggml-base.a + $(call ggml_lib,ggml) \ + $(call ggml_lib,ggml-cpu) \ + $(call ggml_lib,ggml-base) # Whisper uses llama's ggml (symlinked: whisper.cpp/ggml → llama.cpp/ggml). # Only libwhisper.a is needed — ggml symbols come from LLAMA_LIBS. From 36e17aec02df296e391b2ba24d46ff5597ac4546 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Fri, 15 May 2026 17:50:38 +0200 Subject: [PATCH 29/39] feat: enhance Makefile for platform-specific library linking and support for Vulkan/OpenCL --- Makefile | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 74a323b..f797575 100644 --- a/Makefile +++ b/Makefile @@ -77,10 +77,15 @@ SQLITE_FLAGS := -DSQLITE_THREADSAFE=1 \ -DSQLITE_OMIT_AUTOINIT # Android's bionic libc has pthread built in — no separate libpthread.so to link. +# -lz lives at the END of LIBS (single-pass GNU ld + strict musl loader); +# Windows pulls in -lws2_32 / -lcrypt32 / -lbcrypt there too. See the LIBS +# blocks below. ifeq ($(PLATFORM),android) -LDFLAGS := -lz +LDFLAGS := +else ifeq ($(PLATFORM),windows) +LDFLAGS := else -LDFLAGS := -lpthread -lz +LDFLAGS := -lpthread endif # ============================================================================ @@ -99,6 +104,19 @@ LLAMA_LIBS := $(LLAMA_BUILD)/tools/mtmd/libmtmd.a \ $(call ggml_lib,ggml-cpu) \ $(call ggml_lib,ggml-base) +# Optional GPU backends — wildcards resolve only when llama.cpp was built +# with -DGGML_VULKAN=ON / -DGGML_OPENCL=ON. Static archives go at the end +# of LLAMA_LIBS; matching `-lvulkan` / `-lOpenCL` runtime loaders are +# appended to LIBS by each platform block below. +GGML_VULKAN_LIB := $(firstword $(wildcard $(LLAMA_BUILD)/ggml/src/ggml-vulkan/libggml-vulkan.a $(LLAMA_BUILD)/ggml/src/ggml-vulkan/ggml-vulkan.a)) +GGML_OPENCL_LIB := $(firstword $(wildcard $(LLAMA_BUILD)/ggml/src/ggml-opencl/libggml-opencl.a $(LLAMA_BUILD)/ggml/src/ggml-opencl/ggml-opencl.a)) +ifneq ($(GGML_VULKAN_LIB),) + LLAMA_LIBS += $(GGML_VULKAN_LIB) +endif +ifneq ($(GGML_OPENCL_LIB),) + LLAMA_LIBS += $(GGML_OPENCL_LIB) +endif + # Whisper uses llama's ggml (symlinked: whisper.cpp/ggml → llama.cpp/ggml). # Only libwhisper.a is needed — ggml symbols come from LLAMA_LIBS. WHISPER_LIBS := $(WHISPER_BUILD)/src/libwhisper.a @@ -181,6 +199,7 @@ else ifeq ($(PLATFORM),android) LIBS += $(MBEDTLS_BUILD)/library/libmbedtls.a LIBS += $(MBEDTLS_BUILD)/library/libmbedx509.a LIBS += $(MBEDTLS_BUILD)/library/libmbedcrypto.a + LIBS += -lz else ifeq ($(PLATFORM),linux) # Linux: use libcurl + mbedtls CFLAGS += -I$(CURL_DIR)/include -I$(MBEDTLS_DIR)/include @@ -192,6 +211,13 @@ else ifeq ($(PLATFORM),linux) LIBS += $(MBEDTLS_BUILD)/library/libmbedtls.a LIBS += $(MBEDTLS_BUILD)/library/libmbedx509.a LIBS += $(MBEDTLS_BUILD)/library/libmbedcrypto.a + ifneq ($(GGML_VULKAN_LIB),) + LIBS += -lvulkan + endif + ifneq ($(GGML_OPENCL_LIB),) + LIBS += -lOpenCL + endif + LIBS += -lz else # Windows/other: use libcurl + mbedtls. # -DCURL_STATICLIB: curl.h on Windows declares functions as dllimport @@ -205,6 +231,19 @@ else LIBS += $(MBEDTLS_BUILD)/library/libmbedtls.a LIBS += $(MBEDTLS_BUILD)/library/libmbedx509.a LIBS += $(MBEDTLS_BUILD)/library/libmbedcrypto.a + # Win32 system libs MUST come after static archives that reference them + # (single-pass GNU ld). curl needs Winsock + crypt32; mbedtls needs + # bcrypt for BCryptGenRandom; curl uses zlib for gzip. + # The Vulkan loader DLL on Windows is `vulkan-1.dll`, so the import + # library is `libvulkan-1.dll.a` and the flag is `-lvulkan-1`. + LIBS += -lws2_32 -lcrypt32 -lbcrypt + ifneq ($(GGML_VULKAN_LIB),) + LIBS += -lvulkan-1 + endif + ifneq ($(GGML_OPENCL_LIB),) + LIBS += -lOpenCL + endif + LIBS += -lz endif # ============================================================================ From bb56d24377b5c511af780ebd70c60d40a2d0b143 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Mon, 18 May 2026 13:07:31 +0200 Subject: [PATCH 30/39] feat: improve Windows compatibility by adding _access check and ensuring /tmp directory exists for tests --- src/adam.c | 4 ++++ test/test_adam.c | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/adam.c b/src/adam.c index 1ec8195..da6e506 100644 --- a/src/adam.c +++ b/src/adam.c @@ -15,6 +15,7 @@ // --- Windows compatibility --- #ifdef _WIN32 #include + #include // _access #define realpath(p, r) _fullpath((r), (p), 260) static void adam_sleep_ms(int ms) { Sleep(ms); } #else @@ -338,7 +339,10 @@ adam_status_t adam_settings_allow_dir(adam_settings_t *s, const char *dir_path) // Resolve to canonical path char resolved[4096]; #ifdef _WIN32 + // _fullpath only normalizes — it does NOT check existence. To match + // POSIX realpath() semantics, follow up with _access(resolved, 0). if (!_fullpath(resolved, dir_path, sizeof(resolved))) return ADAM_ERR_INVALID_PARAM; + if (_access(resolved, 0) != 0) return ADAM_ERR_INVALID_PARAM; #elif defined(__EMSCRIPTEN__) // WASM: no realpath, just copy as-is snprintf(resolved, sizeof(resolved), "%s", dir_path); diff --git a/test/test_adam.c b/test/test_adam.c index a5ba069..375f489 100644 --- a/test/test_adam.c +++ b/test/test_adam.c @@ -3673,12 +3673,15 @@ TEST(tool_shell_exec_basic) { ASSERT(strstr(r.for_llm, "hello") != NULL); ASSERT(strstr(r.for_llm, "exit code: 0") != NULL); - // Command that fails + // Command that fails. `false` doesn't exist on Windows cmd.exe — but + // any unknown command makes cmd.exe return a non-zero errorlevel + // (typically 1 or 9009), which is what we're really asserting. arena_reset(a); args = "{\"command\":\"false\"}"; r = adam_tool_shell_exec(a, s, args, strlen(args)); ASSERT_EQ(r.success, 0); // exit code != 0 - ASSERT(strstr(r.for_llm, "exit code: 1") != NULL); + ASSERT(strstr(r.for_llm, "exit code:") != NULL); + ASSERT(strstr(r.for_llm, "exit code: 0") == NULL); arena_destroy(a); adam_settings_destroy(s); @@ -5130,6 +5133,14 @@ int main(void) { printf("Adam Test Suite v%s\n", ADAM_VERSION_STRING); printf("============================================================\n"); +#ifdef _WIN32 + // Tests use hardcoded `/tmp/...` paths. On MinGW binaries (no MSYS path + // translation), `/tmp/foo` resolves via Win32 to `:\tmp\foo`. + // Ensure that directory exists so fopen() / sqlite3_open / etc. succeed. + // EEXIST is fine. + adam_mkdir("/tmp", 0755); +#endif + adam_init(); mem_report_start(); From 1843bb9314674898f3d07327f125776a7769fb58 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Mon, 18 May 2026 14:37:34 +0200 Subject: [PATCH 31/39] feat: create necessary POSIX-style directories for MinGW compatibility in tests --- test/test_adam.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/test_adam.c b/test/test_adam.c index 375f489..7222a73 100644 --- a/test/test_adam.c +++ b/test/test_adam.c @@ -5134,11 +5134,13 @@ int main(void) { printf("============================================================\n"); #ifdef _WIN32 - // Tests use hardcoded `/tmp/...` paths. On MinGW binaries (no MSYS path - // translation), `/tmp/foo` resolves via Win32 to `:\tmp\foo`. - // Ensure that directory exists so fopen() / sqlite3_open / etc. succeed. - // EEXIST is fine. + // Tests use hardcoded POSIX-style paths (`/tmp/...`, `/var`). On MinGW + // binaries (no MSYS path translation), those resolve via Win32 to + // `:\tmp` / `:\var`. Pre-create them so + // fopen() / sqlite3_open / adam_settings_allow_dir all see real dirs. + // EEXIST is harmless. adam_mkdir("/tmp", 0755); + adam_mkdir("/var", 0755); #endif adam_init(); From b3600d77460b1781614a884a28d3577b5d5339b2 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Mon, 18 May 2026 15:36:03 +0200 Subject: [PATCH 32/39] feat: ensure existence of POSIX-style directories before running tests on all platforms --- test/test_adam.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/test_adam.c b/test/test_adam.c index 7222a73..e18b45c 100644 --- a/test/test_adam.c +++ b/test/test_adam.c @@ -5133,15 +5133,15 @@ int main(void) { printf("Adam Test Suite v%s\n", ADAM_VERSION_STRING); printf("============================================================\n"); -#ifdef _WIN32 - // Tests use hardcoded POSIX-style paths (`/tmp/...`, `/var`). On MinGW - // binaries (no MSYS path translation), those resolve via Win32 to - // `:\tmp` / `:\var`. Pre-create them so - // fopen() / sqlite3_open / adam_settings_allow_dir all see real dirs. - // EEXIST is harmless. + // Tests use hardcoded POSIX-style paths (`/tmp/...`, `/var`). Ensure + // both dirs exist before any test runs: + // - Linux/macOS: already there, EEXIST is fine + // - Windows MinGW: `/tmp` resolves to `:\tmp` (no MSYS path + // translation in MinGW binaries); we create it + // - Android: `/tmp` doesn't exist by default; needs adb root + remount + // (already done in CI) for mkdir at / to succeed adam_mkdir("/tmp", 0755); adam_mkdir("/var", 0755); -#endif adam_init(); mem_report_start(); From fe736c3f18ac775e726420ef70baec9dd233938f Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Mon, 18 May 2026 15:55:07 +0200 Subject: [PATCH 33/39] feat: remount Android filesystem as read-write and create /tmp and /var for POSIX compatibility --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1dc44aa..0eb6f46 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -531,6 +531,11 @@ jobs: script: | adb root adb remount + # Android's `/` is read-only by default even after `adb root` — + # remount it rw and create /tmp + /var so the test_adam binary's + # POSIX-style hardcoded paths resolve. Log mount/mkdir status to + # surface diagnostics if something is wrong. + adb shell "mount -o remount,rw / 2>&1; mkdir -p /tmp /var 2>&1; ls -ld /tmp /var" adb push ${{ github.workspace }}/commands.sh /data/local/tmp/ adb push ${{ github.workspace }}/sqlite3 /data/local/tmp/ adb push ${{ github.workspace }}/dist /data/local/tmp/ From d4ea97901c40214dbc0e88cbd13b706e29d2681f Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Tue, 19 May 2026 14:32:00 +0200 Subject: [PATCH 34/39] fix: update file paths for Android compatibility in tests and define platform-specific temporary directories --- .github/workflows/main.yml | 5 --- test/test_adam.c | 89 +++++++++++++++++++++----------------- 2 files changed, 49 insertions(+), 45 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0eb6f46..1dc44aa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -531,11 +531,6 @@ jobs: script: | adb root adb remount - # Android's `/` is read-only by default even after `adb root` — - # remount it rw and create /tmp + /var so the test_adam binary's - # POSIX-style hardcoded paths resolve. Log mount/mkdir status to - # surface diagnostics if something is wrong. - adb shell "mount -o remount,rw / 2>&1; mkdir -p /tmp /var 2>&1; ls -ld /tmp /var" adb push ${{ github.workspace }}/commands.sh /data/local/tmp/ adb push ${{ github.workspace }}/sqlite3 /data/local/tmp/ adb push ${{ github.workspace }}/dist /data/local/tmp/ diff --git a/test/test_adam.c b/test/test_adam.c index e18b45c..748fc3a 100644 --- a/test/test_adam.c +++ b/test/test_adam.c @@ -31,6 +31,19 @@ #define adam_mkdir(p, m) mkdir((p), (m)) #endif +// Platform-portable temp / second directory used by file-sandbox tests. +// Android's `/` is a read-only rootfs (no mkdir, no symlink); the writable +// scratch dir is `/data/local/tmp`. Other platforms keep the POSIX defaults. +// String concatenation lets us inline these into both plain paths +// (`TEST_TMP "/foo.db"`) and JSON args (`"{\"path\":\"" TEST_TMP "/foo\"}"`). +#ifdef __ANDROID__ + #define TEST_TMP "/data/local/tmp" + #define TEST_VAR "/data" +#else + #define TEST_TMP "/tmp" + #define TEST_VAR "/var" +#endif + #ifndef ADAM_NO_PTHREADS #include #endif @@ -2453,7 +2466,7 @@ TEST(local_with_stream_callback) { #include TEST(session_open_close) { - const char *path = "/tmp/adam_test_session.db"; + const char *path = TEST_TMP "/adam_test_session.db"; unlink(path); adam_memory_t *mem = adam_memory_open(path); ASSERT_NOT_NULL(mem); @@ -2462,7 +2475,7 @@ TEST(session_open_close) { } TEST(session_save_load_simple) { - const char *path = "/tmp/adam_test_session2.db"; + const char *path = TEST_TMP "/adam_test_session2.db"; unlink(path); adam_memory_t *mem = adam_memory_open(path); ASSERT_NOT_NULL(mem); @@ -2499,7 +2512,7 @@ TEST(session_save_load_simple) { } TEST(session_save_load_with_tool_calls) { - const char *path = "/tmp/adam_test_session3.db"; + const char *path = TEST_TMP "/adam_test_session3.db"; unlink(path); adam_memory_t *mem = adam_memory_open(path); @@ -2546,7 +2559,7 @@ TEST(session_save_load_with_tool_calls) { } TEST(session_list_and_delete) { - const char *path = "/tmp/adam_test_session4.db"; + const char *path = TEST_TMP "/adam_test_session4.db"; unlink(path); adam_memory_t *mem = adam_memory_open(path); @@ -2593,7 +2606,7 @@ TEST(session_list_and_delete) { TEST(session_overwrite) { // Saving the same session_id twice should replace the old data - const char *path = "/tmp/adam_test_session5.db"; + const char *path = TEST_TMP "/adam_test_session5.db"; unlink(path); adam_memory_t *mem = adam_memory_open(path); @@ -2622,7 +2635,7 @@ TEST(session_overwrite) { TEST(session_persistence_across_reopen) { // Data survives closing and reopening the database - const char *path = "/tmp/adam_test_session6.db"; + const char *path = TEST_TMP "/adam_test_session6.db"; unlink(path); // Open, save, close @@ -3552,29 +3565,29 @@ TEST(tool_file_read_sandbox) { ASSERT(strstr(r.for_llm, "denied") != NULL); // Allow /tmp - ASSERT_EQ(adam_settings_allow_dir(s, "/tmp"), ADAM_OK); + ASSERT_EQ(adam_settings_allow_dir(s, TEST_TMP), ADAM_OK); // Write a test file - FILE *f = fopen("/tmp/adam_test_read.txt", "w"); + FILE *f = fopen(TEST_TMP "/adam_test_read.txt", "w"); ASSERT_NOT_NULL(f); fprintf(f, "hello from adam test"); fclose(f); // Read it — should succeed arena_reset(a); - args = "{\"path\":\"/tmp/adam_test_read.txt\"}"; + args = "{\"path\":\"" TEST_TMP "/adam_test_read.txt\"}"; r = adam_tool_file_read(a, s, args, strlen(args)); ASSERT_EQ(r.success, 1); ASSERT_STR_EQ(r.for_llm, "hello from adam test"); // Try to escape sandbox arena_reset(a); - args = "{\"path\":\"/tmp/../etc/hosts\"}"; + args = "{\"path\":\"" TEST_TMP "/../etc/hosts\"}"; r = adam_tool_file_read(a, s, args, strlen(args)); ASSERT_EQ(r.success, 0); ASSERT(strstr(r.for_llm, "denied") != NULL); - remove("/tmp/adam_test_read.txt"); + remove(TEST_TMP "/adam_test_read.txt"); arena_destroy(a); adam_settings_destroy(s); } @@ -3582,17 +3595,17 @@ TEST(tool_file_read_sandbox) { TEST(tool_file_write_sandbox) { arena_t *a = arena_create(4096); adam_settings_t *s = adam_create_settings(); - ASSERT_EQ(adam_settings_allow_dir(s, "/tmp"), ADAM_OK); + ASSERT_EQ(adam_settings_allow_dir(s, TEST_TMP), ADAM_OK); // Write a file - const char *args = "{\"path\":\"/tmp/adam_test_write.txt\"," + const char *args = "{\"path\":\"" TEST_TMP "/adam_test_write.txt\"," "\"content\":\"test content\"}"; adam_tool_result_t r = adam_tool_file_write(a, s, args, strlen(args)); ASSERT_EQ(r.success, 1); ASSERT(strstr(r.for_llm, "Wrote") != NULL); // Verify contents - FILE *f = fopen("/tmp/adam_test_write.txt", "r"); + FILE *f = fopen(TEST_TMP "/adam_test_write.txt", "r"); ASSERT_NOT_NULL(f); char buf[64]; size_t n = fread(buf, 1, 63, f); @@ -3602,12 +3615,12 @@ TEST(tool_file_write_sandbox) { // Append arena_reset(a); - args = "{\"path\":\"/tmp/adam_test_write.txt\"," + args = "{\"path\":\"" TEST_TMP "/adam_test_write.txt\"," "\"content\":\" appended\",\"append\":true}"; r = adam_tool_file_write(a, s, args, strlen(args)); ASSERT_EQ(r.success, 1); - f = fopen("/tmp/adam_test_write.txt", "r"); + f = fopen(TEST_TMP "/adam_test_write.txt", "r"); n = fread(buf, 1, 63, f); buf[n] = '\0'; fclose(f); @@ -3620,7 +3633,7 @@ TEST(tool_file_write_sandbox) { ASSERT_EQ(r.success, 0); ASSERT(strstr(r.for_llm, "denied") != NULL); - remove("/tmp/adam_test_write.txt"); + remove(TEST_TMP "/adam_test_write.txt"); arena_destroy(a); adam_settings_destroy(s); } @@ -3628,14 +3641,14 @@ TEST(tool_file_write_sandbox) { TEST(tool_list_directory_sandbox) { arena_t *a = arena_create(64 * 1024); adam_settings_t *s = adam_create_settings(); - ASSERT_EQ(adam_settings_allow_dir(s, "/tmp"), ADAM_OK); + ASSERT_EQ(adam_settings_allow_dir(s, TEST_TMP), ADAM_OK); // Create test directory with a file - adam_mkdir("/tmp/adam_test_dir", 0755); - FILE *f = fopen("/tmp/adam_test_dir/test.txt", "w"); + adam_mkdir(TEST_TMP "/adam_test_dir", 0755); + FILE *f = fopen(TEST_TMP "/adam_test_dir/test.txt", "w"); if (f) { fputs("x", f); fclose(f); } - const char *args = "{\"path\":\"/tmp/adam_test_dir\"}"; + const char *args = "{\"path\":\"" TEST_TMP "/adam_test_dir\"}"; adam_tool_result_t r = adam_tool_list_directory(a, s, args, strlen(args)); ASSERT_EQ(r.success, 1); ASSERT(strstr(r.for_llm, "test.txt") != NULL); @@ -3647,8 +3660,8 @@ TEST(tool_list_directory_sandbox) { r = adam_tool_list_directory(a, s, args, strlen(args)); ASSERT_EQ(r.success, 0); - remove("/tmp/adam_test_dir/test.txt"); - rmdir("/tmp/adam_test_dir"); + remove(TEST_TMP "/adam_test_dir/test.txt"); + rmdir(TEST_TMP "/adam_test_dir"); arena_destroy(a); adam_settings_destroy(s); } @@ -3664,7 +3677,7 @@ TEST(tool_shell_exec_basic) { ASSERT(strstr(r.for_llm, "denied") != NULL); // Allow /tmp - ASSERT_EQ(adam_settings_allow_dir(s, "/tmp"), ADAM_OK); + ASSERT_EQ(adam_settings_allow_dir(s, TEST_TMP), ADAM_OK); // Simple echo arena_reset(a); @@ -3691,13 +3704,13 @@ TEST(tool_allow_dir) { adam_settings_t *s = adam_create_settings(); ASSERT_EQ(s->allowed_dir_count, 0); - ASSERT_EQ(adam_settings_allow_dir(s, "/tmp"), ADAM_OK); + ASSERT_EQ(adam_settings_allow_dir(s, TEST_TMP), ADAM_OK); ASSERT_EQ(s->allowed_dir_count, 1); - ASSERT_EQ(adam_settings_allow_dir(s, "/var"), ADAM_OK); + ASSERT_EQ(adam_settings_allow_dir(s, TEST_VAR), ADAM_OK); ASSERT_EQ(s->allowed_dir_count, 2); // NULL params - ASSERT_EQ(adam_settings_allow_dir(NULL, "/tmp"), ADAM_ERR_INVALID_PARAM); + ASSERT_EQ(adam_settings_allow_dir(NULL, TEST_TMP), ADAM_ERR_INVALID_PARAM); ASSERT_EQ(adam_settings_allow_dir(s, NULL), ADAM_ERR_INVALID_PARAM); // Nonexistent dir @@ -4892,18 +4905,18 @@ TEST(integration_json_output) { TEST(integration_file_tools_sandbox) { // Write a file, read it back, list directory — all sandboxed adam_settings_t *s = adam_create_settings(); - adam_settings_allow_dir(s, "/tmp"); + adam_settings_allow_dir(s, TEST_TMP); arena_t *a = arena_create(64 * 1024); // Write - const char *w_args = "{\"path\":\"/tmp/adam_integ_test.txt\"," + const char *w_args = "{\"path\":\"" TEST_TMP "/adam_integ_test.txt\"," "\"content\":\"Hello from integration test!\"}"; adam_tool_result_t wr = adam_tool_file_write(a, s, w_args, strlen(w_args)); ASSERT_EQ(wr.success, 1); // Read back arena_reset(a); - const char *r_args = "{\"path\":\"/tmp/adam_integ_test.txt\"}"; + const char *r_args = "{\"path\":\"" TEST_TMP "/adam_integ_test.txt\"}"; adam_tool_result_t rr = adam_tool_file_read(a, s, r_args, strlen(r_args)); ASSERT_EQ(rr.success, 1); ASSERT_STR_EQ(rr.for_llm, "Hello from integration test!"); @@ -4922,7 +4935,7 @@ TEST(integration_file_tools_sandbox) { ASSERT_EQ(dr.success, 0); ASSERT(strstr(dr.for_llm, "denied") != NULL); - remove("/tmp/adam_integ_test.txt"); + remove(TEST_TMP "/adam_integ_test.txt"); arena_destroy(a); adam_settings_destroy(s); } @@ -5133,15 +5146,11 @@ int main(void) { printf("Adam Test Suite v%s\n", ADAM_VERSION_STRING); printf("============================================================\n"); - // Tests use hardcoded POSIX-style paths (`/tmp/...`, `/var`). Ensure - // both dirs exist before any test runs: - // - Linux/macOS: already there, EEXIST is fine - // - Windows MinGW: `/tmp` resolves to `:\tmp` (no MSYS path - // translation in MinGW binaries); we create it - // - Android: `/tmp` doesn't exist by default; needs adb root + remount - // (already done in CI) for mkdir at / to succeed - adam_mkdir("/tmp", 0755); - adam_mkdir("/var", 0755); + // TEST_TMP / TEST_VAR map to platform-writable dirs (see top of file). + // Ensure TEST_TMP exists so the file-sandbox / session tests can fopen / + // sqlite3_open inside it. EEXIST is fine; on Android the dir is already + // there (/data/local/tmp) and mkdir is a no-op. + adam_mkdir(TEST_TMP, 0755); adam_init(); mem_report_start(); From 5499a130d3e30a4719613cdf32d1c4b1caf97caf Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Tue, 19 May 2026 14:54:46 +0200 Subject: [PATCH 35/39] fix: update shell command for Android compatibility and ensure existence of TEST_VAR directory in tests --- src/adam_tools.c | 9 +++++++-- test/test_adam.c | 10 ++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/adam_tools.c b/src/adam_tools.c index c1593ce..0b7a599 100644 --- a/src/adam_tools.c +++ b/src/adam_tools.c @@ -615,8 +615,13 @@ adam_tool_result_t adam_tool_shell_exec(arena_t *arena, void *ctx, snprintf(full_cmd, cmd_size, "cd /d \"%s\" && cmd /c \"%s\" 2>&1", s->allowed_dirs[0], command); -#elif defined(__APPLE__) || defined(__ANDROID__) || defined(__ios__) - // macOS/iOS/Android: no GNU timeout command +#elif defined(__ANDROID__) + // Android has no /bin — sh lives at /system/bin/sh. + snprintf(full_cmd, cmd_size, + "cd \"%s\" && /system/bin/sh -c '%s' 2>&1", + s->allowed_dirs[0], command); +#elif defined(__APPLE__) || defined(__ios__) + // macOS/iOS: no GNU timeout command snprintf(full_cmd, cmd_size, "cd \"%s\" && /bin/sh -c '%s' 2>&1", s->allowed_dirs[0], command); diff --git a/test/test_adam.c b/test/test_adam.c index 748fc3a..851c669 100644 --- a/test/test_adam.c +++ b/test/test_adam.c @@ -4923,7 +4923,7 @@ TEST(integration_file_tools_sandbox) { // List directory containing the file arena_reset(a); - const char *l_args = "{\"path\":\"/tmp\"}"; + const char *l_args = "{\"path\":\"" TEST_TMP "\"}"; adam_tool_result_t lr = adam_tool_list_directory(a, s, l_args, strlen(l_args)); ASSERT_EQ(lr.success, 1); ASSERT(strstr(lr.for_llm, "adam_integ_test.txt") != NULL); @@ -5147,10 +5147,12 @@ int main(void) { printf("============================================================\n"); // TEST_TMP / TEST_VAR map to platform-writable dirs (see top of file). - // Ensure TEST_TMP exists so the file-sandbox / session tests can fopen / - // sqlite3_open inside it. EEXIST is fine; on Android the dir is already - // there (/data/local/tmp) and mkdir is a no-op. + // Ensure both exist so the file-sandbox / session / allow-dir tests can + // realpath() them. EEXIST is fine; on POSIX hosts the dirs are already + // there, on Windows MinGW we create them under the current drive root, + // on Android both point at /data/* which already exist. adam_mkdir(TEST_TMP, 0755); + adam_mkdir(TEST_VAR, 0755); adam_init(); mem_report_start(); From 380297f9c8e679234ffc249d5932f59894d42b05 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Tue, 19 May 2026 17:22:07 +0200 Subject: [PATCH 36/39] feat: add size-reduction and dead-code elimination flags for SQLite extension and main build --- Makefile | 62 +++++++++++++++++++++++++++++++++++--- extensions/sqlite/Makefile | 15 ++++++++- 2 files changed, 72 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index f797575..a238738 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,15 @@ CURL_BUILD := $(BUILD_DIR)/curl SQLITE_DIR := $(ADAM_ROOT)modules/sqlite -CFLAGS := -std=gnu11 -D_POSIX_C_SOURCE=200809L -D_GNU_SOURCE -Wall -Wextra -Wpedantic -O2 -fPIC +# Size-reduction flags. -ffunction-sections / -fdata-sections puts each +# function/variable into its own ELF section so the linker can drop unused +# ones via --gc-sections / -dead_strip. -flto lets the linker inline and +# eliminate dead code across translation units. On Mach-O the section flags +# are no-ops (Apple's linker uses subsection-via-symbols), but -flto and +# -Wl,-dead_strip still apply. +SIZE_CFLAGS := -ffunction-sections -fdata-sections -flto + +CFLAGS := -std=gnu11 -D_POSIX_C_SOURCE=200809L -D_GNU_SOURCE -Wall -Wextra -Wpedantic -O2 -fPIC $(SIZE_CFLAGS) CFLAGS += -Isrc -I$(MINIAUDIO_DIR) -I$(SQLITE_DIR) CFLAGS += -I$(LLAMA_DIR)/include -I$(LLAMA_DIR)/ggml/include -I$(LLAMA_DIR)/tools/mtmd CFLAGS += -I$(WHISPER_DIR)/include @@ -88,6 +96,15 @@ else LDFLAGS := -lpthread endif +# Dead-code elimination at link time. Pairs with -ffunction-sections / +# -fdata-sections / -flto in CFLAGS. Apple's linker uses -dead_strip +# (subsection-via-symbols); GNU ld + lld use --gc-sections. +ifneq (,$(filter $(PLATFORM),macos ios ios-sim)) +LDFLAGS += -Wl,-dead_strip -flto +else +LDFLAGS += -Wl,--gc-sections -flto +endif + # ============================================================================ # Platform-specific: Apple (NSURLSession) vs Other (libcurl + mbedtls) # ============================================================================ @@ -505,6 +522,19 @@ ifeq ($(UNAME_S),Linux) deps: build/mbedtls.stamp build/curl.stamp endif +# Flags passed to every cmake dep build (llama / whisper / mbedtls / curl): +# -fPIC archives are linked into a shared lib +# -ffunction-sections / -fdata- let the final linker drop unused symbols +# sections (gc-sections / dead_strip) +# -fvisibility=hidden don't pollute the .so dynamic symbol table +# (-fvisibility-inlines- with llama/ggml/whisper internals — we +# hidden for C++) only need to export adam_* + sqlite3_* +# -flto link-time inlining + dead code elimination +# Combined with -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON cmake also enables +# LTO at link time of any internal static archives. +DEP_CFLAGS := -fPIC -ffunction-sections -fdata-sections -fvisibility=hidden -flto +DEP_CXXFLAGS := $(DEP_CFLAGS) -fvisibility-inlines-hidden + # Stamp targets: cacheable in CI and idempotent for local dev. $(BUILD_DIR)/llama.cpp.stamp: @mkdir -p $(BUILD_DIR) @@ -517,8 +547,9 @@ $(BUILD_DIR)/llama.cpp.stamp: -DBUILD_SHARED_LIBS=OFF -DLLAMA_BUILD_TESTS=OFF \ -DLLAMA_BUILD_EXAMPLES=OFF -DLLAMA_BUILD_SERVER=OFF \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ -DCMAKE_STATIC_LIBRARY_PREFIX=lib \ - -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC \ + -DCMAKE_C_FLAGS="$(DEP_CFLAGS)" -DCMAKE_CXX_FLAGS="$(DEP_CXXFLAGS)" \ -DGGML_OPENMP=OFF \ $(PLATFORM_OPTS) $(LLAMA) cmake --build $(LLAMA_BUILD) --config Release -j$(CPUS) --target llama --target ggml --target mtmd @@ -533,8 +564,9 @@ $(BUILD_DIR)/whisper.cpp.stamp: $(BUILD_DIR)/llama.cpp.stamp -DBUILD_SHARED_LIBS=OFF -DWHISPER_BUILD_TESTS=OFF \ -DWHISPER_BUILD_EXAMPLES=OFF \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ -DCMAKE_STATIC_LIBRARY_PREFIX=lib \ - -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC \ + -DCMAKE_C_FLAGS="$(DEP_CFLAGS)" -DCMAKE_CXX_FLAGS="$(DEP_CXXFLAGS)" \ -DGGML_OPENMP=OFF \ $(PLATFORM_OPTS) $(LLAMA) $(WHISPER) cmake --build $(WHISPER_BUILD) --config Release -j$(CPUS) --target whisper @@ -557,6 +589,8 @@ $(BUILD_DIR)/mbedtls.stamp: -DENABLE_TESTING=OFF -DENABLE_PROGRAMS=OFF \ -DMBEDTLS_FATAL_WARNINGS=OFF \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ + -DCMAKE_C_FLAGS="$(DEP_CFLAGS)" -DCMAKE_CXX_FLAGS="$(DEP_CXXFLAGS)" \ $(PLATFORM_OPTS) cmake --build $(MBEDTLS_BUILD) --config Release -j$(CPUS) touch $@ @@ -569,7 +603,8 @@ $(BUILD_DIR)/curl.stamp: $(BUILD_DIR)/mbedtls.stamp -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF \ -DBUILD_SHARED_LIBS=OFF -DBUILD_CURL_EXE=OFF -DBUILD_TESTING=OFF \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC \ + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ + -DCMAKE_C_FLAGS="$(DEP_CFLAGS)" -DCMAKE_CXX_FLAGS="$(DEP_CXXFLAGS)" \ -DMBEDTLS_INCLUDE_DIR=$(MBEDTLS_DIR)/include \ -DMBEDTLS_LIBRARY=$(MBEDTLS_BUILD)/library/libmbedtls.a \ -DMBEDX509_LIBRARY=$(MBEDTLS_BUILD)/library/libmbedx509.a \ @@ -633,12 +668,31 @@ ifeq (,$(filter $(PLATFORM),macos ios ios-sim)) EXT_DEPS += $(BUILD_DIR)/mbedtls.stamp $(BUILD_DIR)/curl.stamp endif +# Strip the final shared object to drop debug symbols and the static symbol +# table. The dynamic symbol table (which holds sqlite3_adam_init) is in a +# separate ELF/Mach-O section and is preserved. Set `STRIP_DIST=0` to keep +# symbols (e.g., for local debugging of the shipped artifact). +STRIP_DIST ?= 1 +ifeq ($(PLATFORM),android) + STRIP := $(ANDROID_NDK_BIN)/llvm-strip + STRIP_FLAGS := --strip-all +else ifneq (,$(filter $(PLATFORM),macos ios ios-sim)) + STRIP := strip + STRIP_FLAGS := -x +else + STRIP := strip + STRIP_FLAGS := --strip-unneeded +endif + extension: $(DIST_DIR)/$(EXT_FILE) $(DIST_DIR)/$(EXT_FILE): $(EXT_DEPS) libadam.a @mkdir -p $(DIST_DIR) $(MAKE) -C extensions/sqlite all PLATFORM=$(PLATFORM) ARCH=$(ARCH) cp extensions/sqlite/$(EXT_FILE) $(DIST_DIR)/$(EXT_FILE) +ifeq ($(STRIP_DIST),1) + $(STRIP) $(STRIP_FLAGS) $(DIST_DIR)/$(EXT_FILE) +endif # Apple XCFramework — builds adam.dylib three times (macos, ios, ios-sim) and # bundles them into dist/adam.xcframework with framework metadata. diff --git a/extensions/sqlite/Makefile b/extensions/sqlite/Makefile index 2522dc6..b14d62f 100644 --- a/extensions/sqlite/Makefile +++ b/extensions/sqlite/Makefile @@ -57,7 +57,10 @@ endif # glibc strict-C11 hides strdup / strcasecmp / clock_gettime; Apple needs # _DARWIN_C_SOURCE; MinGW needs _GNU_SOURCE for strndup. Defining all three # is safe — each platform only honors the ones it knows about. -CFLAGS := -std=gnu11 -Wall -Wextra -O2 -fPIC +# Size-reduction flags applied uniformly to all SQLite-extension wrapper +# objects (sqlite_adam.c + adam_ext_*.c). Pairs with -Wl,--gc-sections / +# -Wl,-dead_strip + -flto in LDFLAGS below. +CFLAGS := -std=gnu11 -Wall -Wextra -O2 -fPIC -ffunction-sections -fdata-sections -flto CFLAGS += -D_POSIX_C_SOURCE=200809L -D_GNU_SOURCE -D_DARWIN_C_SOURCE=1 CFLAGS += -I$(ADAM_ROOT)/src CFLAGS += -I$(ADAM_ROOT)/modules/sqlite @@ -134,6 +137,16 @@ else LDFLAGS := -lpthread endif +# Dead-code elimination at link time + LTO across the wrapper objects and +# the input static archives (those built with -DCMAKE_INTERPROCEDURAL_- +# OPTIMIZATION=ON ship LLVM bitcode, so this can also collapse calls into +# llama / whisper / curl / mbedtls). +ifneq (,$(filter $(PLATFORM),macos ios ios-sim)) + LDFLAGS += -Wl,-dead_strip -flto +else + LDFLAGS += -Wl,--gc-sections -flto +endif + # ---------------------------------------------------------------------------- # Per-platform link / ext settings # ---------------------------------------------------------------------------- From 8e85af230040b050ba4a714a5784995aaab10ac8 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Wed, 20 May 2026 12:49:20 +0200 Subject: [PATCH 37/39] fix: clean code and optimize extension flags --- .github/workflows/main.yml | 8 ++-- Makefile | 85 +++++++++++++++----------------------- extensions/sqlite/Makefile | 4 +- 3 files changed, 39 insertions(+), 58 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1dc44aa..559155f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -237,15 +237,17 @@ jobs: MINIAUDIO_HASH=$(git -C modules/miniaudio rev-parse HEAD) MBEDTLS_HASH=$(git -C modules/mbedtls rev-parse HEAD) CURL_HASH=$(git -C modules/curl rev-parse HEAD) + # Hash both Makefiles together — extensions/sqlite/Makefile changes + # the link step (CFLAGS / LDFLAGS) and so should invalidate dep caches. if command -v sha256sum >/dev/null 2>&1; then MAKE_HASH=$(echo "$MATRIX_MAKE" | sha256sum | cut -d' ' -f1) - MAKEFILE_HASH=$(sha256sum Makefile | cut -d' ' -f1) + MAKEFILE_HASH=$(cat Makefile extensions/sqlite/Makefile | sha256sum | cut -d' ' -f1) elif command -v shasum >/dev/null 2>&1; then MAKE_HASH=$(echo "$MATRIX_MAKE" | shasum -a 256 | cut -d' ' -f1) - MAKEFILE_HASH=$(shasum -a 256 Makefile | cut -d' ' -f1) + MAKEFILE_HASH=$(cat Makefile extensions/sqlite/Makefile | shasum -a 256 | cut -d' ' -f1) else MAKE_HASH=$(echo "$MATRIX_MAKE" | openssl dgst -sha256 | cut -d' ' -f2) - MAKEFILE_HASH=$(openssl dgst -sha256 Makefile | cut -d' ' -f2) + MAKEFILE_HASH=$(cat Makefile extensions/sqlite/Makefile | openssl dgst -sha256 | cut -d' ' -f2) fi echo "llama=$LLAMA_HASH" >> $GITHUB_OUTPUT echo "whisper=$WHISPER_HASH" >> $GITHUB_OUTPUT diff --git a/Makefile b/Makefile index a238738..16a73cf 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,9 @@ else endif endif +# Non-empty when building for an Apple platform (macos / ios / ios-sim). +IS_APPLE := $(filter $(PLATFORM),macos ios ios-sim) + # CMake options pass-through from CI matrix LLAMA ?= WHISPER ?= @@ -58,12 +61,8 @@ CURL_BUILD := $(BUILD_DIR)/curl SQLITE_DIR := $(ADAM_ROOT)modules/sqlite -# Size-reduction flags. -ffunction-sections / -fdata-sections puts each -# function/variable into its own ELF section so the linker can drop unused -# ones via --gc-sections / -dead_strip. -flto lets the linker inline and -# eliminate dead code across translation units. On Mach-O the section flags -# are no-ops (Apple's linker uses subsection-via-symbols), but -flto and -# -Wl,-dead_strip still apply. +# Section flags are Mach-O no-ops (Apple's linker uses subsection-via-symbols +# unconditionally), but -flto and -Wl,-dead_strip still apply there. SIZE_CFLAGS := -ffunction-sections -fdata-sections -flto CFLAGS := -std=gnu11 -D_POSIX_C_SOURCE=200809L -D_GNU_SOURCE -Wall -Wextra -Wpedantic -O2 -fPIC $(SIZE_CFLAGS) @@ -96,10 +95,7 @@ else LDFLAGS := -lpthread endif -# Dead-code elimination at link time. Pairs with -ffunction-sections / -# -fdata-sections / -flto in CFLAGS. Apple's linker uses -dead_strip -# (subsection-via-symbols); GNU ld + lld use --gc-sections. -ifneq (,$(filter $(PLATFORM),macos ios ios-sim)) +ifneq ($(IS_APPLE),) LDFLAGS += -Wl,-dead_strip -flto else LDFLAGS += -Wl,--gc-sections -flto @@ -141,7 +137,7 @@ WHISPER_LIBS := $(WHISPER_BUILD)/src/libwhisper.a # Apple platforms (macos, ios, ios-sim) all use NSURLSession. # _DARWIN_C_SOURCE re-exposes BSD extensions (e.g. memmem) that the # global _POSIX_C_SOURCE=200809L would otherwise hide. -ifneq (,$(filter $(PLATFORM),macos ios ios-sim)) +ifneq ($(IS_APPLE),) CFLAGS += -DADAM_NO_CURL -D_DARWIN_C_SOURCE=1 LDFLAGS += -framework Foundation LDFLAGS += -framework SystemConfiguration -framework Security @@ -338,7 +334,7 @@ $(SQLITE_OBJ): $(SQLITE_DIR)/sqlite3.c # otherwise the explicit .m → .o rule overrides the .c pattern rule on Linux, # making gcc try to invoke cc1obj on adam_tts_system.m even though TTS_SYS_SRC # is set to adam_tts_system.c there. -ifneq (,$(filter $(PLATFORM),macos ios ios-sim)) +ifneq ($(IS_APPLE),) src/adam_net_apple.o: src/adam_net_apple.m $(CC) $(CFLAGS) -c $< -o $@ @@ -388,7 +384,7 @@ endif # definition and continue — only needed for the test_adam link (the # shared-extension link uses --gc-sections + archive semantics that avoid # pulling mtmd-helper.o on most platforms). -ifneq (,$(filter $(PLATFORM),macos ios ios-sim)) +ifneq ($(IS_APPLE),) TEST_MULDEF := else TEST_MULDEF := -Wl,--allow-multiple-definition @@ -400,7 +396,7 @@ endif ifeq ($(PLATFORM),android) TEST_LD := $(ANDROID_NDK_BIN)/$(NDK_TRIPLE)-clang++ TEST_LD_EXTRA := -static-libstdc++ -else ifneq (,$(filter $(PLATFORM),macos ios ios-sim)) +else ifneq ($(IS_APPLE),) TEST_LD := $(CC) TEST_LD_EXTRA := else @@ -522,36 +518,33 @@ ifeq ($(UNAME_S),Linux) deps: build/mbedtls.stamp build/curl.stamp endif -# Flags passed to every cmake dep build (llama / whisper / mbedtls / curl): -# -fPIC archives are linked into a shared lib -# -ffunction-sections / -fdata- let the final linker drop unused symbols -# sections (gc-sections / dead_strip) -# -fvisibility=hidden don't pollute the .so dynamic symbol table -# (-fvisibility-inlines- with llama/ggml/whisper internals — we -# hidden for C++) only need to export adam_* + sqlite3_* -# -flto link-time inlining + dead code elimination -# Combined with -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON cmake also enables -# LTO at link time of any internal static archives. -DEP_CFLAGS := -fPIC -ffunction-sections -fdata-sections -fvisibility=hidden -flto +# Cmake dep builds get the same size flags as adam, plus -fvisibility=hidden +# so llama/ggml/whisper/curl/mbedtls internals don't pollute the final .so's +# dynamic symbol table (only adam_* and sqlite3_adam_init need to be exported). +# Pairs with -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON for cross-archive LTO. +DEP_CFLAGS := $(SIZE_CFLAGS) -fPIC -fvisibility=hidden DEP_CXXFLAGS := $(DEP_CFLAGS) -fvisibility-inlines-hidden +# Shared cmake options for every dep (llama / whisper / mbedtls / curl). +# -DCMAKE_POSITION_INDEPENDENT_CODE=ON is required so the resulting .a +# archives can be linked into the shared extension — GNU ld on Linux / +# Windows rejects non-PIC TLS relocations; macOS arm64 is implicitly PIC. +CMAKE_DEP_OPTS := \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ + -DCMAKE_C_FLAGS="$(DEP_CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(DEP_CXXFLAGS)" + # Stamp targets: cacheable in CI and idempotent for local dev. $(BUILD_DIR)/llama.cpp.stamp: @mkdir -p $(BUILD_DIR) - @# -DCMAKE_POSITION_INDEPENDENT_CODE=ON: the resulting .a archives are - @# linked into the shared extension (dist/adam.{dylib,so,dll}), so every - @# object must be PIC. GNU ld on Linux/Windows rejects non-PIC TLS - @# relocations; macOS arm64 is implicitly PIC; Android's PLATFORM_OPTS - @# already includes this — but pass it unconditionally to be safe. cmake -B $(LLAMA_BUILD) -S $(LLAMA_DIR) \ -DBUILD_SHARED_LIBS=OFF -DLLAMA_BUILD_TESTS=OFF \ -DLLAMA_BUILD_EXAMPLES=OFF -DLLAMA_BUILD_SERVER=OFF \ - -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ -DCMAKE_STATIC_LIBRARY_PREFIX=lib \ - -DCMAKE_C_FLAGS="$(DEP_CFLAGS)" -DCMAKE_CXX_FLAGS="$(DEP_CXXFLAGS)" \ -DGGML_OPENMP=OFF \ - $(PLATFORM_OPTS) $(LLAMA) + $(CMAKE_DEP_OPTS) $(PLATFORM_OPTS) $(LLAMA) cmake --build $(LLAMA_BUILD) --config Release -j$(CPUS) --target llama --target ggml --target mtmd touch $@ @@ -563,12 +556,9 @@ $(BUILD_DIR)/whisper.cpp.stamp: $(BUILD_DIR)/llama.cpp.stamp cmake -B $(WHISPER_BUILD) -S $(WHISPER_DIR) \ -DBUILD_SHARED_LIBS=OFF -DWHISPER_BUILD_TESTS=OFF \ -DWHISPER_BUILD_EXAMPLES=OFF \ - -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ -DCMAKE_STATIC_LIBRARY_PREFIX=lib \ - -DCMAKE_C_FLAGS="$(DEP_CFLAGS)" -DCMAKE_CXX_FLAGS="$(DEP_CXXFLAGS)" \ -DGGML_OPENMP=OFF \ - $(PLATFORM_OPTS) $(LLAMA) $(WHISPER) + $(CMAKE_DEP_OPTS) $(PLATFORM_OPTS) $(LLAMA) $(WHISPER) cmake --build $(WHISPER_BUILD) --config Release -j$(CPUS) --target whisper touch $@ @@ -588,10 +578,7 @@ $(BUILD_DIR)/mbedtls.stamp: cmake -B $(MBEDTLS_BUILD) -S $(MBEDTLS_DIR) \ -DENABLE_TESTING=OFF -DENABLE_PROGRAMS=OFF \ -DMBEDTLS_FATAL_WARNINGS=OFF \ - -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ - -DCMAKE_C_FLAGS="$(DEP_CFLAGS)" -DCMAKE_CXX_FLAGS="$(DEP_CXXFLAGS)" \ - $(PLATFORM_OPTS) + $(CMAKE_DEP_OPTS) $(PLATFORM_OPTS) cmake --build $(MBEDTLS_BUILD) --config Release -j$(CPUS) touch $@ @@ -602,14 +589,11 @@ $(BUILD_DIR)/curl.stamp: $(BUILD_DIR)/mbedtls.stamp -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DUSE_NGHTTP2=OFF \ -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF \ -DBUILD_SHARED_LIBS=OFF -DBUILD_CURL_EXE=OFF -DBUILD_TESTING=OFF \ - -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ - -DCMAKE_C_FLAGS="$(DEP_CFLAGS)" -DCMAKE_CXX_FLAGS="$(DEP_CXXFLAGS)" \ -DMBEDTLS_INCLUDE_DIR=$(MBEDTLS_DIR)/include \ -DMBEDTLS_LIBRARY=$(MBEDTLS_BUILD)/library/libmbedtls.a \ -DMBEDX509_LIBRARY=$(MBEDTLS_BUILD)/library/libmbedx509.a \ -DMBEDCRYPTO_LIBRARY=$(MBEDTLS_BUILD)/library/libmbedcrypto.a \ - $(PLATFORM_OPTS) + $(CMAKE_DEP_OPTS) $(PLATFORM_OPTS) cmake --build $(CURL_BUILD) --config Release -j$(CPUS) touch $@ @@ -664,19 +648,16 @@ endif # Non-Apple platforms (linux, windows, android) need libcurl + mbedtls. EXT_DEPS := $(BUILD_DIR)/llama.cpp.stamp $(BUILD_DIR)/whisper.cpp.stamp $(BUILD_DIR)/miniaudio.stamp -ifeq (,$(filter $(PLATFORM),macos ios ios-sim)) +ifeq ($(IS_APPLE),) EXT_DEPS += $(BUILD_DIR)/mbedtls.stamp $(BUILD_DIR)/curl.stamp endif -# Strip the final shared object to drop debug symbols and the static symbol -# table. The dynamic symbol table (which holds sqlite3_adam_init) is in a -# separate ELF/Mach-O section and is preserved. Set `STRIP_DIST=0` to keep -# symbols (e.g., for local debugging of the shipped artifact). +# Set STRIP_DIST=0 to keep symbols when debugging the shipped artifact. STRIP_DIST ?= 1 ifeq ($(PLATFORM),android) STRIP := $(ANDROID_NDK_BIN)/llvm-strip STRIP_FLAGS := --strip-all -else ifneq (,$(filter $(PLATFORM),macos ios ios-sim)) +else ifneq ($(IS_APPLE),) STRIP := strip STRIP_FLAGS := -x else diff --git a/extensions/sqlite/Makefile b/extensions/sqlite/Makefile index b14d62f..bd2f43a 100644 --- a/extensions/sqlite/Makefile +++ b/extensions/sqlite/Makefile @@ -57,9 +57,7 @@ endif # glibc strict-C11 hides strdup / strcasecmp / clock_gettime; Apple needs # _DARWIN_C_SOURCE; MinGW needs _GNU_SOURCE for strndup. Defining all three # is safe — each platform only honors the ones it knows about. -# Size-reduction flags applied uniformly to all SQLite-extension wrapper -# objects (sqlite_adam.c + adam_ext_*.c). Pairs with -Wl,--gc-sections / -# -Wl,-dead_strip + -flto in LDFLAGS below. +# Section flags pair with -Wl,--gc-sections / -Wl,-dead_strip below. CFLAGS := -std=gnu11 -Wall -Wextra -O2 -fPIC -ffunction-sections -fdata-sections -flto CFLAGS += -D_POSIX_C_SOURCE=200809L -D_GNU_SOURCE -D_DARWIN_C_SOURCE=1 CFLAGS += -I$(ADAM_ROOT)/src From 92e2d721cf1dc4d327281ab22a198a6c669e63f4 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Wed, 20 May 2026 13:28:22 +0200 Subject: [PATCH 38/39] fix: move platform-specific shared-extension filename logic in Makefile --- Makefile | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 16a73cf..62e4583 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,17 @@ endif # Non-empty when building for an Apple platform (macos / ios / ios-sim). IS_APPLE := $(filter $(PLATFORM),macos ios ios-sim) +# Shared-extension filename per platform. Defined here (not down in the CI +# section) because the test target references EXT_FILE before that section +# is parsed, and `:=` would otherwise capture an empty value. +ifeq ($(PLATFORM),windows) + EXT_FILE := adam.dll +else ifneq ($(IS_APPLE),) + EXT_FILE := adam.dylib +else + EXT_FILE := adam.so +endif + # CMake options pass-through from CI matrix LLAMA ?= WHISPER ?= @@ -634,18 +645,6 @@ version: # Loadable SQLite extension: dist/adam.{dylib,so,dll}. # Wraps extensions/sqlite/Makefile after libadam.a + dependencies are built. -ifeq ($(PLATFORM),windows) - EXT_FILE := adam.dll -else ifeq ($(PLATFORM),macos) - EXT_FILE := adam.dylib -else ifeq ($(PLATFORM),ios) - EXT_FILE := adam.dylib -else ifeq ($(PLATFORM),ios-sim) - EXT_FILE := adam.dylib -else - EXT_FILE := adam.so -endif - # Non-Apple platforms (linux, windows, android) need libcurl + mbedtls. EXT_DEPS := $(BUILD_DIR)/llama.cpp.stamp $(BUILD_DIR)/whisper.cpp.stamp $(BUILD_DIR)/miniaudio.stamp ifeq ($(IS_APPLE),) From ba2e8d4f26afd5606f9dc0831a771a316f4c2153 Mon Sep 17 00:00:00 2001 From: Gioele Cantoni Date: Wed, 20 May 2026 14:04:04 +0200 Subject: [PATCH 39/39] fix: update Package.swift checksum handling and add artifact existence check --- .github/workflows/main.yml | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 559155f..0277a71 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -628,26 +628,35 @@ jobs: run: cd packages/android && ./gradlew publishAggregationToCentralPortal -PSIGNING_KEY="${{ secrets.SIGNING_KEY }}" -PSIGNING_PASSWORD="${{ secrets.SIGNING_PASSWORD }}" -PSONATYPE_USERNAME="${{ secrets.MAVEN_CENTRAL_USERNAME }}" -PSONATYPE_PASSWORD="${{ secrets.MAVEN_CENTRAL_TOKEN }}" -PVERSION="${{ steps.tag.outputs.version }}" -PAAR_PATH="../../artifacts/adam-android-aar/adam.aar" - name: update Package.swift checksum and version + id: package-swift if: steps.tag.outputs.version != '' run: | VERSION=${{ steps.tag.outputs.version }} ZIP="adam-apple-xcframework-${VERSION}.zip" - if [ -f "$ZIP" ]; then - CHECKSUM=$(swift package compute-checksum "$ZIP") - URL="https://github.com/sqliteai/adam/releases/download/${VERSION}/${ZIP}" - sed -i "s|url: \".*apple-xcframework.*\"|url: \"${URL}\"|" Package.swift - sed -i "s|checksum: \".*\"|checksum: \"${CHECKSUM}\"|" Package.swift - git config --global user.email "$GITHUB_ACTOR@users.noreply.github.com" - git config --global user.name "$GITHUB_ACTOR" - git add Package.swift - git commit -m "Update Package.swift checksum for ${VERSION} [auto-update]" || true - git push origin main || true + if [ ! -f "$ZIP" ]; then + echo "::warning::xcframework artifact not found; skipping Package.swift update" + exit 0 + fi + CHECKSUM=$(swift package compute-checksum "$ZIP") + URL="https://github.com/sqliteai/adam/releases/download/${VERSION}/${ZIP}" + sed -i "s|url: \".*apple-xcframework.*\"|url: \"${URL}\"|" Package.swift + sed -i "s|checksum: \".*\"|checksum: \"${CHECKSUM}\"|" Package.swift + if git diff --quiet Package.swift; then + echo "Package.swift already up to date for ${VERSION}" + exit 0 fi + git config --global user.email "$GITHUB_ACTOR@users.noreply.github.com" + git config --global user.name "$GITHUB_ACTOR" + git add Package.swift + git commit -m "Update Package.swift checksum for ${VERSION} [auto-update]" + git push origin main + echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT" - uses: softprops/action-gh-release@v2.2.1 if: steps.tag.outputs.version != '' with: token: ${{ secrets.RELEASE_PAT }} + target_commitish: ${{ steps.package-swift.outputs.sha }} body: | # Packages