From 6dae6acdaae84d34402128c618de1d78963d937d Mon Sep 17 00:00:00 2001 From: m0nsky Date: Tue, 17 Feb 2026 09:04:07 +0100 Subject: [PATCH 1/2] Fix some merge damage --- .github/workflows/compile.yml | 193 +++++++++++++++------------------- 1 file changed, 85 insertions(+), 108 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 40eab3523..2dd422e52 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -17,7 +17,7 @@ concurrency: env: # Compiler defines common to all platforms - COMMON_DEFINE: -DGGML_NATIVE=OFF -DLLAMA_BUILD_TESTS=OFF -DLLAMA_CURL=OFF -DBUILD_SHARED_LIBS=ON + COMMON_DEFINE: -DGGML_NATIVE=OFF -DLLAMA_BUILD_TESTS=OFF -DLLAMA_OPENSSL=OFF -DBUILD_SHARED_LIBS=ON LINUX_RPATH_DEFINE: "-DCMAKE_INSTALL_RPATH='$ORIGIN' -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" jobs: @@ -82,11 +82,10 @@ jobs: path: ./build/bin/libggml-cpu.so name: ggml-cpu-bin-linux-${{ matrix.build }}-${{ matrix.arch }}.so if-no-files-found: error - - name: Upload Llava - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v4 with: - path: ./build/bin/libllava_shared.so - name: llava-bin-linux-${{ matrix.build }}-${{ matrix.arch }}.so + path: ./build/bin/libmtmd.so + name: mtmd-bin-linux-${{ matrix.build }}-${{ matrix.arch }}.so if-no-files-found: error compile-musl: @@ -148,11 +147,10 @@ jobs: path: ./build/bin/libggml-cpu.so name: ggml-cpu-bin-musl-${{ matrix.build }}-x64.so if-no-files-found: error - - name: Upload Llava - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v4 with: - path: ./build/bin/libllava_shared.so - name: llava-bin-musl-${{ matrix.build }}-x64.so + path: ./build/bin/libmtmd.so + name: mtmd-bin-musl-${{ matrix.build }}-x64.so if-no-files-found: error compile-windows: @@ -163,16 +161,12 @@ jobs: include: - build: 'noavx' defines: '-DGGML_AVX=OFF -DGGML_AVX2=OFF -DGGML_FMA=OFF' - arch: 'x64' - build: 'avx2' defines: '' - arch: 'x64' - build: 'avx' defines: '-DGGML_AVX2=OFF' - arch: 'x64' - build: 'avx512' defines: '-DGGML_AVX512=ON -DGGML_AVX512_VBMI=ON -DGGML_AVX512_VNNI=ON' - arch: 'x64' runs-on: windows-latest steps: - uses: actions/checkout@v4 @@ -194,32 +188,31 @@ jobs: uses: actions/upload-artifact@v4 with: path: .\build\bin\Release\llama.dll - name: llama-bin-win-${{ matrix.build }}-${{ matrix.arch }}.dll + name: llama-bin-win-${{ matrix.build }}-x64.dll if-no-files-found: error - name: Upload artifacts (ggml) uses: actions/upload-artifact@v4 with: path: .\build\bin\Release\ggml.dll - name: ggml-bin-win-${{ matrix.build }}-${{ matrix.arch }}.dll + name: ggml-bin-win-${{ matrix.build }}-x64.dll if-no-files-found: error - name: Upload artifacts (ggml-base) uses: actions/upload-artifact@v4 with: path: .\build\bin\Release\ggml-base.dll - name: ggml-base-bin-win-${{ matrix.build }}-${{ matrix.arch }}.dll + name: ggml-base-bin-win-${{ matrix.build }}-x64.dll if-no-files-found: error - name: Upload artifacts (ggml-cpu) uses: actions/upload-artifact@v4 with: path: .\build\bin\Release\ggml-cpu.dll - name: ggml-cpu-bin-win-${{ matrix.build }}-${{ matrix.arch }}.dll + name: ggml-cpu-bin-win-${{ matrix.build }}-x64.dll if-no-files-found: error - - - name: Upload artifacts (llava) + - name: Upload artifacts (mtmd) uses: actions/upload-artifact@v4 with: - path: .\build\bin\Release\llava_shared.dll - name: llava-bin-win-${{ matrix.build }}-${{ matrix.arch }}.dll + path: .\build\bin\Release\mtmd.dll + name: mtmd-bin-win-${{ matrix.build }}-x64.dll if-no-files-found: error compile-windows-arm64: @@ -230,7 +223,6 @@ jobs: include: - build: 'arm64' defines: '-DCMAKE_GENERATOR_PLATFORM=ARM64 -DGGML_NATIVE=OFF -DGGML_AVX=OFF -DGGML_AVX2=OFF -DGGML_FMA=OFF' - arch: 'arm64' runs-on: windows-latest steps: - uses: actions/checkout@v4 @@ -252,34 +244,33 @@ jobs: uses: actions/upload-artifact@v4 with: path: .\build\bin\Release\llama.dll - name: llama-bin-win-${{ matrix.build }}-${{ matrix.arch }}.dll + name: llama-bin-win-${{ matrix.build }}-arm64.dll if-no-files-found: error - name: Upload artifacts (ggml) uses: actions/upload-artifact@v4 with: path: .\build\bin\Release\ggml.dll - name: ggml-bin-win-${{ matrix.build }}-${{ matrix.arch }}.dll + name: ggml-bin-win-${{ matrix.build }}-arm64.dll if-no-files-found: error - name: Upload artifacts (ggml-base) uses: actions/upload-artifact@v4 with: path: .\build\bin\Release\ggml-base.dll - name: ggml-base-bin-win-${{ matrix.build }}-${{ matrix.arch }}.dll + name: ggml-base-bin-win-${{ matrix.build }}-arm64.dll if-no-files-found: error - name: Upload artifacts (ggml-cpu) uses: actions/upload-artifact@v4 with: path: .\build\bin\Release\ggml-cpu.dll - name: ggml-cpu-bin-win-${{ matrix.build }}-${{ matrix.arch }}.dll + name: ggml-cpu-bin-win-${{ matrix.build }}-arm64.dll if-no-files-found: error - - - name: Upload artifacts (llava) + - name: Upload artifacts (mtmd) uses: actions/upload-artifact@v4 with: - path: .\build\bin\Release\llava_shared.dll - name: llava-bin-win-${{ matrix.build }}-${{ matrix.arch }}.dll + path: .\build\bin\Release\mtmd.dll + name: mtmd-bin-win-${{ matrix.build }}-arm64.dll if-no-files-found: error - + compile-vulkan: name: Compile (vulkan) - ${{ matrix.os }} strategy: @@ -316,7 +307,7 @@ jobs: & "$env:RUNNER_TEMP\VulkanSDK-Installer.exe" --accept-licenses --default-answer --confirm-command install Add-Content $env:GITHUB_ENV "VULKAN_SDK=C:\VulkanSDK\${env:VULKAN_VERSION}" Add-Content $env:GITHUB_PATH "C:\VulkanSDK\${env:VULKAN_VERSION}\bin" - - name: Build + - name: Build (Windows) id: cmake_build if: ${{ matrix.os == 'windows-latest' }} run: | @@ -325,7 +316,7 @@ jobs: cmake .. ${{ env.COMMON_DEFINE }} -DGGML_VULKAN=ON cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS} ls -R - - name: Build + - name: Build (Linux) if: ${{ matrix.os == 'ubuntu-22.04' }} run: | mkdir build @@ -361,12 +352,12 @@ jobs: path: .\build\bin\Release\ggml-vulkan.dll name: ggml-vulkan-bin-win-vulkan-x64.dll if-no-files-found: error - - name: Upload llava artifacts (Windows) + - name: Upload mtmd artifacts (Windows) if: ${{ matrix.os == 'windows-latest' }} uses: actions/upload-artifact@v4 with: - path: .\build\bin\Release\llava_shared.dll - name: llava-bin-win-vulkan-x64.dll + path: .\build\bin\Release\mtmd.dll + name: mtmd-bin-win-vulkan-x64.dll if-no-files-found: error - name: Upload llama artifacts (Linux) if: ${{ matrix.os == 'ubuntu-22.04' }} @@ -396,21 +387,21 @@ jobs: path: ./build/bin/libggml-vulkan.so name: ggml-vulkan-bin-linux-vulkan-x64.so if-no-files-found: error - - name: Upload llava artifacts (Linux) + - name: Upload mtmd artifacts (Linux) if: ${{ matrix.os == 'ubuntu-22.04' }} uses: actions/upload-artifact@v4 with: - path: ./build/bin/libllava_shared.so - name: llava-bin-linux-vulkan-x64.so + path: ./build/bin/libmtmd.so + name: mtmd-bin-linux-vulkan-x64.so if-no-files-found: error - + compile-cublas: name: Compile (cublas) strategy: fail-fast: false matrix: - os: [ubuntu-22.04, windows-2019] - cuda: ['12.2.0', '11.7.1'] + os: [ubuntu-22.04, windows-2022] + cuda: ['12.4.0'] runs-on: ${{ matrix.os }} steps: - name: Clone @@ -460,39 +451,39 @@ jobs: ls -R - name: Upload artifacts (Windows) - if: ${{ matrix.os == 'windows-2019' }} + if: ${{ matrix.os == 'windows-2022' }} uses: actions/upload-artifact@v4 with: path: .\build\bin\Release\llama.dll name: llama-bin-win-cublas-cu${{ matrix.cuda }}-x64.dll if-no-files-found: error - name: Upload artifacts (ggml) - if: ${{ matrix.os == 'windows-2019' }} + if: ${{ matrix.os == 'windows-2022' }} uses: actions/upload-artifact@v4 with: path: .\build\bin\Release\ggml.dll name: ggml-bin-win-cublas-cu${{ matrix.cuda }}-x64.dll if-no-files-found: error - name: Upload artifacts (ggml-base) - if: ${{ matrix.os == 'windows-2019' }} + if: ${{ matrix.os == 'windows-2022' }} uses: actions/upload-artifact@v4 with: path: .\build\bin\Release\ggml-base.dll name: ggml-base-bin-win-cublas-cu${{ matrix.cuda }}-x64.dll if-no-files-found: error - name: Upload artifacts (ggml-cuda) - if: ${{ matrix.os == 'windows-2019' }} + if: ${{ matrix.os == 'windows-2022' }} uses: actions/upload-artifact@v4 with: path: .\build\bin\Release\ggml-cuda.dll name: ggml-cuda-bin-win-cublas-cu${{ matrix.cuda }}-x64.dll if-no-files-found: error - - name: Upload llava artifacts (Windows) - if: ${{ matrix.os == 'windows-2019' }} + - name: Upload mtmd artifacts (Windows) + if: ${{ matrix.os == 'windows-2022' }} uses: actions/upload-artifact@v4 with: - path: .\build\bin\Release\llava_shared.dll - name: llava-bin-win-cublas-cu${{ matrix.cuda }}-x64.dll + path: .\build\bin\Release\mtmd.dll + name: mtmd-bin-win-cublas-cu${{ matrix.cuda }}-x64.dll if-no-files-found: error - name: Upload artifacts (Linux) @@ -523,14 +514,14 @@ jobs: path: ./build/bin/libggml-cuda.so name: ggml-cuda-bin-linux-cublas-cu${{ matrix.cuda }}-x64.so if-no-files-found: error - - name: Upload llava artifacts (Linux) + - name: Upload mtmd artifacts (Linux) if: ${{ matrix.os == 'ubuntu-22.04' }} uses: actions/upload-artifact@v4 with: - path: ./build/bin/libllava_shared.so - name: llava-bin-linux-cublas-cu${{ matrix.cuda }}-x64.so + path: ./build/bin/libmtmd.so + name: mtmd-bin-linux-cublas-cu${{ matrix.cuda }}-x64.so if-no-files-found: error - + compile-macos: name: Compile (MacOS) strategy: @@ -545,7 +536,7 @@ jobs: defines: '-DCMAKE_OSX_ARCHITECTURES=x86_64 -DGGML_METAL=OFF -DGGML_AVX=OFF -DGGML_AVX2=OFF' env: MACOS_RPATH_DEFINE: "-DCMAKE_INSTALL_RPATH='@loader_path' -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" - runs-on: macos-14 + runs-on: macos-14 steps: - uses: actions/checkout@v4 with: @@ -601,11 +592,11 @@ jobs: path: ./build/bin/libllama.dylib name: llama-bin-osx-${{ matrix.build }}.dylib if-no-files-found: error - - name: Upload Llava + - name: Upload mtmd uses: actions/upload-artifact@v4 with: - path: ./build/bin/libllava_shared.dylib - name: llava-bin-osx-${{ matrix.build }}.dylib + path: ./build/bin/libmtmd.dylib + name: mtmd-bin-osx-${{ matrix.build }}.dylib if-no-files-found: error compile-android: name: Compile (Android) @@ -661,11 +652,11 @@ jobs: path: ./build/bin/libggml-cpu.so name: ggml-cpu-bin-android-${{ matrix.build }}.so if-no-files-found: error - - name: Upload Llava + - name: Upload mtmd uses: actions/upload-artifact@v4 with: - path: ./build/bin/libllava_shared.so - name: llava-bin-android-${{ matrix.build }}.so + path: ./build/bin/libmtmd.so + name: mtmd-bin-android-${{ matrix.build }}.so build-deps: runs-on: ubuntu-latest @@ -681,7 +672,7 @@ jobs: "compile-macos", "compile-android" ] - steps: + steps: - uses: actions/download-artifact@v4 with: path: artifacts @@ -690,96 +681,96 @@ jobs: - name: Rearrange Files run: | # Make all directories at once - mkdir --parents deps/{noavx,avx,avx2,avx512,linux-arm64,musl-noavx,musl-avx,musl-avx2,musl-avx512,osx-arm64,osx-x64,osx-x64-rosetta2,cu11.7.1,cu12.2.0,vulkan,android-arm64-v8a,android-x86,android-x86_64,win-arm64} + mkdir --parents deps/{noavx,avx,avx2,avx512,linux-arm64,musl-noavx,musl-avx,musl-avx2,musl-avx512,osx-arm64,osx-x64,osx-x64-rosetta2,cu12.4.0,vulkan,android-arm64-v8a,android-x86,android-x86_64,win-arm64} # Linux cp artifacts/ggml-bin-linux-noavx-x64.so/libggml.so deps/noavx/libggml.so cp artifacts/ggml-base-bin-linux-noavx-x64.so/libggml-base.so deps/noavx/libggml-base.so cp artifacts/ggml-cpu-bin-linux-noavx-x64.so/libggml-cpu.so deps/noavx/libggml-cpu.so cp artifacts/llama-bin-linux-noavx-x64.so/libllama.so deps/noavx/libllama.so - cp artifacts/llava-bin-linux-noavx-x64.so/libllava_shared.so deps/noavx/libllava_shared.so + cp artifacts/mtmd-bin-linux-noavx-x64.so/libmtmd.so deps/noavx/libmtmd.so cp artifacts/ggml-bin-linux-avx-x64.so/libggml.so deps/avx/libggml.so cp artifacts/ggml-base-bin-linux-avx-x64.so/libggml-base.so deps/avx/libggml-base.so cp artifacts/ggml-cpu-bin-linux-avx-x64.so/libggml-cpu.so deps/avx/libggml-cpu.so cp artifacts/llama-bin-linux-avx-x64.so/libllama.so deps/avx/libllama.so - cp artifacts/llava-bin-linux-avx-x64.so/libllava_shared.so deps/avx/libllava_shared.so + cp artifacts/mtmd-bin-linux-avx-x64.so/libmtmd.so deps/avx/libmtmd.so cp artifacts/ggml-bin-linux-avx2-x64.so/libggml.so deps/avx2/libggml.so cp artifacts/ggml-base-bin-linux-avx2-x64.so/libggml-base.so deps/avx2/libggml-base.so cp artifacts/ggml-cpu-bin-linux-avx2-x64.so/libggml-cpu.so deps/avx2/libggml-cpu.so cp artifacts/llama-bin-linux-avx2-x64.so/libllama.so deps/avx2/libllama.so - cp artifacts/llava-bin-linux-avx2-x64.so/libllava_shared.so deps/avx2/libllava_shared.so + cp artifacts/mtmd-bin-linux-avx2-x64.so/libmtmd.so deps/avx2/libmtmd.so cp artifacts/ggml-bin-linux-avx512-x64.so/libggml.so deps/avx512/libggml.so cp artifacts/ggml-base-bin-linux-avx512-x64.so/libggml-base.so deps/avx512/libggml-base.so cp artifacts/ggml-cpu-bin-linux-avx512-x64.so/libggml-cpu.so deps/avx512/libggml-cpu.so cp artifacts/llama-bin-linux-avx512-x64.so/libllama.so deps/avx512/libllama.so - cp artifacts/llava-bin-linux-avx512-x64.so/libllava_shared.so deps/avx512/libllava_shared.so + cp artifacts/mtmd-bin-linux-avx512-x64.so/libmtmd.so deps/avx512/libmtmd.so # Arm64 cp artifacts/ggml-bin-linux-aarch64-arm64.so/libggml.so deps/linux-arm64/libggml.so cp artifacts/ggml-base-bin-linux-aarch64-arm64.so/libggml-base.so deps/linux-arm64/libggml-base.so cp artifacts/ggml-cpu-bin-linux-aarch64-arm64.so/libggml-cpu.so deps/linux-arm64/libggml-cpu.so cp artifacts/llama-bin-linux-aarch64-arm64.so/libllama.so deps/linux-arm64/libllama.so - cp artifacts/llava-bin-linux-aarch64-arm64.so/libllava_shared.so deps/linux-arm64/libllava_shared.so + cp artifacts/mtmd-bin-linux-aarch64-arm64.so/libmtmd.so deps/linux-arm64/libmtmd.so # Musl cp artifacts/ggml-bin-musl-noavx-x64.so/libggml.so deps/musl-noavx/libggml.so cp artifacts/ggml-base-bin-musl-noavx-x64.so/libggml-base.so deps/musl-noavx/libggml-base.so cp artifacts/ggml-cpu-bin-musl-noavx-x64.so/libggml-cpu.so deps/musl-noavx/libggml-cpu.so cp artifacts/llama-bin-musl-noavx-x64.so/libllama.so deps/musl-noavx/libllama.so - cp artifacts/llava-bin-musl-noavx-x64.so/libllava_shared.so deps/musl-noavx/libllava_shared.so + cp artifacts/mtmd-bin-musl-noavx-x64.so/libmtmd.so deps/musl-noavx/libmtmd.so cp artifacts/ggml-bin-musl-avx-x64.so/libggml.so deps/musl-avx/libggml.so cp artifacts/ggml-base-bin-musl-avx-x64.so/libggml-base.so deps/musl-avx/libggml-base.so cp artifacts/ggml-cpu-bin-musl-avx-x64.so/libggml-cpu.so deps/musl-avx/libggml-cpu.so cp artifacts/llama-bin-musl-avx-x64.so/libllama.so deps/musl-avx/libllama.so - cp artifacts/llava-bin-musl-avx-x64.so/libllava_shared.so deps/musl-avx/libllava_shared.so + cp artifacts/mtmd-bin-musl-avx-x64.so/libmtmd.so deps/musl-avx/libmtmd.so cp artifacts/ggml-bin-musl-avx2-x64.so/libggml.so deps/musl-avx2/libggml.so cp artifacts/ggml-base-bin-musl-avx2-x64.so/libggml-base.so deps/musl-avx2/libggml-base.so cp artifacts/ggml-cpu-bin-musl-avx2-x64.so/libggml-cpu.so deps/musl-avx2/libggml-cpu.so cp artifacts/llama-bin-musl-avx2-x64.so/libllama.so deps/musl-avx2/libllama.so - cp artifacts/llava-bin-musl-avx2-x64.so/libllava_shared.so deps/musl-avx2/libllava_shared.so + cp artifacts/mtmd-bin-musl-avx2-x64.so/libmtmd.so deps/musl-avx2/libmtmd.so cp artifacts/ggml-bin-musl-avx512-x64.so/libggml.so deps/musl-avx512/libggml.so cp artifacts/ggml-base-bin-musl-avx512-x64.so/libggml-base.so deps/musl-avx512/libggml-base.so cp artifacts/ggml-cpu-bin-musl-avx512-x64.so/libggml-cpu.so deps/musl-avx512/libggml-cpu.so cp artifacts/llama-bin-musl-avx512-x64.so/libllama.so deps/musl-avx512/libllama.so - cp artifacts/llava-bin-musl-avx512-x64.so/libllava_shared.so deps/musl-avx512/libllava_shared.so + cp artifacts/mtmd-bin-musl-avx512-x64.so/libmtmd.so deps/musl-avx512/libmtmd.so # Windows cp artifacts/ggml-bin-win-noavx-x64.dll/ggml.dll deps/noavx/ggml.dll cp artifacts/ggml-base-bin-win-noavx-x64.dll/ggml-base.dll deps/noavx/ggml-base.dll cp artifacts/ggml-cpu-bin-win-noavx-x64.dll/ggml-cpu.dll deps/noavx/ggml-cpu.dll cp artifacts/llama-bin-win-noavx-x64.dll/llama.dll deps/noavx/llama.dll - cp artifacts/llava-bin-win-noavx-x64.dll/llava_shared.dll deps/noavx/llava_shared.dll + cp artifacts/mtmd-bin-win-noavx-x64.dll/mtmd.dll deps/noavx/mtmd.dll cp artifacts/ggml-bin-win-avx-x64.dll/ggml.dll deps/avx/ggml.dll cp artifacts/ggml-base-bin-win-avx-x64.dll/ggml-base.dll deps/avx/ggml-base.dll cp artifacts/ggml-cpu-bin-win-avx-x64.dll/ggml-cpu.dll deps/avx/ggml-cpu.dll cp artifacts/llama-bin-win-avx-x64.dll/llama.dll deps/avx/llama.dll - cp artifacts/llava-bin-win-avx-x64.dll/llava_shared.dll deps/avx/llava_shared.dll + cp artifacts/mtmd-bin-win-avx-x64.dll/mtmd.dll deps/avx/mtmd.dll cp artifacts/ggml-bin-win-avx2-x64.dll/ggml.dll deps/avx2/ggml.dll cp artifacts/ggml-base-bin-win-avx2-x64.dll/ggml-base.dll deps/avx2/ggml-base.dll cp artifacts/ggml-cpu-bin-win-avx2-x64.dll/ggml-cpu.dll deps/avx2/ggml-cpu.dll cp artifacts/llama-bin-win-avx2-x64.dll/llama.dll deps/avx2/llama.dll - cp artifacts/llava-bin-win-avx2-x64.dll/llava_shared.dll deps/avx2/llava_shared.dll + cp artifacts/mtmd-bin-win-avx2-x64.dll/mtmd.dll deps/avx2/mtmd.dll cp artifacts/ggml-bin-win-avx512-x64.dll/ggml.dll deps/avx512/ggml.dll cp artifacts/ggml-base-bin-win-avx512-x64.dll/ggml-base.dll deps/avx512/ggml-base.dll cp artifacts/ggml-cpu-bin-win-avx512-x64.dll/ggml-cpu.dll deps/avx512/ggml-cpu.dll cp artifacts/llama-bin-win-avx512-x64.dll/llama.dll deps/avx512/llama.dll - cp artifacts/llava-bin-win-avx512-x64.dll/llava_shared.dll deps/avx512/llava_shared.dll + cp artifacts/mtmd-bin-win-avx512-x64.dll/mtmd.dll deps/avx512/mtmd.dll # Windows ARM64 cp artifacts/ggml-bin-win-arm64-arm64.dll/ggml.dll deps/win-arm64/ggml.dll cp artifacts/ggml-base-bin-win-arm64-arm64.dll/ggml-base.dll deps/win-arm64/ggml-base.dll cp artifacts/ggml-cpu-bin-win-arm64-arm64.dll/ggml-cpu.dll deps/win-arm64/ggml-cpu.dll cp artifacts/llama-bin-win-arm64-arm64.dll/llama.dll deps/win-arm64/llama.dll - cp artifacts/llava-bin-win-arm64-arm64.dll/llava_shared.dll deps/win-arm64/llava_shared.dll + cp artifacts/mtmd-bin-win-arm64-arm64.dll/mtmd.dll deps/win-arm64/mtmd.dll # MacOS cp artifacts/ggml-bin-osx-arm64.dylib/libggml.dylib deps/osx-arm64/libggml.dylib @@ -795,68 +786,54 @@ jobs: cp artifacts/ggml-blas-bin-osx-x64.dylib/libggml-blas.dylib deps/osx-x64/libggml-blas.dylib cp artifacts/llama-bin-osx-x64.dylib/libllama.dylib deps/osx-x64/libllama.dylib cp artifacts/mtmd-bin-osx-x64.dylib/libmtmd.dylib deps/osx-x64/libmtmd.dylib - + cp artifacts/ggml-bin-osx-x64-rosetta2.dylib/libggml.dylib deps/osx-x64-rosetta2/libggml.dylib cp artifacts/ggml-base-bin-osx-x64-rosetta2.dylib/libggml-base.dylib deps/osx-x64-rosetta2/libggml-base.dylib cp artifacts/ggml-cpu-bin-osx-x64-rosetta2.dylib/libggml-cpu.dylib deps/osx-x64-rosetta2/libggml-cpu.dylib cp artifacts/ggml-blas-bin-osx-x64-rosetta2.dylib/libggml-blas.dylib deps/osx-x64-rosetta2/libggml-blas.dylib cp artifacts/llama-bin-osx-x64-rosetta2.dylib/libllama.dylib deps/osx-x64-rosetta2/libllama.dylib - cp artifacts/llava-bin-osx-x64-rosetta2.dylib/libllava_shared.dylib deps/osx-x64-rosetta2/libllava_shared.dylib + cp artifacts/mtmd-bin-osx-x64-rosetta2.dylib/libmtmd.dylib deps/osx-x64-rosetta2/libmtmd.dylib # Android cp artifacts/ggml-bin-android-arm64-v8a.so/libggml.so deps/android-arm64-v8a/libggml.so cp artifacts/ggml-base-bin-android-arm64-v8a.so/libggml-base.so deps/android-arm64-v8a/libggml-base.so cp artifacts/ggml-cpu-bin-android-arm64-v8a.so/libggml-cpu.so deps/android-arm64-v8a/libggml-cpu.so cp artifacts/llama-bin-android-arm64-v8a.so/libllama.so deps/android-arm64-v8a/libllama.so - cp artifacts/llava-bin-android-arm64-v8a.so/libllava_shared.so deps/android-arm64-v8a/libllava_shared.so - cp artifacts/mtmd-bin-android-arm64-v8a.so/libmtmd.so deps/android-arm64-v8a/libmtmd.so - + cp artifacts/ggml-bin-android-x86_64.so/libggml.so deps/android-x86_64/libggml.so cp artifacts/ggml-base-bin-android-x86_64.so/libggml-base.so deps/android-x86_64/libggml-base.so cp artifacts/ggml-cpu-bin-android-x86_64.so/libggml-cpu.so deps/android-x86_64/libggml-cpu.so cp artifacts/llama-bin-android-x86_64.so/libllama.so deps/android-x86_64/libllama.so - cp artifacts/llava-bin-android-x86_64.so/libllava_shared.so deps/android-x86_64/libllava_shared.so + cp artifacts/mtmd-bin-android-x86_64.so/libmtmd.so deps/android-x86_64/libmtmd.so # Windows CUDA - cp artifacts/ggml-bin-win-cublas-cu11.7.1-x64.dll/ggml.dll deps/cu11.7.1/ggml.dll - cp artifacts/ggml-base-bin-win-cublas-cu11.7.1-x64.dll/ggml-base.dll deps/cu11.7.1/ggml-base.dll - cp artifacts/ggml-cuda-bin-win-cublas-cu11.7.1-x64.dll/ggml-cuda.dll deps/cu11.7.1/ggml-cuda.dll - cp artifacts/llama-bin-win-cublas-cu11.7.1-x64.dll/llama.dll deps/cu11.7.1/llama.dll - cp artifacts/llava-bin-win-cublas-cu11.7.1-x64.dll/llava_shared.dll deps/cu11.7.1/llava_shared.dll - - cp artifacts/ggml-bin-win-cublas-cu12.2.0-x64.dll/ggml.dll deps/cu12.2.0/ggml.dll - cp artifacts/ggml-base-bin-win-cublas-cu12.2.0-x64.dll/ggml-base.dll deps/cu12.2.0/ggml-base.dll - cp artifacts/ggml-cuda-bin-win-cublas-cu12.2.0-x64.dll/ggml-cuda.dll deps/cu12.2.0/ggml-cuda.dll - cp artifacts/llama-bin-win-cublas-cu12.2.0-x64.dll/llama.dll deps/cu12.2.0/llama.dll - cp artifacts/llava-bin-win-cublas-cu12.2.0-x64.dll/llava_shared.dll deps/cu12.2.0/llava_shared.dll + cp artifacts/ggml-bin-win-cublas-cu12.4.0-x64.dll/ggml.dll deps/cu12.4.0/ggml.dll + cp artifacts/ggml-base-bin-win-cublas-cu12.4.0-x64.dll/ggml-base.dll deps/cu12.4.0/ggml-base.dll + cp artifacts/ggml-cuda-bin-win-cublas-cu12.4.0-x64.dll/ggml-cuda.dll deps/cu12.4.0/ggml-cuda.dll + cp artifacts/llama-bin-win-cublas-cu12.4.0-x64.dll/llama.dll deps/cu12.4.0/llama.dll + cp artifacts/mtmd-bin-win-cublas-cu12.4.0-x64.dll/mtmd.dll deps/cu12.4.0/mtmd.dll # Linux CUDA - cp artifacts/ggml-bin-linux-cublas-cu11.7.1-x64.so/libggml.so deps/cu11.7.1/libggml.so - cp artifacts/ggml-base-bin-linux-cublas-cu11.7.1-x64.so/libggml-base.so deps/cu11.7.1/libggml-base.so - cp artifacts/ggml-cuda-bin-linux-cublas-cu11.7.1-x64.so/libggml-cuda.so deps/cu11.7.1/libggml-cuda.so - cp artifacts/llama-bin-linux-cublas-cu11.7.1-x64.so/libllama.so deps/cu11.7.1/libllama.so - cp artifacts/llava-bin-linux-cublas-cu11.7.1-x64.so/libllava_shared.so deps/cu11.7.1/libllava_shared.so - - cp artifacts/ggml-bin-linux-cublas-cu12.2.0-x64.so/libggml.so deps/cu12.2.0/libggml.so - cp artifacts/ggml-base-bin-linux-cublas-cu12.2.0-x64.so/libggml-base.so deps/cu12.2.0/libggml-base.so - cp artifacts/ggml-cuda-bin-linux-cublas-cu12.2.0-x64.so/libggml-cuda.so deps/cu12.2.0/libggml-cuda.so - cp artifacts/llama-bin-linux-cublas-cu12.2.0-x64.so/libllama.so deps/cu12.2.0/libllama.so - cp artifacts/llava-bin-linux-cublas-cu12.2.0-x64.so/libllava_shared.so deps/cu12.2.0/libllava_shared.so + cp artifacts/ggml-bin-linux-cublas-cu12.4.0-x64.so/libggml.so deps/cu12.4.0/libggml.so + cp artifacts/ggml-base-bin-linux-cublas-cu12.4.0-x64.so/libggml-base.so deps/cu12.4.0/libggml-base.so + cp artifacts/ggml-cuda-bin-linux-cublas-cu12.4.0-x64.so/libggml-cuda.so deps/cu12.4.0/libggml-cuda.so + cp artifacts/llama-bin-linux-cublas-cu12.4.0-x64.so/libllama.so deps/cu12.4.0/libllama.so + cp artifacts/mtmd-bin-linux-cublas-cu12.4.0-x64.so/libmtmd.so deps/cu12.4.0/libmtmd.so # Windows Vulkan cp artifacts/ggml-bin-win-vulkan-x64.dll/ggml.dll deps/vulkan/ggml.dll cp artifacts/ggml-base-bin-win-vulkan-x64.dll/ggml-base.dll deps/vulkan/ggml-base.dll cp artifacts/ggml-vulkan-bin-win-vulkan-x64.dll/ggml-vulkan.dll deps/vulkan/ggml-vulkan.dll cp artifacts/llama-bin-win-vulkan-x64.dll/llama.dll deps/vulkan/llama.dll - cp artifacts/llava-bin-win-vulkan-x64.dll/llava_shared.dll deps/vulkan/llava_shared.dll - + cp artifacts/mtmd-bin-win-vulkan-x64.dll/mtmd.dll deps/vulkan/mtmd.dll + # Linux Vulkan cp artifacts/ggml-bin-linux-vulkan-x64.so/libggml.so deps/vulkan/libggml.so cp artifacts/ggml-base-bin-linux-vulkan-x64.so/libggml-base.so deps/vulkan/libggml-base.so cp artifacts/ggml-vulkan-bin-linux-vulkan-x64.so/libggml-vulkan.so deps/vulkan/libggml-vulkan.so cp artifacts/llama-bin-linux-vulkan-x64.so/libllama.so deps/vulkan/libllama.so - cp artifacts/llava-bin-linux-vulkan-x64.so/libllava_shared.so deps/vulkan/libllava_shared.so + cp artifacts/mtmd-bin-linux-vulkan-x64.so/libmtmd.so deps/vulkan/libmtmd.so - name: Upload artifacts uses: actions/upload-artifact@v4 From 18c9240f0229a066800084e3ebc059e52a594779 Mon Sep 17 00:00:00 2001 From: m0nsky Date: Tue, 17 Feb 2026 10:00:45 +0100 Subject: [PATCH 2/2] use clang (see this: https://github.com/ggml-org/llama.cpp/pull/10890) and remove the x86 specific stuff --- .github/workflows/compile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 2dd422e52..8be56091c 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -222,7 +222,7 @@ jobs: matrix: include: - build: 'arm64' - defines: '-DCMAKE_GENERATOR_PLATFORM=ARM64 -DGGML_NATIVE=OFF -DGGML_AVX=OFF -DGGML_AVX2=OFF -DGGML_FMA=OFF' + defines: '-T ClangCL -DCMAKE_GENERATOR_PLATFORM=ARM64 -DGGML_NATIVE=OFF' runs-on: windows-latest steps: - uses: actions/checkout@v4