Skip to content

Fix KleidiAI compilation errors with -DGGML_NATIVE=OFF (issue #14464) #14700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+12 −1
Open

Fix KleidiAI compilation errors with -DGGML_NATIVE=OFF (issue #14464) #14700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b62fe0
Fix KleidiAI compilation errors with -DGGML_NATIVE=OFF (issue #14464)
baonudesifeizhai Jul 15, 2025
bc3d2c0
Fix KleidiAI compilation with improved fallback and error handling
baonudesifeizhai Jul 16, 2025
4993984
Address PR review feedback: Keep GGML_ASSERT for early misconfigurati…
baonudesifeizhai Jul 17, 2025
f04e7e5
Address PR review feedback: Improve repack() error handling while kee…
baonudesifeizhai Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ggml/src/ggml-cpu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
target_compile_definitions(${GGML_CPU_NAME} PRIVATE GGML_USE_CPU_REPACK)
endif()

if (GGML_CPU_KLEIDIAI)
if (GGML_CPU_KLEIDIAI AND GGML_CPU_AARCH64 AND (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64"))
message(STATUS "Using KleidiAI optimized kernels if applicable")

# Disable the KleidiAI tests
Expand Down
11 changes: 11 additions & 0 deletions ggml/src/ggml-cpu/kleidiai/kernels.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
#include "kernels.h"

#define NELEMS(x) sizeof(x) / sizeof(*x)

// Check if any ARM features are available
#if defined(__ARM_FEATURE_SME) || defined(__ARM_FEATURE_DOTPROD) || defined(__ARM_FEATURE_MATMUL_INT8)
static ggml_kleidiai_kernels gemm_gemv_kernels[] = {
#if defined(__ARM_FEATURE_SME)
{
Expand Down Expand Up @@ -304,10 +307,15 @@ static ggml_kleidiai_kernels gemm_gemv_kernels[] = {
#endif
#endif
};
#else
// Fallback for when no ARM features are available - provide an empty array
static ggml_kleidiai_kernels gemm_gemv_kernels[1] = {};
#endif

ggml_kleidiai_kernels * ggml_kleidiai_select_kernels(cpu_feature cpu_features, const ggml_tensor * tensor) {
ggml_kleidiai_kernels * kernel = nullptr;

#if defined(__ARM_FEATURE_SME) || defined(__ARM_FEATURE_DOTPROD) || defined(__ARM_FEATURE_MATMUL_INT8)
if (tensor->op == GGML_OP_MUL_MAT && tensor->src[0] != nullptr && tensor->src[1] != nullptr) {
for (size_t i = 0; i < NELEMS(gemm_gemv_kernels); ++i) {
if ((cpu_features & gemm_gemv_kernels[i].required_cpu) == gemm_gemv_kernels[i].required_cpu &&
Expand All @@ -319,19 +327,22 @@ ggml_kleidiai_kernels * ggml_kleidiai_select_kernels(cpu_feature cpu_features, c
}
}
}
#endif

return kernel;
}

ggml_kleidiai_kernels * ggml_kleidiai_select_kernels_q4_0(cpu_feature features) {
ggml_kleidiai_kernels * kernels = nullptr;

#if defined(__ARM_FEATURE_SME) || defined(__ARM_FEATURE_DOTPROD) || defined(__ARM_FEATURE_MATMUL_INT8)
for (size_t i = 0; i < NELEMS(gemm_gemv_kernels); ++i) {
if ((features & gemm_gemv_kernels[i].required_cpu) == gemm_gemv_kernels[i].required_cpu) {
kernels = &gemm_gemv_kernels[i];
break;
}
}
#endif

return kernels;
}
Loading