From f45c3ea103bbe1c47d938895dee8a79cf04c0cd9 Mon Sep 17 00:00:00 2001 From: Anoop Kapoor Date: Sat, 25 Oct 2025 00:35:19 -0700 Subject: [PATCH 1/2] @FIR-1044 - lama.cpp: its crashing for new model due to recent bug --- ggml/src/CMakeLists.txt | 4 ++-- tools/main/main.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt index ee0d280fede4f..96b296d518eee 100644 --- a/ggml/src/CMakeLists.txt +++ b/ggml/src/CMakeLists.txt @@ -318,8 +318,8 @@ if (GGML_CPU_ALL_VARIANTS) ggml_add_cpu_backend_variant(x64) ggml_add_cpu_backend_variant(sse42 SSE42) ggml_add_cpu_backend_variant(sandybridge SSE42 AVX) - ggml_add_cpu_backend_variant(haswell SSE42 AVX F16C AVX2 BMI2 FMA) - ggml_add_cpu_backend_variant(skylakex SSE42 AVX F16C AVX2 BMI2 FMA AVX512) + ggml_add_cpu_backend_variant(haswell SSE42 F16C BMI2) + ggml_add_cpu_backend_variant(skylakex SSE42 F16C BMI2) ggml_add_cpu_backend_variant(icelake SSE42 AVX F16C AVX2 BMI2 FMA AVX512 AVX512_VBMI AVX512_VNNI) ggml_add_cpu_backend_variant(alderlake SSE42 AVX F16C AVX2 BMI2 FMA AVX_VNNI) if (NOT MSVC) diff --git a/tools/main/main.cpp b/tools/main/main.cpp index 6af59ffbe58dc..3fbc481dc24ec 100644 --- a/tools/main/main.cpp +++ b/tools/main/main.cpp @@ -290,7 +290,6 @@ int main(int argc, char ** argv) { auto formatted = common_chat_format_single(chat_templates.get(), chat_msgs, new_msg, role == "user", g_params->use_jinja); chat_msgs.push_back(new_msg); LOG_DBG("formatted: '%s'\n", formatted.c_str()); - ggml_backend_cleanup(); return formatted; }; From 9ab4b3ce93abec1f4304c22ff54c95fe1a894218 Mon Sep 17 00:00:00 2001 From: Anoop Kapoor Date: Sat, 25 Oct 2025 00:39:37 -0700 Subject: [PATCH 2/2] Reverted this change --- ggml/src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt index 96b296d518eee..ee0d280fede4f 100644 --- a/ggml/src/CMakeLists.txt +++ b/ggml/src/CMakeLists.txt @@ -318,8 +318,8 @@ if (GGML_CPU_ALL_VARIANTS) ggml_add_cpu_backend_variant(x64) ggml_add_cpu_backend_variant(sse42 SSE42) ggml_add_cpu_backend_variant(sandybridge SSE42 AVX) - ggml_add_cpu_backend_variant(haswell SSE42 F16C BMI2) - ggml_add_cpu_backend_variant(skylakex SSE42 F16C BMI2) + ggml_add_cpu_backend_variant(haswell SSE42 AVX F16C AVX2 BMI2 FMA) + ggml_add_cpu_backend_variant(skylakex SSE42 AVX F16C AVX2 BMI2 FMA AVX512) ggml_add_cpu_backend_variant(icelake SSE42 AVX F16C AVX2 BMI2 FMA AVX512 AVX512_VBMI AVX512_VNNI) ggml_add_cpu_backend_variant(alderlake SSE42 AVX F16C AVX2 BMI2 FMA AVX_VNNI) if (NOT MSVC)