root/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2025-01-13 04:00:16 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge bd9c319515 into 924518e2e5

Browse Source
This commit is contained in:
Milot Mirdita 2025-01-12 23:45:47 +05:00 committed by GitHub
commit d4ab18ec40
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ggml/src/ggml-cpu/CMakeLists.txt
View File

@ -211,8 +211,8 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
list(APPEND ARCH_FLAGS /arch:AVX) list(APPEND ARCH_FLAGS /arch:AVX)
list(APPEND ARCH_DEFINITIONS GGML_AVX) list(APPEND ARCH_DEFINITIONS GGML_AVX)
else () else ()
list(APPEND ARCH_FLAGS /arch:SSE4.2) list(APPEND ARCH_FLAGS /arch:SSE4.1)
list(APPEND ARCH_DEFINITIONS GGML_SSE42) list(APPEND ARCH_DEFINITIONS GGML_SSE41)
endif() endif()
if (GGML_AVX_VNNI) if (GGML_AVX_VNNI)
list(APPEND ARCH_DEFINITIONS __AVXVNNI__ GGML_AVX_VNNI) list(APPEND ARCH_DEFINITIONS __AVXVNNI__ GGML_AVX_VNNI)
@ -221,8 +221,8 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
if (GGML_NATIVE) if (GGML_NATIVE)
list(APPEND ARCH_FLAGS -march=native) list(APPEND ARCH_FLAGS -march=native)
else () else ()
list(APPEND ARCH_FLAGS -msse4.2) list(APPEND ARCH_FLAGS -msse2 -msse3 -mssse3 -msse4.1)
list(APPEND ARCH_DEFINITIONS GGML_SSE42) list(APPEND ARCH_DEFINITIONS GGML_SSE41)
if (GGML_F16C) if (GGML_F16C)
list(APPEND ARCH_FLAGS -mf16c) list(APPEND ARCH_FLAGS -mf16c)
list(APPEND ARCH_DEFINITIONS GGML_F16C) list(APPEND ARCH_DEFINITIONS GGML_F16C)

4
ggml/src/ggml-cpu/cpu-feats-x86.cpp
View File

@ -274,8 +274,8 @@ static int ggml_backend_cpu_x86_score() {
if (!is.F16C()) { return 0; } if (!is.F16C()) { return 0; }
score += 1<<1; score += 1<<1;
#endif #endif
#ifdef GGML_SSE42 #ifdef GGML_SSE41
if (!is.SSE42()) { return 0; } if (!is.SSE41()) { return 0; }
score += 1<<2; score += 1<<2;
#endif #endif
#ifdef GGML_AVX #ifdef GGML_AVX