From e04880fa54314b0448123d115da678b06adf51a1 Mon Sep 17 00:00:00 2001 From: Charles Xu Date: Fri, 7 Feb 2025 17:42:54 +0100 Subject: [PATCH] More updates for review comments --- ggml/src/ggml-cpu/CMakeLists.txt | 2 +- ggml/src/ggml-cpu/ggml-kleidiai/ggml-kleidiai.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ggml/src/ggml-cpu/CMakeLists.txt b/ggml/src/ggml-cpu/CMakeLists.txt index 10c7eb847..043b12f05 100644 --- a/ggml/src/ggml-cpu/CMakeLists.txt +++ b/ggml/src/ggml-cpu/CMakeLists.txt @@ -116,7 +116,7 @@ function(ggml_add_cpu_backend_variant_impl tag_name) set(ARM_MCPU_FLAG_FIX "${ARM_MCPU_FLAG_FIX}+${tag}" PARENT_SCOPE) else() set(CMAKE_REQUIRED_FLAGS "${ARM_MCPU_FLAG}+no${tag}") - check_cxx_source_compiles("${code}" GGML_MACHINE_SUPPORTS_no${tag}) + check_cxx_source_compiles("int main() { return 0; }" GGML_MACHINE_SUPPORTS_no${tag}) if (GGML_MACHINE_SUPPORTS_no${tag}) set(ARM_MCPU_FLAG_FIX "${ARM_MCPU_FLAG_FIX}+no${tag}" PARENT_SCOPE) endif() diff --git a/ggml/src/ggml-cpu/ggml-kleidiai/ggml-kleidiai.cpp b/ggml/src/ggml-cpu/ggml-kleidiai/ggml-kleidiai.cpp index 8b689880e..abd2e9ffc 100644 --- a/ggml/src/ggml-cpu/ggml-kleidiai/ggml-kleidiai.cpp +++ b/ggml/src/ggml-cpu/ggml-kleidiai/ggml-kleidiai.cpp @@ -61,7 +61,7 @@ static void init_kleidiai_context(void) { ggml_critical_section_end(); } -static inline int ggml_ne(const ggml_tensor * tensor, int dim) { +static inline int64_t ggml_ne(const ggml_tensor * tensor, int dim) { GGML_ASSERT(dim >= 0 && dim < GGML_MAX_DIMS); return tensor->ne[dim]; }