Public/koboldcpp
1
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2026-09-20 01:31:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adjust int types in format strings (#2009)

Browse Source 
* tweak format sting types
This may not be all of them, but it's the ones which warn on OpenBSD

* complete the changes needed to fix the format string specifers

* avoid using inttypes, directly cast to size_t (u64 usually) instead

---------

Co-authored-by: Concedo <39025047+LostRuins@users.noreply.github.com>
This commit is contained in:
JustCommitRandomness
2026-03-06 11:06:18 +00:00
committed by GitHub
parent e36d7b6464
commit 2fbc3b2ae5
13 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
otherarch/tts_adapter.cpp
+13 -13
View File
@@ -607,7 +607,7 @@ bool ttstype_load_model(const tts_load_model_inputs inputs)
if(devices_override.size()>0)
{
printf("\nOverriding with %d devices...\n",devices_override.size()-1);
printf("\nOverriding with %zu devices...\n",devices_override.size()-1);
tts_model_params.devices = devices_override.data();
}
@@ -846,7 +846,7 @@ static tts_generation_outputs ttstype_generate_outetts(const tts_generation_inpu
//able to proceed, do nothing
if(!tts_is_quiet && ttsdebugmode==1)
{
printf("\nReuse speaker ID=%d (%d tokens)...", last_speaker_seed, last_speaker_codes.size());
printf("\nReuse speaker ID=%d (%zu tokens)...", last_speaker_seed, last_speaker_codes.size());
}
} else if (custom_speaker_data!="" && custom_speaker_text!="") { //custom speaker json
std::string speaker = format_audiotokens(custom_speaker_data,ttsver);
@@ -854,7 +854,7 @@ static tts_generation_outputs ttstype_generate_outetts(const tts_generation_inpu
last_speaker_seed = speaker_seed;
if(!tts_is_quiet && ttsdebugmode==1)
{
printf("\nCustom Speaker JSON (%d tokens)...", last_speaker_seed, last_speaker_codes.size());
printf("\nCustom Speaker JSON seed=%d (%zu tokens)...", last_speaker_seed, last_speaker_codes.size());
}
} else if (speaker_seed>=1 && speaker_seed<=5){ //special seeds
std::string speaker = "";
@@ -880,7 +880,7 @@ static tts_generation_outputs ttstype_generate_outetts(const tts_generation_inpu
last_speaker_seed = speaker_seed;
if(!tts_is_quiet && ttsdebugmode==1)
{
printf("\nSpecial ID=%d (%d tokens)...", last_speaker_seed, last_speaker_codes.size());
printf("\nSpecial ID=%d (%zu tokens)...", last_speaker_seed, last_speaker_codes.size());
}
} else {
//generate the voice texture of our new speaker
@@ -888,7 +888,7 @@ static tts_generation_outputs ttstype_generate_outetts(const tts_generation_inpu
guide_tokens = prepare_guide_tokens(ttcvocab,sampletext,ttsver);
if(!tts_is_quiet && ttsdebugmode==1)
{
printf("\nGuide Tokens (%d tokens):\n", guide_tokens.size());
printf("\nGuide Tokens (%zu tokens):\n", guide_tokens.size());
const std::string inp_txt = common_detokenize(ttc_ctx, guide_tokens, true);
printf("%s,", inp_txt.c_str());
printf("\n");
@@ -897,7 +897,7 @@ static tts_generation_outputs ttstype_generate_outetts(const tts_generation_inpu
prompt_add(prompt_inp, ttcvocab, "<|text_end|>\n<|audio_start|>\n", false, true);
if(!tts_is_quiet && ttsdebugmode==1)
{
printf("\nPrepare new speaker (%d input tokens)...\n", prompt_inp.size());
printf("\nPrepare new speaker (%zu input tokens)...\n", prompt_inp.size());
print_tok_vec(prompt_inp);
}
kcpp_embd_batch tts_batch = kcpp_embd_batch(prompt_inp, 0, false, false);
@@ -969,7 +969,7 @@ static tts_generation_outputs ttstype_generate_outetts(const tts_generation_inpu
last_speaker_seed = speaker_seed;
if(!tts_is_quiet && ttsdebugmode==1)
{
printf("\nNew speaker ID=%d created (%d tokens)...", last_speaker_seed, last_speaker_codes.size());
printf("\nNew speaker ID=%d created (%zu tokens)...", last_speaker_seed, last_speaker_codes.size());
const std::string inp_txt = common_detokenize(ttc_ctx, last_speaker_codes, true);
printf("\n%s\n", inp_txt.c_str());
}
@@ -985,7 +985,7 @@ static tts_generation_outputs ttstype_generate_outetts(const tts_generation_inpu
guide_tokens = prepare_guide_tokens(ttcvocab,prompt_clean,ttsver);
if(!tts_is_quiet && ttsdebugmode==1)
{
printf("\nGuide Tokens (%d tokens):\n", guide_tokens.size());
printf("\nGuide Tokens (%zu tokens):\n", guide_tokens.size());
const std::string inp_txt = common_detokenize(ttc_ctx, guide_tokens, true);
printf("%s", inp_txt.c_str());
printf("\n");
@@ -998,7 +998,7 @@ static tts_generation_outputs ttstype_generate_outetts(const tts_generation_inpu
if(!tts_is_quiet)
{
printf("\nTTS Processing (%d input tokens)...\n", prompt_inp.size());
printf("\nTTS Processing (%zu input tokens)...\n", prompt_inp.size());
}
prompt_add(prompt_inp, ttcvocab, "<|text_end|>\n<|audio_start|>\n", false, true);
@@ -1011,7 +1011,7 @@ static tts_generation_outputs ttstype_generate_outetts(const tts_generation_inpu
if(!tts_is_quiet && ttsdebugmode==1)
{
printf("\nDUMP TTS PROMPT (%d tokens):\n", prompt_inp.size());
printf("\nDUMP TTS PROMPT (%zu tokens):\n", prompt_inp.size());
print_tok_vec(prompt_inp);
const std::string inp_txt = common_detokenize(ttc_ctx, prompt_inp, true);
printf("\n%s\n", inp_txt.c_str());
@@ -1084,7 +1084,7 @@ static tts_generation_outputs ttstype_generate_outetts(const tts_generation_inpu
if(!tts_is_quiet && ttsdebugmode==1)
{
const std::string inp_txt = common_detokenize(ttc_ctx, codes, true);
printf("\nGenerated %d Codes: '%s'\n",codes.size(), inp_txt.c_str());
printf("\nGenerated %zu Codes: '%s'\n",codes.size(), inp_txt.c_str());
}
// remove all non-audio tokens (i.e. < 151672 || > 155772)
@@ -1104,7 +1104,7 @@ static tts_generation_outputs ttstype_generate_outetts(const tts_generation_inpu
return output;
}
kcpp_embd_batch codebatch = kcpp_embd_batch(codes,0,false,true);
printf("\nRunning Vocoder (%d AudioTokens)", codes.size());
printf("\nRunning Vocoder (%zu AudioTokens)", codes.size());
if (llama_encode(cts_ctx, codebatch.batch) != 0) {
printf("\nError: TTS vocoder generation failed!\n");
@@ -1256,4 +1256,4 @@ tts_generation_outputs ttstype_generate(const tts_generation_inputs inputs)
{
return ttstype_generate_outetts(inputs);
}
}
}