Christian Kastner commited on
Commit
a434936
·
1 Parent(s): 026ea5b

cmake: Guard GGML_CPU_ALL_VARIANTS by architecture (llama/13890)

Browse files
Files changed (1) hide show
  1. ggml/src/CMakeLists.txt +14 -10
ggml/src/CMakeLists.txt CHANGED
@@ -291,16 +291,20 @@ if (GGML_CPU_ALL_VARIANTS)
291
  if (NOT GGML_BACKEND_DL)
292
  message(FATAL_ERROR "GGML_CPU_ALL_VARIANTS requires GGML_BACKEND_DL")
293
  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)
 
 
 
 
304
  endif()
305
  elseif (GGML_CPU)
306
  ggml_add_cpu_backend_variant_impl("")
 
291
  if (NOT GGML_BACKEND_DL)
292
  message(FATAL_ERROR "GGML_CPU_ALL_VARIANTS requires GGML_BACKEND_DL")
293
  endif()
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}")
308
  endif()
309
  elseif (GGML_CPU)
310
  ggml_add_cpu_backend_variant_impl("")