Skip to content

Commit 1893359

Browse files
ckastnerggerganov
authored andcommitted
cmake: Guard GGML_CPU_ALL_VARIANTS by architecture (llama/13890)
1 parent ea643c6 commit 1893359

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

ggml/src/CMakeLists.txt

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -291,16 +291,20 @@ if (GGML_CPU_ALL_VARIANTS)
291291
if (NOT GGML_BACKEND_DL)
292292
message(FATAL_ERROR "GGML_CPU_ALL_VARIANTS requires GGML_BACKEND_DL")
293293
endif()
294-
ggml_add_cpu_backend_variant(x64)
295-
ggml_add_cpu_backend_variant(sse42 SSE42)
296-
ggml_add_cpu_backend_variant(sandybridge SSE42 AVX)
297-
ggml_add_cpu_backend_variant(haswell SSE42 AVX F16C AVX2 BMI2 FMA)
298-
ggml_add_cpu_backend_variant(skylakex SSE42 AVX F16C AVX2 BMI2 FMA AVX512)
299-
ggml_add_cpu_backend_variant(icelake SSE42 AVX F16C AVX2 BMI2 FMA AVX512 AVX512_VBMI AVX512_VNNI)
300-
ggml_add_cpu_backend_variant(alderlake SSE42 AVX F16C AVX2 BMI2 FMA AVX_VNNI)
301-
if (NOT MSVC)
302-
# MSVC doesn't support AMX
303-
ggml_add_cpu_backend_variant(sapphirerapids SSE42 AVX F16C AVX2 BMI2 FMA AVX512 AVX512_VBMI AVX512_VNNI AVX512_BF16 AMX_TILE AMX_INT8)
294+
if (GGML_SYSTEM_ARCH STREQUAL "x86")
295+
ggml_add_cpu_backend_variant(x64)
296+
ggml_add_cpu_backend_variant(sse42 SSE42)
297+
ggml_add_cpu_backend_variant(sandybridge SSE42 AVX)
298+
ggml_add_cpu_backend_variant(haswell SSE42 AVX F16C AVX2 BMI2 FMA)
299+
ggml_add_cpu_backend_variant(skylakex SSE42 AVX F16C AVX2 BMI2 FMA AVX512)
300+
ggml_add_cpu_backend_variant(icelake SSE42 AVX F16C AVX2 BMI2 FMA AVX512 AVX512_VBMI AVX512_VNNI)
301+
ggml_add_cpu_backend_variant(alderlake SSE42 AVX F16C AVX2 BMI2 FMA AVX_VNNI)
302+
if (NOT MSVC)
303+
# MSVC doesn't support AMX
304+
ggml_add_cpu_backend_variant(sapphirerapids SSE42 AVX F16C AVX2 BMI2 FMA AVX512 AVX512_VBMI AVX512_VNNI AVX512_BF16 AMX_TILE AMX_INT8)
305+
endif()
306+
else()
307+
message(FATAL_ERROR "GGML_CPU_ALL_VARIANTS not yet supported on ${GGML_SYSTEM_ARCH}")
304308
endif()
305309
elseif (GGML_CPU)
306310
ggml_add_cpu_backend_variant_impl("")

0 commit comments

Comments
 (0)