taronaeo commited on
Commit
cac085c
·
1 Parent(s): 5359e09

ggml-cpu : disable GGML_NNPA by default due to instability (llama/14880)

Browse files

* docs: update s390x document for sentencepiece

Signed-off-by: Aaron Teo <[email protected]>
(cherry picked from commit e086c5e3a7ab3463d8e0906efcfa39352db0a48d)

* docs: update huggingface links + reword

Signed-off-by: Aaron Teo <[email protected]>
(cherry picked from commit 8410b085ea8c46e22be38266147a1e94757ef108)

* ggml-cpu: disable ggml-nnpa compile flag by default

fixes #14877

Signed-off-by: Aaron Teo <[email protected]>
(cherry picked from commit 412f4c7c88894b8f55846b4719c76892a23cfe09)

* docs: update s390x build docs to reflect nnpa disable

Signed-off-by: Aaron Teo <[email protected]>
(cherry picked from commit c1eeae1d0c2edc74ab9fbeff2707b0d357cf0b4d)

---------

Signed-off-by: Aaron Teo <[email protected]>

ggml/CMakeLists.txt CHANGED
@@ -131,7 +131,7 @@ option(GGML_RVV "ggml: enable rvv" ON)
131
  option(GGML_RV_ZFH "ggml: enable riscv zfh" OFF)
132
  option(GGML_XTHEADVECTOR "ggml: enable xtheadvector" OFF)
133
  option(GGML_VXE "ggml: enable vxe" ON)
134
- option(GGML_NNPA "ggml: enable nnpa" ON)
135
 
136
  option(GGML_CPU_ALL_VARIANTS "ggml: build all variants of the CPU backend (requires GGML_BACKEND_DL)" OFF)
137
  set(GGML_CPU_ARM_ARCH "" CACHE STRING "ggml: CPU architecture for ARM")
 
131
  option(GGML_RV_ZFH "ggml: enable riscv zfh" OFF)
132
  option(GGML_XTHEADVECTOR "ggml: enable xtheadvector" OFF)
133
  option(GGML_VXE "ggml: enable vxe" ON)
134
+ option(GGML_NNPA "ggml: enable nnpa" OFF) # temp disabled by default, see: https://github.com/ggml-org/llama.cpp/issues/14877
135
 
136
  option(GGML_CPU_ALL_VARIANTS "ggml: build all variants of the CPU backend (requires GGML_BACKEND_DL)" OFF)
137
  set(GGML_CPU_ARM_ARCH "" CACHE STRING "ggml: CPU architecture for ARM")
ggml/src/ggml-cpu/CMakeLists.txt CHANGED
@@ -458,6 +458,7 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
458
  list(APPEND ARCH_FLAGS -march=z16)
459
  elseif (${S390X_M} MATCHES "9175|9176")
460
  # NOTE: Only available from GCC 15.1.0 onwards. Any z17 machine with compile issues must first verify their GCC version.
 
461
  message(STATUS "z17 target")
462
  list(APPEND ARCH_FLAGS -march=z17)
463
  else()
 
458
  list(APPEND ARCH_FLAGS -march=z16)
459
  elseif (${S390X_M} MATCHES "9175|9176")
460
  # NOTE: Only available from GCC 15.1.0 onwards. Any z17 machine with compile issues must first verify their GCC version.
461
+ # binutils must also be updated to the latest for the -march=z17 flag to work. Otherwise, use -march=arch15.
462
  message(STATUS "z17 target")
463
  list(APPEND ARCH_FLAGS -march=z17)
464
  else()