Skip to content

Commit 7adce4f

Browse files
committed
Only check hardware when option is ON
1 parent 5f50d15 commit 7adce4f

File tree

1 file changed

+20
-21
lines changed

1 file changed

+20
-21
lines changed

CMakeLists.txt

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -188,33 +188,32 @@ MACRO(CHECK_SSE type flags)
188188

189189
ENDMACRO()
190190

191-
CHECK_SSE("AVX" " ;-mavx;/arch:AVX")
192-
CHECK_SSE("AVX2" " ;-mavx2 -mfma;/arch:AVX2")
193-
CHECK_SSE("AVX512" " ;-mavx512f -mavx512dq -mavx512vl -mavx512bw -mfma;/arch:AVX512")
194-
CHECK_SSE("FMA" " ;-mfma;")
195-
196-
IF(${AVX_FOUND})
197-
set(LLAMA_AVX ON)
198-
ELSE()
199-
set(LLAMA_AVX OFF)
191+
IF(${LLAMA_AVX})
192+
CHECK_SSE("AVX" " ;-mavx;/arch:AVX")
193+
IF(NOT ${AVX_FOUND})
194+
set(LLAMA_AVX OFF)
195+
ENDIF()
200196
ENDIF()
201197

202-
IF (${FMA_FOUND})
203-
set(LLAMA_FMA ON)
204-
ELSE()
205-
set(LLAMA_FMA OFF)
198+
IF(${LLAMA_AVX2})
199+
CHECK_SSE("AVX2" " ;-mavx2 -mfma;/arch:AVX2")
200+
IF(NOT ${AVX2_FOUND})
201+
set(LLAMA_AVX2 OFF)
202+
ENDIF()
206203
ENDIF()
207204

208-
IF(${AVX2_FOUND})
209-
set(LLAMA_AVX2 ON)
210-
ELSE()
211-
set(LLAMA_AVX2 OFF)
205+
IF(${LLAMA_AVX512})
206+
CHECK_SSE("AVX512" " ;-mavx512f -mavx512dq -mavx512vl -mavx512bw -mfma;/arch:AVX512")
207+
IF(NOT ${AVX512_FOUND})
208+
set(LLAMA_AVX512 OFF)
209+
ENDIF()
212210
ENDIF()
213211

214-
IF(${AVX512_FOUND})
215-
set(LLAMA_AVX512 ON)
216-
ELSE()
217-
set(LLAMA_AVX512 OFF)
212+
IF(${LLAMA_FMA})
213+
CHECK_SSE("FMA" " ;-mfma;")
214+
IF (NOT ${FMA_FOUND})
215+
set(LLAMA_FMA OFF)
216+
ENDIF()
218217
ENDIF()
219218

220219
#

0 commit comments

Comments
 (0)