From 781c2637227decd7491048f1980a6f6b55079716 Mon Sep 17 00:00:00 2001 From: Aaron Teo Date: Sat, 21 Jun 2025 19:41:01 +0800 Subject: [PATCH] ggml-cpu: move things around Signed-off-by: Aaron Teo --- ggml/src/CMakeLists.txt | 15 --------------- ggml/src/ggml-cpu/CMakeLists.txt | 1 + 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt index 04daf8ee12..9cb2c228dc 100644 --- a/ggml/src/CMakeLists.txt +++ b/ggml/src/CMakeLists.txt @@ -196,7 +196,6 @@ add_library(ggml-base ../include/gguf.h ggml.c ggml.cpp - ggml-impl.h ggml-alloc.c ggml-backend.cpp ggml-opt.cpp @@ -403,17 +402,3 @@ if (BUILD_SHARED_LIBS) target_compile_definitions(${target} PUBLIC GGML_SHARED) endforeach() 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() diff --git a/ggml/src/ggml-cpu/CMakeLists.txt b/ggml/src/ggml-cpu/CMakeLists.txt index f5ddb219c8..babcfaf6ab 100644 --- a/ggml/src/ggml-cpu/CMakeLists.txt +++ b/ggml/src/ggml-cpu/CMakeLists.txt @@ -443,6 +443,7 @@ function(ggml_add_cpu_backend_variant_impl tag_name) elseif (GGML_SYSTEM_ARCH STREQUAL "s390x") message(STATUS "s390x detected") 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) string(REGEX REPLACE "machine[ \t\r\n]*=[ \t\r\n]*([0-9]+)" "\\1" S390X_M ${CPUINFO_CONTENTS})