From 3cc91b2d668ddf816dc301b728623c8be8e07a30 Mon Sep 17 00:00:00 2001 From: netrunnereve <139727413+netrunnereve@users.noreply.github.com> Date: Thu, 2 Nov 2023 22:18:41 -0400 Subject: [PATCH] msvc combines avx2 and fma into /arch:AVX2 so check for both --- cmake/FindSIMD.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/FindSIMD.cmake b/cmake/FindSIMD.cmake index 596534cb9..bf1bea075 100644 --- a/cmake/FindSIMD.cmake +++ b/cmake/FindSIMD.cmake @@ -77,6 +77,7 @@ macro(check_sse type flags) endmacro() +# flags are for MSVC only! check_sse("AVX" "-mavx") if(NOT ${AVX_FOUND}) set(LLAMA_AVX OFF) @@ -85,7 +86,8 @@ else() endif() check_sse("AVX2" "-mavx2") -if(NOT ${AVX2_FOUND}) +check_sse("FMA" "-mfma") +if((NOT ${AVX2_FOUND}) OR (NOT ${FMA_FOUND})) set(LLAMA_AVX2 OFF) else() set(LLAMA_AVX2 ON)