Skip to content

Commit a076050

Browse files
committed
ci : check if these changes fix Github Actions (Metal)
1 parent 1580805 commit a076050

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,6 @@ jobs:
171171
LLAMA_NO_METAL=1 make tests -j $(sysctl -n hw.logicalcpu)
172172
LLAMA_NO_METAL=1 make test -j $(sysctl -n hw.logicalcpu)
173173
174-
# TODO: build with LLAMA_METAL=OFF because test-backend-ops fail on "Apple Paravirtual device" and I don't know
175-
# how to debug it.
176-
# ref: https://github.com/ggerganov/llama.cpp/actions/runs/7132125951/job/19422043567?pr=4359#step:5:6584
177-
# would be great if we fix these
178174
macOS-latest-cmake:
179175
runs-on: macos-latest
180176

@@ -195,7 +191,7 @@ jobs:
195191
sysctl -a
196192
mkdir build
197193
cd build
198-
cmake -DLLAMA_METAL=OFF ..
194+
cmake -DLLAMA_METAL=ON -DLLAMA_METAL_NO_FAST_MATH=ON ..
199195
cmake --build . --config Release -j $(sysctl -n hw.logicalcpu)
200196
201197
- name: Test

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ if (LLAMA_METAL)
184184
# note: adding -fno-inline fixes the tests when using MTL_SHADER_VALIDATION=1
185185
add_custom_command(
186186
OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml.metallib
187-
COMMAND xcrun -sdk macosx metal -fno-fast-math -fno-inline -c ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml-metal.metal -o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml-metal.air
187+
COMMAND xcrun -sdk macosx metal -O1 -fno-fast-math -fno-inline -c ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml-metal.metal -o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml-metal.air
188188
COMMAND xcrun -sdk macosx metallib ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml-metal.air -o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml.metallib
189189
DEPENDS ggml-metal.metal
190190
COMMENT "Compiling Metal kernels"

0 commit comments

Comments
 (0)