Skip to content

Commit c86ac48

Browse files
committed
fix: adapt to breaking llama.cpp changes
1 parent 3913484 commit c86ac48

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,12 @@ jobs:
6565
- name: "Ubuntu"
6666
os: ubuntu-22.04
6767
artifact: "linux"
68-
- name: "macOS"
68+
- name: "macOS x64"
6969
os: macos-13
70-
artifact: "mac"
70+
artifact: "mac-x64"
71+
- name: "macOS arm64"
72+
os: macos-14
73+
artifact: "mac-arm64"
7174

7275
steps:
7376
- uses: actions/checkout@v4
@@ -212,9 +215,10 @@ jobs:
212215
await buildBinary("x64", ["--gpu", "vulkan"]);
213216
await buildBinary("arm64", ["--gpu", "false"]);
214217
await buildBinary("armv7l", ["--gpu", "false"]);
215-
} else if (process.env.ARTIFACT_NAME === "mac") {
216-
await buildBinary("arm64", ["--gpu", "metal"]);
218+
} else if (process.env.ARTIFACT_NAME === "mac-x64") {
217219
await buildBinary("x64", ["--gpu", "false"]);
220+
} else if (process.env.ARTIFACT_NAME === "mac-arm64") {
221+
await buildBinary("arm64", ["--gpu", "metal"]);
218222
}
219223
220224
// move binaries to bins

src/bindings/utils/compileLLamaCpp.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export async function compileLlamaCpp(buildOptions: BuildOptions, compileOptions
100100
if (!cmakeCustomOptions.has("GGML_AMX"))
101101
cmakeCustomOptions.set("GGML_AMX", "OFF");
102102

103-
if (!cmakeCustomOptions.has("GGML_NATIVE"))
103+
if (!cmakeCustomOptions.has("GGML_NATIVE") && buildOptions.platform !== "mac")
104104
cmakeCustomOptions.set("GGML_NATIVE", "OFF");
105105
}
106106

0 commit comments

Comments
 (0)