alternate implementation

Author: netrunnereve

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