vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

march -> mcpu, skip adding feature macros

Browse source 
ggml-ci
This commit is contained in:
slaren 2024-12-18 20:50:04 +01:00
parent 0a4b79ca3d
commit d4b125911c
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ggml/src/ggml-cpu/CMakeLists.txt
View file

@ -88,11 +88,11 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
endif()
if (GGML_NATIVE)
list(APPEND ARCH_FLAGS -march=native)
list(APPEND ARCH_FLAGS -mcpu=native)
set(CMAKE_REQUIRED_FLAGS_SAVE ${CMAKE_REQUIRED_FLAGS})
# -march=native does not always enable all the features in some compilers,
# -mcpu=native does not always enable all the features in some compilers,
# so we check for them manually and enable them if available
include(CheckCXXSourceRuns)
@ -103,7 +103,6 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
GGML_COMPILER_SUPPORT_DOTPROD)
if (GGML_COMPILER_SUPPORT_DOTPROD)
set(ARCH_FLAGS "${ARCH_FLAGS}+dotprod")
list(APPEND ARCH_DEFINITIONS __ARM_FEATURE_DOTPROD)
endif()
set(CMAKE_REQUIRED_FLAGS "${ARCH_FLAGS}+i8mm")
@ -112,7 +111,6 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
GGML_COMPILER_SUPPORT_I8MM)
if (GGML_COMPILER_SUPPORT_I8MM)
set(ARCH_FLAGS "${ARCH_FLAGS}+i8mm")
list(APPEND ARCH_DEFINITIONS __ARM_FEATURE_MATMUL_INT8)
endif()
set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE})