Skip to content

Commit d3f8577

Browse files
committed
Fixed No_AVX build on Windows
1 parent fdbfb46 commit d3f8577

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

ggml/cmake/FindSIMD.cmake

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -77,24 +77,25 @@ macro(check_sse type flags)
7777
endmacro()
7878

7979
# flags are for MSVC only!
80-
check_sse("AVX" " ;/arch:AVX")
81-
if (NOT ${AVX_FOUND})
82-
set(GGML_AVX OFF)
83-
else()
84-
set(GGML_AVX ON)
80+
# Only perform checks if the options are enabled, otherwise the params won't be respected
81+
if (GGML_AVX)
82+
check_sse("AVX" " ;/arch:AVX")
83+
if (NOT AVX_FOUND)
84+
set(GGML_AVX OFF)
85+
endif()
8586
endif()
8687

87-
check_sse("AVX2" " ;/arch:AVX2")
88-
check_sse("FMA" " ;/arch:AVX2")
89-
if ((NOT ${AVX2_FOUND}) OR (NOT ${FMA_FOUND}))
90-
set(GGML_AVX2 OFF)
91-
else()
92-
set(GGML_AVX2 ON)
88+
if (GGML_AVX2)
89+
check_sse("AVX2" " ;/arch:AVX2")
90+
check_sse("FMA" " ;/arch:AVX2")
91+
if (NOT AVX2_FOUND OR NOT FMA_FOUND)
92+
set(GGML_AVX2 OFF)
93+
endif()
9394
endif()
9495

95-
check_sse("AVX512" " ;/arch:AVX512")
96-
if (NOT ${AVX512_FOUND})
97-
set(GGML_AVX512 OFF)
98-
else()
99-
set(GGML_AVX512 ON)
100-
endif()
96+
if (GGML_AVX512)
97+
check_sse("AVX512" " ;/arch:AVX512")
98+
if (NOT AVX512_FOUND)
99+
set(GGML_AVX512 OFF)
100+
endif()
101+
endif()

0 commit comments

Comments
 (0)