From 19ec0a2c310ebc78c420ff5f307babc7822839f6 Mon Sep 17 00:00:00 2001 From: Martin Evans Date: Sat, 18 Jan 2025 14:40:30 +0000 Subject: [PATCH 1/3] Uploading libggml-blas.dylib for arm64 and x86 --- .github/workflows/compile.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index a31f6eef..64e83ab3 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -434,6 +434,13 @@ jobs: path: ./build/ggml/src/ggml-metal/libggml-metal.dylib name: ggml-metal-bin-osx-${{ matrix.build }}.dylib if-no-files-found: error + - name: Upload ggml-blas + if: ${{ matrix.build == 'arm64' }} + uses: actions/upload-artifact@v4 + with: + path: ./build/ggml/src/ggml-blas/libggml-blas.dylib + name: ggml-blas-bin-osx-${{ matrix.build }}.dylib + if-no-files-found: error - name: Upload llama uses: actions/upload-artifact@v4 with: @@ -584,6 +591,7 @@ jobs: cp artifacts/ggml-bin-osx-arm64.dylib/libggml.dylib deps/osx-arm64/libggml.dylib cp artifacts/ggml-base-bin-osx-arm64.dylib/libggml-base.dylib deps/osx-arm64/libggml-base.dylib cp artifacts/ggml-cpu-bin-osx-arm64.dylib/libggml-cpu.dylib deps/osx-arm64/libggml-cpu.dylib + cp artifacts/ggml-blas-bin-osx-arm64.dylib/libggml-blas.dylib deps/osx-arm64/libggml-blas.dylib cp artifacts/ggml-metal-bin-osx-arm64.dylib/libggml-metal.dylib deps/osx-arm64/libggml-metal.dylib cp artifacts/llama-bin-osx-arm64.dylib/libllama.dylib deps/osx-arm64/libllama.dylib cp artifacts/llava-bin-osx-arm64.dylib/libllava_shared.dylib deps/osx-arm64/libllava_shared.dylib @@ -592,12 +600,14 @@ jobs: cp artifacts/ggml-bin-osx-x64.dylib/libggml.dylib deps/osx-x64/libggml.dylib cp artifacts/ggml-base-bin-osx-x64.dylib/libggml-base.dylib deps/osx-x64/libggml-base.dylib cp artifacts/ggml-cpu-bin-osx-x64.dylib/libggml-cpu.dylib deps/osx-x64/libggml-cpu.dylib + 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/llava-bin-osx-x64.dylib/libllava_shared.dylib deps/osx-x64/libllava_shared.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 From 350345972558407ebb08aeb505d2b31476be3f7b Mon Sep 17 00:00:00 2001 From: Martin Evans Date: Sat, 18 Jan 2025 14:42:13 +0000 Subject: [PATCH 2/3] Excluding rosetta2 --- .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 64e83ab3..bb42292b 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -435,7 +435,7 @@ jobs: name: ggml-metal-bin-osx-${{ matrix.build }}.dylib if-no-files-found: error - name: Upload ggml-blas - if: ${{ matrix.build == 'arm64' }} + if: ${{ matrix.build != 'x64-rosetta2' }} uses: actions/upload-artifact@v4 with: path: ./build/ggml/src/ggml-blas/libggml-blas.dylib From 2d0e0186dff7438b64bf66001b502dfb5fbae511 Mon Sep 17 00:00:00 2001 From: Martin Evans Date: Sat, 18 Jan 2025 14:43:10 +0000 Subject: [PATCH 3/3] Really excluding rosetta2 --- .github/workflows/compile.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index bb42292b..11b33b94 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -607,7 +607,6 @@ jobs: 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