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

move dup call into the actual add_at functions

Browse source
This commit is contained in:
xaedes 2023-04-28 20:30:42 +02:00
parent 3dbd649cf9
commit 7281f60572
No known key found for this signature in database
GPG key ID: 30030EDD817EA2B1
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ggml.c
View file

@ -7948,6 +7948,8 @@ static void ggml_compute_forward_add_at_f32(
// GGML_ASSERT(ggml_are_same_shape(src0, src1)); // TODO: assert that offset+len(src1) <= len(src1) // GGML_ASSERT(ggml_are_same_shape(src0, src1)); // TODO: assert that offset+len(src1) <= len(src1)
GGML_ASSERT(ggml_are_same_shape(src0, dst)); GGML_ASSERT(ggml_are_same_shape(src0, dst));
ggml_compute_forward_dup_same_cont(params, src0, dst);
if (params->type == GGML_TASK_INIT || params->type == GGML_TASK_FINALIZE) { if (params->type == GGML_TASK_INIT || params->type == GGML_TASK_FINALIZE) {
return; return;
} }
@ -8007,6 +8009,8 @@ static void ggml_compute_forward_add_at_f16_f32(
// GGML_ASSERT(ggml_are_same_shape(src0, src1)); // TODO: assert that offset+len(src1) <= len(src1) // GGML_ASSERT(ggml_are_same_shape(src0, src1)); // TODO: assert that offset+len(src1) <= len(src1)
GGML_ASSERT(ggml_are_same_shape(src0, dst)); GGML_ASSERT(ggml_are_same_shape(src0, dst));
ggml_compute_forward_dup_same_cont(params, src0, dst);
if (params->type == GGML_TASK_INIT || params->type == GGML_TASK_FINALIZE) { if (params->type == GGML_TASK_INIT || params->type == GGML_TASK_FINALIZE) {
return; return;
} }
@ -8058,6 +8062,8 @@ static void ggml_compute_forward_add_at_f16_f16(
// GGML_ASSERT(ggml_are_same_shape(src0, src1)); // TODO: assert that offset+len(src1) <= len(src1) // GGML_ASSERT(ggml_are_same_shape(src0, src1)); // TODO: assert that offset+len(src1) <= len(src1)
GGML_ASSERT(ggml_are_same_shape(src0, dst)); GGML_ASSERT(ggml_are_same_shape(src0, dst));
ggml_compute_forward_dup_same_cont(params, src0, dst);
if (params->type == GGML_TASK_INIT || params->type == GGML_TASK_FINALIZE) { if (params->type == GGML_TASK_INIT || params->type == GGML_TASK_FINALIZE) {
return; return;
} }
@ -8109,6 +8115,8 @@ static void ggml_compute_forward_add_at_q_f32(
// GGML_ASSERT(ggml_are_same_shape(src0, src1)); // TODO: assert that offset+len(src1) <= len(src1) // GGML_ASSERT(ggml_are_same_shape(src0, src1)); // TODO: assert that offset+len(src1) <= len(src1)
GGML_ASSERT(ggml_are_same_shape(src0, dst)); GGML_ASSERT(ggml_are_same_shape(src0, dst));
ggml_compute_forward_dup_same_cont(params, src0, dst);
if (params->type == GGML_TASK_INIT || params->type == GGML_TASK_FINALIZE) { if (params->type == GGML_TASK_INIT || params->type == GGML_TASK_FINALIZE) {
return; return;
} }
@ -8217,7 +8225,6 @@ static void ggml_compute_forward_add_at(
struct ggml_tensor * dst) { struct ggml_tensor * dst) {
size_t offset; size_t offset;
memcpy(&offset, dst->padding, sizeof(offset)); memcpy(&offset, dst->padding, sizeof(offset));
ggml_compute_forward_dup_same_cont(params, src0, dst);
switch (src0->type) { switch (src0->type) {
case GGML_TYPE_F32: case GGML_TYPE_F32:
{ {