File tree Expand file tree Collapse file tree 1 file changed +20
-21
lines changed Expand file tree Collapse file tree 1 file changed +20
-21
lines changed Original file line number Diff line number Diff line change @@ -143,33 +143,32 @@ MACRO(CHECK_SSE type flags)
143143
144144ENDMACRO ()
145145
146- CHECK_SSE("AVX" " ;-mavx;/arch:AVX" )
147- CHECK_SSE("AVX2" " ;-mavx2 -mfma;/arch:AVX2" )
148- CHECK_SSE("AVX512" " ;-mavx512f -mavx512dq -mavx512vl -mavx512bw -mfma;/arch:AVX512" )
149- CHECK_SSE("FMA" " ;-mfma;" )
150-
151- IF (${AVX_FOUND} )
152- set (LLAMA_AVX ON )
153- ELSE ()
154- set (LLAMA_AVX OFF )
146+ IF (${LLAMA_AVX} )
147+ CHECK_SSE("AVX" " ;-mavx;/arch:AVX" )
148+ IF (NOT ${AVX_FOUND} )
149+ set (LLAMA_AVX OFF )
150+ ENDIF ()
155151ENDIF ()
156152
157- IF (${FMA_FOUND} )
158- set (LLAMA_FMA ON )
159- ELSE ()
160- set (LLAMA_FMA OFF )
153+ IF (${LLAMA_AVX2} )
154+ CHECK_SSE("AVX2" " ;-mavx2 -mfma;/arch:AVX2" )
155+ IF (NOT ${AVX2_FOUND} )
156+ set (LLAMA_AVX2 OFF )
157+ ENDIF ()
161158ENDIF ()
162159
163- IF (${AVX2_FOUND} )
164- set (LLAMA_AVX2 ON )
165- ELSE ()
166- set (LLAMA_AVX2 OFF )
160+ IF (${LLAMA_AVX512} )
161+ CHECK_SSE("AVX512" " ;-mavx512f -mavx512dq -mavx512vl -mavx512bw -mfma;/arch:AVX512" )
162+ IF (NOT ${AVX512_FOUND} )
163+ set (LLAMA_AVX512 OFF )
164+ ENDIF ()
167165ENDIF ()
168166
169- IF (${AVX512_FOUND} )
170- set (LLAMA_AVX512 ON )
171- ELSE ()
172- set (LLAMA_AVX512 OFF )
167+ IF (${LLAMA_FMA} )
168+ CHECK_SSE("FMA" " ;-mfma;" )
169+ IF (NOT ${FMA_FOUND} )
170+ set (LLAMA_FMA OFF )
171+ ENDIF ()
173172ENDIF ()
174173
175174#
You can’t perform that action at this time.
0 commit comments