Skip to content

Commit 3e35f2f

Browse files
committed
Only check hardware when option is ON
1 parent b7034f1 commit 3e35f2f

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
@@ -147,33 +147,32 @@ MACRO(CHECK_SSE type flags)
147147

148148
ENDMACRO()
149149

150-
CHECK_SSE("AVX" " ;-mavx;/arch:AVX")
151-
CHECK_SSE("AVX2" " ;-mavx2 -mfma;/arch:AVX2")
152-
CHECK_SSE("AVX512" " ;-mavx512f -mavx512dq -mavx512vl -mavx512bw -mfma;/arch:AVX512")
153-
CHECK_SSE("FMA" " ;-mfma;")
154-
155-
IF(${AVX_FOUND})
156-
set(LLAMA_AVX ON)
157-
ELSE()
158-
set(LLAMA_AVX OFF)
150+
IF(${LLAMA_AVX})
151+
CHECK_SSE("AVX" " ;-mavx;/arch:AVX")
152+
IF(NOT ${AVX_FOUND})
153+
set(LLAMA_AVX OFF)
154+
ENDIF()
159155
ENDIF()
160156

161-
IF (${FMA_FOUND})
162-
set(LLAMA_FMA ON)
163-
ELSE()
164-
set(LLAMA_FMA OFF)
157+
IF(${LLAMA_AVX2})
158+
CHECK_SSE("AVX2" " ;-mavx2 -mfma;/arch:AVX2")
159+
IF(NOT ${AVX2_FOUND})
160+
set(LLAMA_AVX2 OFF)
161+
ENDIF()
165162
ENDIF()
166163

167-
IF(${AVX2_FOUND})
168-
set(LLAMA_AVX2 ON)
169-
ELSE()
170-
set(LLAMA_AVX2 OFF)
164+
IF(${LLAMA_AVX512})
165+
CHECK_SSE("AVX512" " ;-mavx512f -mavx512dq -mavx512vl -mavx512bw -mfma;/arch:AVX512")
166+
IF(NOT ${AVX512_FOUND})
167+
set(LLAMA_AVX512 OFF)
168+
ENDIF()
171169
ENDIF()
172170

173-
IF(${AVX512_FOUND})
174-
set(LLAMA_AVX512 ON)
175-
ELSE()
176-
set(LLAMA_AVX512 OFF)
171+
IF(${LLAMA_FMA})
172+
CHECK_SSE("FMA" " ;-mfma;")
173+
IF (NOT ${FMA_FOUND})
174+
set(LLAMA_FMA OFF)
175+
ENDIF()
177176
ENDIF()
178177

179178
#

0 commit comments

Comments
 (0)