From 169c6228509ac1ad77927232c3f55a8eb337f242 Mon Sep 17 00:00:00 2001 From: Eve <139727413+netrunnereve@users.noreply.github.com> Date: Thu, 21 Sep 2023 00:02:18 +0000 Subject: [PATCH] alternate implementation --- CMakeLists.txt | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e73ea5b28..9cbcb8fca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,17 +58,21 @@ option(LLAMA_SANITIZE_ADDRESS "llama: enable address sanitizer" option(LLAMA_SANITIZE_UNDEFINED "llama: enable undefined sanitizer" OFF) # instruction set specific -if (NOT LLAMA_NATIVE) - option(LLAMA_AVX "llama: enable AVX" ON) - option(LLAMA_AVX2 "llama: enable AVX2" ON) - option(LLAMA_AVX512 "llama: enable AVX512" OFF) - option(LLAMA_AVX512_VBMI "llama: enable AVX512-VBMI" OFF) - option(LLAMA_AVX512_VNNI "llama: enable AVX512-VNNI" OFF) - option(LLAMA_FMA "llama: enable FMA" ON) - # in MSVC F16C is implied with AVX2/AVX512 - if (NOT MSVC) - option(LLAMA_F16C "llama: enable F16C" ON) - endif() +if (LLAMA_NATIVE) + set(INS_ENB OFF) +else() + set(INS_ENB ON) +endif() + +option(LLAMA_AVX "llama: enable AVX" ${INS_ENB}) +option(LLAMA_AVX2 "llama: enable AVX2" ${INS_ENB}) +option(LLAMA_AVX512 "llama: enable AVX512" OFF) +option(LLAMA_AVX512_VBMI "llama: enable AVX512-VBMI" OFF) +option(LLAMA_AVX512_VNNI "llama: enable AVX512-VNNI" OFF) +option(LLAMA_FMA "llama: enable FMA" ${INS_ENB}) +# in MSVC F16C is implied with AVX2/AVX512 +if (NOT MSVC) + option(LLAMA_F16C "llama: enable F16C" ${INS_ENB}) endif() # 3rd party libs