From: Mathijs de Bruin Date: Tue, 6 Feb 2024 14:39:22 +0000 (+0000) Subject: Add preprocessor checks for Apple devices. X-Git-Tag: upstream/1.7.4~972 X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=b26c645420c731f844c39c0a80165afd9d8352e5;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp Add preprocessor checks for Apple devices. Based on work by @rbourgeat in https://github.com/ggerganov/llama.cpp/pull/5322/files --- diff --git a/ggml-vulkan.cpp b/ggml-vulkan.cpp index e9e966db..33b8a906 100644 --- a/ggml-vulkan.cpp +++ b/ggml-vulkan.cpp @@ -1109,10 +1109,15 @@ static void ggml_vk_instance_init() { #ifdef GGML_VULKAN_VALIDATE "VK_EXT_validation_features", #endif +#ifdef __APPLE__ "VK_KHR_portability_enumeration", +#endif }; + vk::InstanceCreateInfo instance_create_info(vk::InstanceCreateFlags(), &app_info, layers, extensions); +#ifdef __APPLE__ + instance_create_info.flags = vk::InstanceCreateFlagBits::eEnumeratePortabilityKHR; +#endif - vk::InstanceCreateInfo instance_create_info(vk::InstanceCreateFlags(vk::InstanceCreateFlagBits::eEnumeratePortabilityKHR), &app_info, layers, extensions); #ifdef GGML_VULKAN_VALIDATE const std::vector features_enable = { vk::ValidationFeatureEnableEXT::eBestPractices }; vk::ValidationFeaturesEXT validation_features = {