LLM inference in C/C++
C++ ggml
ggml : fix arm builds, unused var (#26991)
Georgi Gerganov1f368f354d9e
diff --git a/ggml/src/ggml-cpu/arch/arm/cpu-feats.cpp b/ggml/src/ggml-cpu/arch/arm/cpu-feats.cppindex 1394256089..84a11eabd4 100644--- a/ggml/src/ggml-cpu/arch/arm/cpu-feats.cpp+++ b/ggml/src/ggml-cpu/arch/arm/cpu-feats.cpp@@ -5,7 +5,8 @@static int ggml_backend_cpu_aarch64_score() {int score = 1;- ggml_feats_arch64_runtime_t af = ggml_get_aarch64_runtime_features();+ const ggml_feats_arch64_runtime_t af = ggml_feats_get_arch64_runtime();+ GGML_UNUSED(af);#ifdef GGML_USE_DOTPRODif (!af.has_dotprod) { return 0; }diff --git a/ggml/src/ggml-cpu/kleidiai/kleidiai.cpp b/ggml/src/ggml-cpu/kleidiai/kleidiai.cppindex c1cc33db27..2266c16898 100644--- a/ggml/src/ggml-cpu/kleidiai/kleidiai.cpp+++ b/ggml/src/ggml-cpu/kleidiai/kleidiai.cpp@@ -184,7 +184,7 @@ static void add_smcus_from_smidr(uint64_t smidr, size_t & num_private, std::map<}static size_t detect_num_smcus() {- auto runtime_feat = ggml_get_aarch64_runtime_features();+ const auto runtime_feat = ggml_feats_get_arch64_runtime();if (!runtime_feat.has_sme) {return 0;}@@ -310,7 +310,7 @@ static void init_kleidiai_context(void) {const char *env_threads = getenv("GGML_TOTAL_THREADS");const char *env_chunk_mult = getenv("GGML_KLEIDIAI_CHUNK_MULTIPLIER");- auto runtime_feat = ggml_get_aarch64_runtime_features();+ const auto runtime_feat = ggml_feats_get_arch64_runtime();size_t detected_smcus = 0;diff --git a/ggml/src/ggml-feats.h b/ggml/src/ggml-feats.hindex d4a8c83a7f..79a0afd87a 100644--- a/ggml/src/ggml-feats.h+++ b/ggml/src/ggml-feats.h@@ -92,7 +92,7 @@ typedef struct ggml_feats_arch64_runtime {int sve_cnt;} ggml_feats_arch64_runtime_t;-static inline ggml_feats_arch64_runtime_t ggml_get_aarch64_runtime_features(void) {+static inline ggml_feats_arch64_runtime_t ggml_feats_get_arch64_runtime(void) {ggml_feats_arch64_runtime_t runtime_feat = {};#if defined(__linux__)