From: ZaBlazzingZephyrus Date: Mon, 8 May 2023 17:45:53 +0000 (+0700) Subject: cmake : fix options disabling AVX and AVX2 flags (#885) X-Git-Tag: upstream/1.7.4~1446 X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=1a548c048ee6dfed22a6931905affe660008a9c1;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp cmake : fix options disabling AVX and AVX2 flags (#885) --- diff --git a/CMakeLists.txt b/CMakeLists.txt index dd2b0d0d..32533006 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -222,9 +222,17 @@ if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES else() message(STATUS "x86 detected") if (MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /arch:AVX2") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:AVX2") + if(NOT WHISPER_NO_AVX2) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /arch:AVX2") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:AVX2") + else() + if(NOT WHISPER_NO_AVX) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /arch:AVX") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:AVX") + endif() + endif() else() if (EMSCRIPTEN) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")