CS348Project/llama.cpp
5
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2025-11-16 11:27:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

ggml-cpu: move things around

Browse Source 
Signed-off-by: Aaron Teo <aaron.teo1@ibm.com>
This commit is contained in:
Aaron Teo
2025-06-21 19:41:01 +08:00
parent 18d79e1a30
commit 781c263722
2 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ggml/src/CMakeLists.txt
View File

@@ -196,7 +196,6 @@ add_library(ggml-base
../include/gguf.h ../include/gguf.h
ggml.c ggml.c
ggml.cpp ggml.cpp
ggml-impl.h
ggml-alloc.c ggml-alloc.c
ggml-backend.cpp ggml-backend.cpp
ggml-opt.cpp ggml-opt.cpp
@@ -403,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)
add_compile_definitions(GGML_VXE)
target_compile_definitions(ggml PRIVATE GGML_VXE)
target_compile_definitions(ggml-base PRIVATE GGML_VXE)
message(STATUS "GGML_VXE triggered")
endif()
if (GGML_NNPA)
add_compile_definitions(GGML_NNPA)
target_compile_definitions(ggml PRIVATE GGML_NNPA)
target_compile_definitions(ggml-base PRIVATE GGML_NNPA)
message(STATUS "GGML_NNPA triggered")
endif()

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

@@ -443,6 +443,7 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
elseif (GGML_SYSTEM_ARCH STREQUAL "s390x") elseif (GGML_SYSTEM_ARCH STREQUAL "s390x")
message(STATUS "s390x detected") message(STATUS "s390x detected")
list(APPEND GGML_CPU_SOURCES ggml-cpu/arch/s390/quants.c) list(APPEND GGML_CPU_SOURCES ggml-cpu/arch/s390/quants.c)
list(APPEND GGML_CPU_SOURCES ggml-cpu/arch/s390/typedef.h)
file(READ "/proc/cpuinfo" CPUINFO_CONTENTS) file(READ "/proc/cpuinfo" CPUINFO_CONTENTS)
string(REGEX REPLACE "machine[ \t\r\n]*=[ \t\r\n]*([0-9]+)" "\\1" S390X_M ${CPUINFO_CONTENTS}) string(REGEX REPLACE "machine[ \t\r\n]*=[ \t\r\n]*([0-9]+)" "\\1" S390X_M ${CPUINFO_CONTENTS})