Merge remote-tracking branch 'origin/master' into gilad/fixVulkanMemoryBudget

# Conflicts:
#	llama/addon/AddonContext.cpp

Author: giladgd

llama/addon/AddonContext.cpp

@@ -420,16 +420,8 @@ AddonContext::AddonContext(const Napi::CallbackInfo& info) : Napi::ObjectWrap<Ad
         }
 
         if (options.Has("flashAttention")) {
-            if (options.Get("flashAttention").IsBoolean()) {
-                bool value = options.Get("flashAttention").As<Napi::Boolean>().Value();
-                if (value) {
-                    context_params.flash_attn_type = LLAMA_FLASH_ATTN_TYPE_ENABLED;
-                } else {
-                    context_params.flash_attn_type = LLAMA_FLASH_ATTN_TYPE_DISABLED;
-                }
-            } else {
-                context_params.flash_attn_type = LLAMA_FLASH_ATTN_TYPE_AUTO;
-            }
+            bool flashAttention = options.Get("flashAttention").As<Napi::Boolean>().Value();
+            context_params.flash_attn_type = flashAttention ? LLAMA_FLASH_ATTN_TYPE_ENABLED : LLAMA_FLASH_ATTN_TYPE_DISABLED;
         }
 
         if (options.Has("threads")) {