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

Merge branch 'feat-jina-embeddings' of https://github.com/JoanFM/llama.cpp into feat-jina-embeddings-v2-zh

Browse source
This commit is contained in:
Joan Martinez 2024-04-30 14:34:26 +02:00
commit e73ab4bd16
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ggml.c
View file

@ -5478,9 +5478,9 @@ static struct ggml_tensor * ggml_soft_max_impl(
GGML_ASSERT(pos->type == mask->type);
}
/*if (max_bias > 0.0f) {
if (max_bias > 0.0f) {
GGML_ASSERT(pos);
}*/
}
bool is_node = false;
@ -12401,7 +12401,6 @@ static void ggml_compute_forward_soft_max_f32(
float * wp = (float *) params->wdata + (nc + CACHE_LINE_SIZE_F32) * ith;
// when max_bias <= 0.0f, src2 is not used and we default it to src0 to avoid branching
//float * pos = src2 ? (float *) src2->data : NULL;
ggml_fp16_t * pos_f16 = src2 ? (ggml_fp16_t *) src2->data : src0->data;
float * pos_f32 = src2 ? (float *) src2->data : src0->data;