Skip to content

Commit 5c5b706

Browse files
martindevansmartindevans
authored
Merge pull request #1390 from m0nsky/fix/ci-update-binaries-failures
CI updates
2 parents 0e5916a + 7714fe5 commit 5c5b706

1 file changed

Lines changed: 18 additions & 15 deletions

File tree

‎.github/workflows/compile.yml‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717

1818
env:
1919
# Compiler defines common to all platforms
20-
COMMON_DEFINE: -DGGML_NATIVE=OFF -DLLAMA_BUILD_TESTS=OFF -DLLAMA_OPENSSL=OFF -DBUILD_SHARED_LIBS=ON
20+
COMMON_DEFINE: -DGGML_NATIVE=OFF -DLLAMA_BUILD_TESTS=OFF -DLLAMA_OPENSSL=OFF -DBUILD_SHARED_LIBS=ON -DLLAMA_BUILD_UI=OFF -DLLAMA_BUILD_APP=OFF -DLLAMA_BUILD_EXAMPLES=OFF -DLLAMA_BUILD_SERVER=OFF
2121
LINUX_RPATH_DEFINE: "-DCMAKE_INSTALL_RPATH='$ORIGIN' -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DCMAKE_PLATFORM_NO_VERSIONED_SONAME=ON"
2222

2323
jobs:
@@ -60,7 +60,7 @@ jobs:
6060
mkdir build
6161
cd build
6262
cmake .. ${{ env.COMMON_DEFINE }} ${{ env.LINUX_RPATH_DEFINE }} ${{ matrix.defines }}
63-
cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS}
63+
cmake --build . --config Release -j $(nproc) --target ggml ggml-base ggml-cpu llama mtmd
6464
ls -R
6565
- uses: actions/upload-artifact@v4
6666
with:
@@ -125,7 +125,7 @@ jobs:
125125
mkdir build
126126
cd build
127127
cmake .. ${{ env.COMMON_DEFINE }} ${{ env.LINUX_RPATH_DEFINE }} ${{ matrix.defines }}
128-
cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS}
128+
cmake --build . --config Release -j $(nproc) --target ggml ggml-base ggml-cpu llama mtmd
129129
ls -R
130130
- uses: actions/upload-artifact@v4
131131
with:
@@ -181,7 +181,7 @@ jobs:
181181
mkdir build
182182
cd build
183183
cmake .. ${{ env.COMMON_DEFINE }} ${{ matrix.defines }}
184-
cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS}
184+
cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS} --target ggml ggml-base ggml-cpu llama mtmd
185185
tree /f
186186
187187
- name: Upload artifacts (llama)
@@ -237,7 +237,7 @@ jobs:
237237
mkdir build
238238
cd build
239239
cmake .. ${{ env.COMMON_DEFINE }} ${{ matrix.defines }}
240-
cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS}
240+
cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS} --target ggml ggml-base ggml-cpu llama mtmd
241241
tree /f
242242
243243
- name: Upload artifacts (llama)
@@ -314,15 +314,15 @@ jobs:
314314
mkdir build
315315
cd build
316316
cmake .. ${{ env.COMMON_DEFINE }} -DGGML_VULKAN=ON
317-
cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS}
317+
cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS} --target ggml ggml-base ggml-vulkan llama mtmd
318318
ls -R
319319
- name: Build (Linux)
320320
if: ${{ matrix.os == 'ubuntu-22.04' }}
321321
run: |
322322
mkdir build
323323
cd build
324324
cmake .. ${{ env.COMMON_DEFINE }} ${{ env.LINUX_RPATH_DEFINE }} -DGGML_VULKAN=ON
325-
cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS}
325+
cmake --build . --config Release -j $(nproc) --target ggml ggml-base ggml-vulkan llama mtmd
326326
ls -R
327327
- name: Upload llama artifacts (Windows)
328328
if: ${{ matrix.os == 'windows-latest' }}
@@ -435,8 +435,8 @@ jobs:
435435
echo "CMAKE_CXX_FLAGS is $CMAKE_CXX_FLAGS"
436436
mkdir build
437437
cd build
438-
cmake .. ${{ env.COMMON_DEFINE }} -DGGML_CUDA=ON
439-
cmake --build . --config Release
438+
cmake .. ${{ env.COMMON_DEFINE }} -DGGML_CUDA=ON -DCMAKE_CUDA_FLAGS=-w
439+
cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS} --target ggml ggml-base ggml-cuda llama mtmd
440440
ls -R
441441
442442
- name: Build (Linux)
@@ -446,8 +446,8 @@ jobs:
446446
echo "CMAKE_CXX_FLAGS is $CMAKE_CXX_FLAGS"
447447
mkdir build
448448
cd build
449-
cmake .. ${{ env.COMMON_DEFINE }} ${{ env.LINUX_RPATH_DEFINE }} -DGGML_CUDA=ON
450-
cmake --build . --config Release
449+
cmake .. ${{ env.COMMON_DEFINE }} ${{ env.LINUX_RPATH_DEFINE }} -DGGML_CUDA=ON -DCMAKE_CUDA_FLAGS=-w
450+
cmake --build . --config Release -j $(nproc) --target ggml ggml-base ggml-cuda llama mtmd
451451
ls -R
452452
453453
- name: Upload artifacts (Windows)
@@ -530,10 +530,13 @@ jobs:
530530
include:
531531
- build: 'arm64'
532532
defines: '-DCMAKE_OSX_ARCHITECTURES=arm64 -DGGML_METAL_EMBED_LIBRARY=ON -DGGML_METAL_USE_BF16=ON'
533+
targets: '--target ggml ggml-base ggml-cpu ggml-blas ggml-metal llama mtmd'
533534
- build: 'x64'
534535
defines: '-DCMAKE_OSX_ARCHITECTURES=x86_64 -DGGML_METAL=OFF -DGGML_AVX=ON -DGGML_AVX2=ON'
536+
targets: '--target ggml ggml-base ggml-cpu ggml-blas llama mtmd'
535537
- build: 'x64-rosetta2'
536538
defines: '-DCMAKE_OSX_ARCHITECTURES=x86_64 -DGGML_METAL=OFF -DGGML_AVX=OFF -DGGML_AVX2=OFF'
539+
targets: '--target ggml ggml-base ggml-cpu ggml-blas llama mtmd'
537540
env:
538541
MACOS_RPATH_DEFINE: "-DCMAKE_INSTALL_RPATH='@loader_path' -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON"
539542
runs-on: macos-14
@@ -553,7 +556,7 @@ jobs:
553556
mkdir build
554557
cd build
555558
cmake .. ${{ env.COMMON_DEFINE }} ${{ env.MACOS_RPATH_DEFINE }} ${{ matrix.defines }}
556-
cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS}
559+
cmake --build . --config Release -j $(sysctl -n hw.logicalcpu) ${{ matrix.targets }}
557560
ls -R
558561
- name: Upload ggml
559562
uses: actions/upload-artifact@v4
@@ -605,9 +608,9 @@ jobs:
605608
matrix:
606609
include:
607610
- build: 'x86_64'
608-
defines: '-DANDROID_ABI=x86_64 -DCMAKE_C_FLAGS=-march=x86-64 -DCMAKE_CXX_FLAGS=-march=x86-64 -DGGML_OPENMP=OFF -DLLAMA_BUILD_SERVER=OFF'
611+
defines: '-DANDROID_ABI=x86_64 -DCMAKE_C_FLAGS=-march=x86-64 -DCMAKE_CXX_FLAGS=-march=x86-64 -DGGML_OPENMP=OFF'
609612
- build: 'arm64-v8a'
610-
defines: '-DANDROID_ABI=arm64-v8a -DCMAKE_C_FLAGS=-march=armv8.7a -DCMAKE_C_FLAGS=-march=armv8.7a -DGGML_OPENMP=OFF -DLLAMA_BUILD_SERVER=OFF'
613+
defines: '-DANDROID_ABI=arm64-v8a -DCMAKE_C_FLAGS=-march=armv8.7a -DCMAKE_C_FLAGS=-march=armv8.7a -DGGML_OPENMP=OFF'
611614
runs-on: ubuntu-24.04
612615
steps:
613616
- uses: actions/checkout@v6
@@ -628,7 +631,7 @@ jobs:
628631
# export-lora not supported on 32 bit machines hence breaks x86 build
629632
sed -i '/add_subdirectory(export-lora)/d' examples/CMakeLists.txt # remove export-lora from examples
630633
cmake ${{ env.COMMON_DEFINE }} ${{ env.CMAKE_FLAGS }} ${{ matrix.defines }} -B build
631-
cmake --build build --config Release -j ${env:NUMBER_OF_PROCESSORS}
634+
cmake --build build --config Release -j $(nproc) --target ggml ggml-base ggml-cpu llama mtmd
632635
- name: Upload Llama
633636
uses: actions/upload-artifact@v4
634637
with:

0 commit comments

Comments
 (0)