tqcq/llama.cpp
0
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2025-06-27 20:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

ggml-cpu: undo cmakelists work

Browse Source 
Signed-off-by: Aaron Teo <aaron.teo1@ibm.com>
This commit is contained in:
Aaron Teo
2025-06-21 20:56:46 +08:00
parent 3ec0bdc1df
commit e43dc82a21
2 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ggml/src/CMakeLists.txt
View File

@ -290,10 +290,6 @@ function(ggml_add_cpu_backend_variant tag_name)
foreach (feat ${ARGN}) foreach (feat ${ARGN})
set(GGML_INTERNAL_${feat} ON) set(GGML_INTERNAL_${feat} ON)
endforeach() endforeach()
elseif (GGML_SYSTEM_ARCH STREQUAL "s390x")
foreach (feat ${ARGN})
set(GGML_${feat} ON)
endforeach()
endif() endif()
ggml_add_cpu_backend_variant_impl(${tag_name}) ggml_add_cpu_backend_variant_impl(${tag_name})
@ -358,14 +354,6 @@ if (GGML_CPU_ALL_VARIANTS)
else() else()
message(FATAL_ERROR "Unsupported PowerPC target OS: ${CMAKE_SYSTEM_NAME}") message(FATAL_ERROR "Unsupported PowerPC target OS: ${CMAKE_SYSTEM_NAME}")
endif() endif()
elseif (GGML_SYSTEM_ARCH STREQUAL "s390x")
if (CMAKE_SYSTEM_NAME MATCHES "Linux")
ggml_add_cpu_backend_variant(s390x_z15 VX VXE VXE2)
ggml_add_cpu_backend_variant(s390x_z16 VX VXE VXE2 NNPA)
ggml_add_cpu_backend_variant(s390x_z17 VX VXE VXE2 NNPA)
else()
message(FATAL_ERROR "Unsupported s390x target OS: ${CMAKE_SYSTEM_NAME}")
endif()
else() else()
message(FATAL_ERROR "GGML_CPU_ALL_VARIANTS not yet supported with ${GGML_SYSTEM_ARCH} on ${CMAKE_SYSTEM_NAME}") message(FATAL_ERROR "GGML_CPU_ALL_VARIANTS not yet supported with ${GGML_SYSTEM_ARCH} on ${CMAKE_SYSTEM_NAME}")
endif() endif()
@ -414,17 +402,3 @@ if (BUILD_SHARED_LIBS)
target_compile_definitions(${target} PUBLIC GGML_SHARED) target_compile_definitions(${target} PUBLIC GGML_SHARED)
endforeach() endforeach()
endif() endif()
if (GGML_VXE)
message(STATUS "GGML_VXE triggered")
add_compile_definitions(GGML_VXE)
target_compile_definitions(ggml PRIVATE GGML_VXE)
target_compile_definitions(ggml-base PRIVATE GGML_VXE)
endif()
if (GGML_NNPA)
message(STATUS "GGML_NNPA triggered")
add_compile_definitions(GGML_NNPA)
target_compile_definitions(ggml PRIVATE GGML_NNPA)
target_compile_definitions(ggml-base PRIVATE GGML_NNPA)
endif()

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

@ -469,12 +469,13 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
message(STATUS "VX/VXE/VXE2 enabled") message(STATUS "VX/VXE/VXE2 enabled")
list(APPEND ARCH_FLAGS -mvx -mzvector) list(APPEND ARCH_FLAGS -mvx -mzvector)
list(APPEND ARCH_DEFINITIONS GGML_VXE) list(APPEND ARCH_DEFINITIONS GGML_VXE)
target_compile_definitions(${GGML_CPU_NAME} PRIVATE GGML_VXE)
endif() endif()
if (GGML_NNPA) if (GGML_NNPA)
target_compile_definitions(${GGML_CPU_NAME} PRIVATE GGML_NNPA)
message(STATUS "NNPA enabled") message(STATUS "NNPA enabled")
list(APPEND ARCH_DEFINITIONS GGML_NNPA) list(APPEND ARCH_DEFINITIONS GGML_NNPA)
target_compile_definitions(${GGML_CPU_NAME} PRIVATE GGML_NNPA)
endif() endif()
elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "wasm") elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "wasm")
message(STATUS "Wasm detected") message(STATUS "Wasm detected")