extern/whisper.cpp
1
0
Fork 1
mirror of https://github.com/ggerganov/whisper.cpp.git synced 2025-04-25 03:38:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

minor : resolves some of warnings when compiling with clang/clang++ (#294)

Browse Source 
* Resolves some of warnings when compiling with clang/clang++

Mostly nit stuff that clang catches when compiling with -Wall -Wextra
-pedantic.

- Fix comparison between sign/unsigned integers.
- Passes a constant reference (const&) instead of copying each time.

* minor : normalize coding style

* minor : fix warning

Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
This commit is contained in:
Matheus de Sousa 2022-12-19 15:19:01 -03:00 committed by GitHub
parent 1d716d6e34
commit 8e3f129b4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/main/main.cpp
View File

@ -550,11 +550,11 @@ int main(int argc, char ** argv) {
// convert to mono, float // convert to mono, float
pcmf32.resize(n); pcmf32.resize(n);
if (wav.channels == 1) { if (wav.channels == 1) {
for (int i = 0; i < n; i++) { for (uint64_t i = 0; i < n; i++) {
pcmf32[i] = float(pcm16[i])/32768.0f; pcmf32[i] = float(pcm16[i])/32768.0f;
} }
} else { } else {
for (int i = 0; i < n; i++) { for (uint64_t i = 0; i < n; i++) {
pcmf32[i] = float(pcm16[2*i] + pcm16[2*i + 1])/65536.0f; pcmf32[i] = float(pcm16[2*i] + pcm16[2*i + 1])/65536.0f;
} }
} }
@ -565,7 +565,7 @@ int main(int argc, char ** argv) {
pcmf32s[0].resize(n); pcmf32s[0].resize(n);
pcmf32s[1].resize(n); pcmf32s[1].resize(n);
for (int i = 0; i < n; i++) { for (uint64_t i = 0; i < n; i++) {
pcmf32s[0][i] = float(pcm16[2*i])/32768.0f; pcmf32s[0][i] = float(pcm16[2*i])/32768.0f;
pcmf32s[1][i] = float(pcm16[2*i + 1])/32768.0f; pcmf32s[1][i] = float(pcm16[2*i + 1])/32768.0f;
} }

8
whisper.cpp
View File

@ -2360,12 +2360,12 @@ struct whisper_token_data whisper_sample_timestamp(struct whisper_context * ctx,
int whisper_tokenize(struct whisper_context * ctx, const char * text, whisper_token * tokens, int n_max_tokens) { int whisper_tokenize(struct whisper_context * ctx, const char * text, whisper_token * tokens, int n_max_tokens) {
const auto res = tokenize(ctx->vocab, text); const auto res = tokenize(ctx->vocab, text);
if (res.size() > n_max_tokens) { if (n_max_tokens < (int) res.size()) {
fprintf(stderr, "%s: too many resulting tokens: %d (max %d)\n", __func__, (int) res.size(), n_max_tokens); fprintf(stderr, "%s: too many resulting tokens: %d (max %d)\n", __func__, (int) res.size(), n_max_tokens);
return -1; return -1;
} }
for (int i = 0; i < res.size(); i++) { for (int i = 0; i < (int) res.size(); i++) {
tokens[i] = res[i]; tokens[i] = res[i];
} }
@ -2438,7 +2438,7 @@ int whisper_lang_auto_detect(
} }
std::vector<std::pair<float, int>> probs_id; std::vector<std::pair<float, int>> probs_id;
for (const auto kv : g_lang) { for (const auto & kv : g_lang) {
const auto token_lang = whisper_token_lang(ctx, kv.second.first); const auto token_lang = whisper_token_lang(ctx, kv.second.first);
probs_id.push_back({ ctx->probs[token_lang], kv.second.first }); probs_id.push_back({ ctx->probs[token_lang], kv.second.first });
} }
@ -2464,7 +2464,7 @@ int whisper_lang_auto_detect(
} }
{ {
for (int i = 0; i < probs_id.size(); i++) { for (int i = 0; i < (int) probs_id.size(); i++) {
if (lang_probs) { if (lang_probs) {
lang_probs[probs_id[i].second] = probs_id[i].first; lang_probs[probs_id[i].second] = probs_id[i].first;
} }

2
whisper.h
View File

@ -148,7 +148,7 @@ extern "C" {
struct whisper_context * ctx, struct whisper_context * ctx,
const char * text, const char * text,
whisper_token * tokens, whisper_token * tokens,
int n_max_tokens); int n_max_tokens);
// Largest language id (i.e. number of available languages - 1) // Largest language id (i.e. number of available languages - 1)
WHISPER_API int whisper_lang_max_id(); WHISPER_API int whisper_lang_max_id();