holm/whisper.cpp
1
1
Fork 0
forked from extern/whisper.cpp
Code Issues Pull Requests Packages Projects Releases Wiki Activity

whisper : use nullptr (C++11) instead of NULL macro (#299)

Browse Source
This commit is contained in:
Andy Maloney 2022-12-22 09:35:18 -05:00 committed by GitHub
parent 76b6211f9b
commit 42c6730732
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
whisper.cpp
View File

@ -1380,8 +1380,8 @@ static bool whisper_encode(
// input for next layer (inpO -> inpL) // input for next layer (inpO -> inpL)
memcpy(inpL->data, inpO->data, ggml_nbytes(inpL)); memcpy(inpL->data, inpO->data, ggml_nbytes(inpL));
inpL->op = GGML_OP_NONE; inpL->op = GGML_OP_NONE;
inpL->src0 = NULL; inpL->src0 = nullptr;
inpL->src1 = NULL; inpL->src1 = nullptr;
//printf("%s: - used_mem(%d) = %f MB\n", __func__, il, ggml_used_mem(ctxL)/1024.0/1024.0); //printf("%s: - used_mem(%d) = %f MB\n", __func__, il, ggml_used_mem(ctxL)/1024.0/1024.0);
@ -1434,8 +1434,8 @@ static bool whisper_encode(
// TODO: hack to disconnect the encoded features from the previous graph // TODO: hack to disconnect the encoded features from the previous graph
cur->op = GGML_OP_NONE; cur->op = GGML_OP_NONE;
cur->src0 = NULL; cur->src0 = nullptr;
cur->src1 = NULL; cur->src1 = nullptr;
for (int il = 0; il < model.hparams.n_text_layer; ++il) { for (int il = 0; il < model.hparams.n_text_layer; ++il) {
auto & layer = model.layers_decoder[il]; auto & layer = model.layers_decoder[il];
@ -1792,8 +1792,8 @@ static bool whisper_decode(
// input for next layer (inpO -> inpL) // input for next layer (inpO -> inpL)
memcpy(inpL->data, inpO->data, ggml_nbytes(inpL)); memcpy(inpL->data, inpO->data, ggml_nbytes(inpL));
inpL->op = GGML_OP_NONE; inpL->op = GGML_OP_NONE;
inpL->src0 = NULL; inpL->src0 = nullptr;
inpL->src1 = NULL; inpL->src1 = nullptr;
if (N > 1) { if (N > 1) {
//printf("%s: - used_mem(%d) = %f MB\n", __func__, il, ggml_used_mem(ctxL)/1024.0/1024.0); //printf("%s: - used_mem(%d) = %f MB\n", __func__, il, ggml_used_mem(ctxL)/1024.0/1024.0);
@ -2235,7 +2235,7 @@ struct whisper_context * whisper_init(const char * path_model) {
if (!whisper_model_load(path_model, *ctx)) { if (!whisper_model_load(path_model, *ctx)) {
fprintf(stderr, "%s: failed to load model from '%s'\n", __func__, path_model); fprintf(stderr, "%s: failed to load model from '%s'\n", __func__, path_model);
return NULL; return nullptr;
} }
ctx->t_load_us = ggml_time_us() - t_start_us; ctx->t_load_us = ggml_time_us() - t_start_us;
@ -2397,7 +2397,7 @@ const char * whisper_lang_str(int id) {
} }
fprintf(stderr, "%s: unknown language id %d\n", __func__, id); fprintf(stderr, "%s: unknown language id %d\n", __func__, id);
return NULL; return nullptr;
} }
int whisper_lang_auto_detect( int whisper_lang_auto_detect(