vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updates for review comments

Browse source
This commit is contained in:
Charles Xu 2025-02-07 16:09:58 +01:00
parent 3e08f37b08
commit 9edd10737b
3 changed files with 114 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ggml/src/ggml-cpu/ggml-kleidiai/ggml-kleidiai.cpp
View file

@ -23,6 +23,7 @@
#include "ggml-cpu.h"
#include "ggml-impl.h"
#include "ggml-backend-impl.h"
#include "ggml-threading.h"
#include "kleidiai_kernels.h"
@ -35,6 +36,8 @@ struct ggml_kleidiai_context {
} static ctx = { NULL };
static void init_kleidiai_context(void) {
ggml_critical_section_start();
static bool initialized = false;
if (!initialized) {
@ -55,6 +58,12 @@ static void init_kleidiai_context(void) {
}
ctx.kernels = ggml_kleidiai_select_kernels(features);
}
ggml_critical_section_end();
}
static inline int ggml_ne(const ggml_tensor * tensor, int dim) {
GGML_ASSERT(dim >= 0 && dim < GGML_MAX_DIMS);
return tensor->ne[dim];
}
namespace ggml::cpu::kleidiai {
@ -237,7 +246,8 @@ class extra_buffer_type : ggml::cpu::extra_buffer_type {
if (op->src[1]->buffer && !ggml_backend_buft_is_host(op->src[1]->buffer->buft)) {
return false;
}
if (op->src[1]->type == GGML_TYPE_F32) {
if (op->src[1]->type == GGML_TYPE_F32 &&
ggml_ne(op->src[1], 2) == 1 && ggml_ne(op->src[1], 3) == 1) {
return true;
}
}