mirror of
https://github.com/ggerganov/whisper.cpp.git
synced 2024-12-27 09:08:55 +01:00
ggml : remove obsolete zeroing + comment fixes (#390)
This commit is contained in:
parent
5e9f33596f
commit
4ef3398e8f
6
ggml.c
6
ggml.c
@ -3724,8 +3724,6 @@ static void ggml_compute_forward_sum_f32(
|
|||||||
assert(ggml_is_scalar(dst));
|
assert(ggml_is_scalar(dst));
|
||||||
assert(src0->nb[0] == sizeof(float));
|
assert(src0->nb[0] == sizeof(float));
|
||||||
|
|
||||||
*(float *) (dst->data) = 0.0f;
|
|
||||||
|
|
||||||
const int ne00 = src0->ne[0];
|
const int ne00 = src0->ne[0];
|
||||||
const int ne01 = src0->ne[1];
|
const int ne01 = src0->ne[1];
|
||||||
const int ne02 = src0->ne[2];
|
const int ne02 = src0->ne[2];
|
||||||
@ -3811,8 +3809,6 @@ static void ggml_compute_forward_mean_f32(
|
|||||||
for (int i03 = 0; i03 < ne03; i03++) {
|
for (int i03 = 0; i03 < ne03; i03++) {
|
||||||
for (int i02 = 0; i02 < ne02; i02++) {
|
for (int i02 = 0; i02 < ne02; i02++) {
|
||||||
for (int i01 = 0; i01 < ne01; i01++) {
|
for (int i01 = 0; i01 < ne01; i01++) {
|
||||||
*(float *) ((char *) dst->data + i01*nb1 + i02*nb2 + i03*nb3) = 0.0f;
|
|
||||||
|
|
||||||
ggml_vec_sum_f32(ne00,
|
ggml_vec_sum_f32(ne00,
|
||||||
(float *) ((char *) dst->data + i01*nb1 + i02*nb2 + i03*nb3),
|
(float *) ((char *) dst->data + i01*nb1 + i02*nb2 + i03*nb3),
|
||||||
(float *) ((char *) src0->data + i01*nb01 + i02*nb02 + i03*nb03));
|
(float *) ((char *) src0->data + i01*nb01 + i02*nb02 + i03*nb03));
|
||||||
@ -4791,7 +4787,7 @@ static void ggml_compute_forward_mul_mat_f16_f32(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// parallelize by src1 columns using ggml_vec_mad_f32
|
// parallelize by src1 columns using ggml_vec_mad_f16
|
||||||
// each thread has its own work data
|
// each thread has its own work data
|
||||||
// during FINALIZE we accumulate all work data into dst
|
// during FINALIZE we accumulate all work data into dst
|
||||||
|
|
||||||
|
@ -1471,6 +1471,7 @@ static bool whisper_encode(
|
|||||||
}
|
}
|
||||||
|
|
||||||
ggml_graph_compute(ctx0, &gf);
|
ggml_graph_compute(ctx0, &gf);
|
||||||
|
//ggml_graph_print(&gf);
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
|
@ -93,8 +93,8 @@ extern "C" {
|
|||||||
void (*close)(void * ctx);
|
void (*close)(void * ctx);
|
||||||
} whisper_model_loader;
|
} whisper_model_loader;
|
||||||
|
|
||||||
// Various function to load a ggml whisper model.
|
// Various functions for loading a ggml whisper model.
|
||||||
// Allocates (almost) all memory needed for the model.
|
// Allocate (almost) all memory needed for the model.
|
||||||
// Return NULL on failure
|
// Return NULL on failure
|
||||||
WHISPER_API struct whisper_context * whisper_init_from_file(const char * path_model);
|
WHISPER_API struct whisper_context * whisper_init_from_file(const char * path_model);
|
||||||
WHISPER_API struct whisper_context * whisper_init_from_buffer(void * buffer, size_t buffer_size);
|
WHISPER_API struct whisper_context * whisper_init_from_buffer(void * buffer, size_t buffer_size);
|
||||||
|
Loading…
Reference in New Issue
Block a user