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

fix race condition bug in non-inplace ggml_compute_forward_diag_mask_f32

Browse source 
memcpy needs to be synchronized across threads to avoid race conditions.
=> do it in INIT phase
This commit is contained in:
xaedes 2023-05-14 20:54:57 +02:00
parent 4339f8cf28
commit 69108167cd
No known key found for this signature in database
GPG key ID: 30030EDD817EA2B1
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ggml.c
View file

@ -10358,8 +10358,8 @@ static void ggml_compute_forward_diag_mask_f32(
const struct ggml_tensor * src1,
struct ggml_tensor * dst,
const float value) {
assert(src1->type == GGML_TYPE_I32);
assert(ggml_nelements(src1) == 2);
GGML_ASSERT(src1->type == GGML_TYPE_I32);
GGML_ASSERT(ggml_nelements(src1) == 2);
const int ith = params->ith;
const int nth = params->nth;
@ -10369,9 +10369,12 @@ static void ggml_compute_forward_diag_mask_f32(
if (!inplace && (params->type == GGML_TASK_INIT)) {
// dup needs to be synchronized across threads to avoid race conditions.
// memcpy needs to be synchronized across threads to avoid race conditions.
// => do it in INIT phase
ggml_compute_forward_dup_same_cont(params, src0, dst);
memcpy(
((char *) dst->data),
((char *) src0->data),
ggml_nbytes(dst));
}
if (params->type == GGML_TASK_INIT || params->type == GGML_TASK_FINALIZE) {
@ -10385,8 +10388,8 @@ static void ggml_compute_forward_diag_mask_f32(
const int nr = src0->ne[1];
const int nz = n/nr;
assert( dst->nb[0] == sizeof(float));
assert(src0->nb[0] == sizeof(float));
GGML_ASSERT( dst->nb[0] == sizeof(float));
GGML_ASSERT(src0->nb[0] == sizeof(float));
for (int k = 0; k < nz; k++) {
for (int j = ith; j < nr; j += nth) {