Skip to content

Commit de2fe89

Browse files
cebtenzzrecebtenzzre
authored
examples : replace fprintf to stdout with printf (#3017)
1 parent c9c3220 commit de2fe89

File tree

7 files changed

+245
-245
lines changed

7 files changed

+245
-245
lines changed

‎common/common.cpp

Lines changed: 94 additions & 94 deletions
Large diffs are not rendered by default.

‎common/log.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -513,16 +513,16 @@ inline bool log_param_pair_parse(bool check_but_dont_parse, const std::string &
513513

514514
inline void log_print_usage()
515515
{
516-
fprintf(stdout, "log options:\n");
516+
printf("log options:\n");
517517
/* format
518-
fprintf(stdout, " -h, --help show this help message and exit\n");*/
518+
printf(" -h, --help show this help message and exit\n");*/
519519
/* spacing
520-
fprintf(stdout, "__-param----------------Description\n");*/
521-
fprintf(stdout, " --log-test Run simple logging test\n");
522-
fprintf(stdout, " --log-disable Disable trace logs\n");
523-
fprintf(stdout, " --log-enable Enable trace logs\n");
524-
fprintf(stdout, " --log-file Specify a log filename (without extension)\n");
525-
fprintf(stdout, " Log file will be tagged with unique ID and written as \"<name>.<ID>.log\"\n"); /* */
520+
printf("__-param----------------Description\n");*/
521+
printf(" --log-test Run simple logging test\n");
522+
printf(" --log-disable Disable trace logs\n");
523+
printf(" --log-enable Enable trace logs\n");
524+
printf(" --log-file Specify a log filename (without extension)\n");
525+
printf(" Log file will be tagged with unique ID and written as \"<name>.<ID>.log\"\n"); /* */
526526
}
527527

528528
#define log_dump_cmdline(argc, argv) log_dump_cmdline_impl(argc, argv)

‎examples/gguf/gguf.cpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ bool gguf_ex_write(const std::string & fname) {
7676

7777
gguf_write_to_file(ctx, fname.c_str(), false);
7878

79-
fprintf(stdout, "%s: wrote file '%s;\n", __func__, fname.c_str());
79+
printf("%s: wrote file '%s;\n", __func__, fname.c_str());
8080

8181
ggml_free(ctx_data);
8282
gguf_free(ctx);
@@ -93,20 +93,20 @@ bool gguf_ex_read_0(const std::string & fname) {
9393

9494
struct gguf_context * ctx = gguf_init_from_file(fname.c_str(), params);
9595

96-
fprintf(stdout, "%s: version: %d\n", __func__, gguf_get_version(ctx));
97-
fprintf(stdout, "%s: alignment: %zu\n", __func__, gguf_get_alignment(ctx));
98-
fprintf(stdout, "%s: data offset: %zu\n", __func__, gguf_get_data_offset(ctx));
96+
printf("%s: version: %d\n", __func__, gguf_get_version(ctx));
97+
printf("%s: alignment: %zu\n", __func__, gguf_get_alignment(ctx));
98+
printf("%s: data offset: %zu\n", __func__, gguf_get_data_offset(ctx));
9999

100100
// kv
101101
{
102102
const int n_kv = gguf_get_n_kv(ctx);
103103

104-
fprintf(stdout, "%s: n_kv: %d\n", __func__, n_kv);
104+
printf("%s: n_kv: %d\n", __func__, n_kv);
105105

106106
for (int i = 0; i < n_kv; ++i) {
107107
const char * key = gguf_get_key(ctx, i);
108108

109-
fprintf(stdout, "%s: kv[%d]: key = %s\n", __func__, i, key);
109+
printf("%s: kv[%d]: key = %s\n", __func__, i, key);
110110
}
111111
}
112112

@@ -116,24 +116,24 @@ bool gguf_ex_read_0(const std::string & fname) {
116116

117117
const int keyidx = gguf_find_key(ctx, findkey);
118118
if (keyidx == -1) {
119-
fprintf(stdout, "%s: find key: %s not found.\n", __func__, findkey);
119+
printf("%s: find key: %s not found.\n", __func__, findkey);
120120
} else {
121121
const char * key_value = gguf_get_val_str(ctx, keyidx);
122-
fprintf(stdout, "%s: find key: %s found, kv[%d] value = %s\n", __func__, findkey, keyidx, key_value);
122+
printf("%s: find key: %s found, kv[%d] value = %s\n", __func__, findkey, keyidx, key_value);
123123
}
124124
}
125125

126126
// tensor info
127127
{
128128
const int n_tensors = gguf_get_n_tensors(ctx);
129129

130-
fprintf(stdout, "%s: n_tensors: %d\n", __func__, n_tensors);
130+
printf("%s: n_tensors: %d\n", __func__, n_tensors);
131131

132132
for (int i = 0; i < n_tensors; ++i) {
133133
const char * name = gguf_get_tensor_name (ctx, i);
134134
const size_t offset = gguf_get_tensor_offset(ctx, i);
135135

136-
fprintf(stdout, "%s: tensor[%d]: name = %s, offset = %zu\n", __func__, i, name, offset);
136+
printf("%s: tensor[%d]: name = %s, offset = %zu\n", __func__, i, name, offset);
137137
}
138138
}
139139

@@ -153,34 +153,34 @@ bool gguf_ex_read_1(const std::string & fname) {
153153

154154
struct gguf_context * ctx = gguf_init_from_file(fname.c_str(), params);
155155

156-
fprintf(stdout, "%s: version: %d\n", __func__, gguf_get_version(ctx));
157-
fprintf(stdout, "%s: alignment: %zu\n", __func__, gguf_get_alignment(ctx));
158-
fprintf(stdout, "%s: data offset: %zu\n", __func__, gguf_get_data_offset(ctx));
156+
printf("%s: version: %d\n", __func__, gguf_get_version(ctx));
157+
printf("%s: alignment: %zu\n", __func__, gguf_get_alignment(ctx));
158+
printf("%s: data offset: %zu\n", __func__, gguf_get_data_offset(ctx));
159159

160160
// kv
161161
{
162162
const int n_kv = gguf_get_n_kv(ctx);
163163

164-
fprintf(stdout, "%s: n_kv: %d\n", __func__, n_kv);
164+
printf("%s: n_kv: %d\n", __func__, n_kv);
165165

166166
for (int i = 0; i < n_kv; ++i) {
167167
const char * key = gguf_get_key(ctx, i);
168168

169-
fprintf(stdout, "%s: kv[%d]: key = %s\n", __func__, i, key);
169+
printf("%s: kv[%d]: key = %s\n", __func__, i, key);
170170
}
171171
}
172172

173173
// tensor info
174174
{
175175
const int n_tensors = gguf_get_n_tensors(ctx);
176176

177-
fprintf(stdout, "%s: n_tensors: %d\n", __func__, n_tensors);
177+
printf("%s: n_tensors: %d\n", __func__, n_tensors);
178178

179179
for (int i = 0; i < n_tensors; ++i) {
180180
const char * name = gguf_get_tensor_name (ctx, i);
181181
const size_t offset = gguf_get_tensor_offset(ctx, i);
182182

183-
fprintf(stdout, "%s: tensor[%d]: name = %s, offset = %zu\n", __func__, i, name, offset);
183+
printf("%s: tensor[%d]: name = %s, offset = %zu\n", __func__, i, name, offset);
184184
}
185185
}
186186

@@ -189,13 +189,13 @@ bool gguf_ex_read_1(const std::string & fname) {
189189
const int n_tensors = gguf_get_n_tensors(ctx);
190190

191191
for (int i = 0; i < n_tensors; ++i) {
192-
fprintf(stdout, "%s: reading tensor %d data\n", __func__, i);
192+
printf("%s: reading tensor %d data\n", __func__, i);
193193

194194
const char * name = gguf_get_tensor_name(ctx, i);
195195

196196
struct ggml_tensor * cur = ggml_get_tensor(ctx_data, name);
197197

198-
fprintf(stdout, "%s: tensor[%d]: n_dims = %d, name = %s, data = %p\n", __func__, i, cur->n_dims, cur->name, cur->data);
198+
printf("%s: tensor[%d]: n_dims = %d, name = %s, data = %p\n", __func__, i, cur->n_dims, cur->name, cur->data);
199199

200200
// print first 10 elements
201201
const float * data = (const float *) cur->data;
@@ -219,7 +219,7 @@ bool gguf_ex_read_1(const std::string & fname) {
219219
}
220220
}
221221

222-
fprintf(stdout, "%s: ctx_data size: %zu\n", __func__, ggml_get_mem_size(ctx_data));
222+
printf("%s: ctx_data size: %zu\n", __func__, ggml_get_mem_size(ctx_data));
223223

224224
ggml_free(ctx_data);
225225
gguf_free(ctx);
@@ -229,7 +229,7 @@ bool gguf_ex_read_1(const std::string & fname) {
229229

230230
int main(int argc, char ** argv) {
231231
if (argc < 3) {
232-
fprintf(stdout, "usage: %s data.gguf r|w\n", argv[0]);
232+
printf("usage: %s data.gguf r|w\n", argv[0]);
233233
return -1;
234234
}
235235

‎examples/gptneox-wip/falcon-main.cpp

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,9 @@ struct ggml_tensor * get_tensor_ex( struct ggml_context * ctx, std::string name)
305305

306306
struct ggml_tensor * cur = ggml_get_tensor(ctx, name.c_str());
307307
if( cur == NULL ) {
308-
fprintf(stdout, "%s: tensor '%s' not found!\n", __func__, name.c_str());
308+
printf("%s: tensor '%s' not found!\n", __func__, name.c_str());
309309
} else {
310-
// fprintf(stdout, "%s: n_dims = %d, name = '%s'\n", __func__, cur->n_dims, cur->name);
310+
// printf("%s: n_dims = %d, name = '%s'\n", __func__, cur->n_dims, cur->name);
311311
}
312312

313313
return cur;
@@ -333,21 +333,21 @@ bool falcon_model_load(const std::string & fname, falcon_model & model, gpt2bpe_
333333
return false;
334334
}
335335

336-
fprintf(stdout, "%s: gguf version = %d\n", __func__, gguf_get_version(ggufctx));
337-
fprintf(stdout, "%s: gguf alignment = %zu\n", __func__, gguf_get_alignment(ggufctx));
338-
fprintf(stdout, "%s: gguf data offset = %zu\n", __func__, gguf_get_data_offset(ggufctx));
336+
printf("%s: gguf version = %d\n", __func__, gguf_get_version(ggufctx));
337+
printf("%s: gguf alignment = %zu\n", __func__, gguf_get_alignment(ggufctx));
338+
printf("%s: gguf data offset = %zu\n", __func__, gguf_get_data_offset(ggufctx));
339339

340340
// print all kv
341341
#if 0
342342
{
343343
const int n_kv = gguf_get_n_kv(ggufctx);
344344

345-
fprintf(stdout, "%s: n_kv: %d\n", __func__, n_kv);
345+
printf("%s: n_kv: %d\n", __func__, n_kv);
346346

347347
for (int i = 0; i < n_kv; ++i) {
348348
const char * key = gguf_get_key(ggufctx, i);
349349

350-
fprintf(stdout, "%s: kv[%d]: key = %s\n", __func__, i, key);
350+
printf("%s: kv[%d]: key = %s\n", __func__, i, key);
351351
}
352352
}
353353
#endif
@@ -357,21 +357,21 @@ bool falcon_model_load(const std::string & fname, falcon_model & model, gpt2bpe_
357357
int keyidx;
358358

359359
keyidx = gguf_find_key(ggufctx, "general.name");
360-
if (keyidx != -1) { fprintf(stdout, "%s: model name = %s\n", __func__, gguf_get_val_str(ggufctx, keyidx)); }
360+
if (keyidx != -1) { printf("%s: model name = %s\n", __func__, gguf_get_val_str(ggufctx, keyidx)); }
361361
keyidx = gguf_find_key(ggufctx, "general.description");
362-
if (keyidx != -1) { fprintf(stdout, "%s: model description = %s\n", __func__, gguf_get_val_str(ggufctx, keyidx)); }
362+
if (keyidx != -1) { printf("%s: model description = %s\n", __func__, gguf_get_val_str(ggufctx, keyidx)); }
363363
keyidx = gguf_find_key(ggufctx, "general.author");
364-
if (keyidx != -1) { fprintf(stdout, "%s: model author = %s\n", __func__, gguf_get_val_str(ggufctx, keyidx)); }
364+
if (keyidx != -1) { printf("%s: model author = %s\n", __func__, gguf_get_val_str(ggufctx, keyidx)); }
365365
keyidx = gguf_find_key(ggufctx, "general.license");
366-
if (keyidx != -1) { fprintf(stdout, "%s: model license = %s\n", __func__, gguf_get_val_str(ggufctx, keyidx)); }
366+
if (keyidx != -1) { printf("%s: model license = %s\n", __func__, gguf_get_val_str(ggufctx, keyidx)); }
367367
keyidx = gguf_find_key(ggufctx, "general.architecture");
368-
if (keyidx != -1) { fprintf(stdout, "%s: model architecture = %s\n", __func__, gguf_get_val_str(ggufctx, keyidx)); }
368+
if (keyidx != -1) { printf("%s: model architecture = %s\n", __func__, gguf_get_val_str(ggufctx, keyidx)); }
369369
keyidx = gguf_find_key(ggufctx, "general.file_type");
370-
if (keyidx != -1) { fprintf(stdout, "%s: model file type = %s\n", __func__, gguf_get_val_str(ggufctx, keyidx)); }
370+
if (keyidx != -1) { printf("%s: model file type = %s\n", __func__, gguf_get_val_str(ggufctx, keyidx)); }
371371
keyidx = gguf_find_key(ggufctx, "gptneox.tensor_data_layout");
372-
if (keyidx != -1) { fprintf(stdout, "%s: model data layout = %s\n", __func__, gguf_get_val_str(ggufctx, keyidx)); }
372+
if (keyidx != -1) { printf("%s: model data layout = %s\n", __func__, gguf_get_val_str(ggufctx, keyidx)); }
373373
keyidx = gguf_find_key(ggufctx, "general.source.hugginface.repository");
374-
if (keyidx != -1) { fprintf(stdout, "%s: model source HF repo = %s\n", __func__, gguf_get_val_str(ggufctx, keyidx)); }
374+
if (keyidx != -1) { printf("%s: model source HF repo = %s\n", __func__, gguf_get_val_str(ggufctx, keyidx)); }
375375
}
376376

377377
// check required metadata
@@ -382,23 +382,23 @@ bool falcon_model_load(const std::string & fname, falcon_model & model, gpt2bpe_
382382
keyidx = gguf_find_key(ggufctx, "general.architecture");
383383
if (keyidx != -1) {
384384
if ( strcmp(gguf_get_val_str(ggufctx, keyidx), "falcon") != 0) {
385-
fprintf(stdout, "%s: model architecture not supported!\n", __func__);
385+
printf("%s: model architecture not supported!\n", __func__);
386386
return false;
387387
}
388388
} else {
389-
fprintf(stdout, "%s: gguf model architecture not found!\n", __func__);
389+
printf("%s: gguf model architecture not found!\n", __func__);
390390
return false;
391391
}
392392

393393
// check model tensor data layout kv
394394
keyidx = gguf_find_key(ggufctx, "falcon.tensor_data_layout");
395395
if (keyidx != -1) {
396396
if ( strcmp(gguf_get_val_str(ggufctx, keyidx), "jploski") != 0) {
397-
fprintf(stdout, "%s: model tensor data layout not supported!\n", __func__);
397+
printf("%s: model tensor data layout not supported!\n", __func__);
398398
return false;
399399
}
400400
} else {
401-
fprintf(stdout, "%s: gguf model tensor data layout not found!\n", __func__);
401+
printf("%s: gguf model tensor data layout not found!\n", __func__);
402402
return false;
403403
}
404404

@@ -455,34 +455,34 @@ bool falcon_model_load(const std::string & fname, falcon_model & model, gpt2bpe_
455455

456456
if (keyidx != -1) {
457457
if ( strcmp(gguf_get_val_str(ggufctx, keyidx), "gpt2") != 0) {
458-
fprintf(stdout, "%s: tokenizer model not supported!\n", __func__);
458+
printf("%s: tokenizer model not supported!\n", __func__);
459459
return false;
460460
}
461461
} else {
462-
fprintf(stdout, "%s: tokenizer model not found!\n", __func__);
462+
printf("%s: tokenizer model not found!\n", __func__);
463463
return false;
464464
}
465465

466466

467467
int tokens_keyidx = gguf_find_key(ggufctx, "tokenizer.ggml.tokens");
468468

469469
if (tokens_keyidx == -1) {
470-
fprintf(stdout, "%s: gpt2 tokenizer vocab not found!\n", __func__);
470+
printf("%s: gpt2 tokenizer vocab not found!\n", __func__);
471471
return false;
472472
}
473473

474474
int merges_keyidx = gguf_find_key(ggufctx, "tokenizer.ggml.merges");
475475

476476
if (merges_keyidx == -1) {
477-
fprintf(stdout, "%s: gpt2 tokenizer merges not found!\n", __func__);
477+
printf("%s: gpt2 tokenizer merges not found!\n", __func__);
478478
return false;
479479
}
480480

481481
hparams.n_vocab = gguf_get_arr_n(ggufctx,tokens_keyidx);
482482
hparams.n_merges = gguf_get_arr_n(ggufctx,merges_keyidx);
483483

484-
fprintf(stdout, "%s: gpt2 tokenizer vocab = %zu\n", __func__, hparams.n_vocab);
485-
fprintf(stdout, "%s: gpt2 tokenizer merges = %zu\n", __func__, hparams.n_merges);
484+
printf("%s: gpt2 tokenizer vocab = %zu\n", __func__, hparams.n_vocab);
485+
printf("%s: gpt2 tokenizer merges = %zu\n", __func__, hparams.n_merges);
486486

487487
for (size_t i = 0; i < hparams.n_vocab; i++) {
488488
std::string word = gguf_get_arr_str(ggufctx, tokens_keyidx, i);
@@ -523,12 +523,12 @@ bool falcon_model_load(const std::string & fname, falcon_model & model, gpt2bpe_
523523
keyidx = gguf_find_key(ggufctx, "tokenizer.ggml.separator_token_id"); if( keyidx != -1 ) { vocab.special_sep_id = (int32_t)gguf_get_val_u32(ggufctx, keyidx); }
524524
keyidx = gguf_find_key(ggufctx, "tokenizer.ggml.padding_token_id"); if( keyidx != -1 ) { vocab.special_pad_id = (int32_t)gguf_get_val_u32(ggufctx, keyidx); }
525525

526-
if( vocab.special_bos_id != -1 ) { fprintf(stdout, "%s: BOS token = %d '%s'\n", __func__, vocab.special_bos_id, vocab.id_to_token[vocab.special_bos_id].c_str() ); }
527-
if( vocab.special_eos_id != -1 ) { fprintf(stdout, "%s: EOS token = %d '%s'\n", __func__, vocab.special_eos_id, vocab.id_to_token[vocab.special_eos_id].c_str() ); }
528-
if( vocab.special_unk_id != -1 ) { fprintf(stdout, "%s: UNK token = %d '%s'\n", __func__, vocab.special_unk_id, vocab.id_to_token[vocab.special_unk_id].c_str() ); }
529-
if( vocab.special_sep_id != -1 ) { fprintf(stdout, "%s: SEP token = %d '%s'\n", __func__, vocab.special_sep_id, vocab.id_to_token[vocab.special_sep_id].c_str() ); }
530-
if( vocab.special_pad_id != -1 ) { fprintf(stdout, "%s: PAD token = %d '%s'\n", __func__, vocab.special_pad_id, vocab.id_to_token[vocab.special_pad_id].c_str() ); }
531-
if( vocab.linefeed_id != -1 ) { fprintf(stdout, "%s: LF token = %d\n", __func__, vocab.linefeed_id ); }
526+
if( vocab.special_bos_id != -1 ) { printf("%s: BOS token = %d '%s'\n", __func__, vocab.special_bos_id, vocab.id_to_token[vocab.special_bos_id].c_str() ); }
527+
if( vocab.special_eos_id != -1 ) { printf("%s: EOS token = %d '%s'\n", __func__, vocab.special_eos_id, vocab.id_to_token[vocab.special_eos_id].c_str() ); }
528+
if( vocab.special_unk_id != -1 ) { printf("%s: UNK token = %d '%s'\n", __func__, vocab.special_unk_id, vocab.id_to_token[vocab.special_unk_id].c_str() ); }
529+
if( vocab.special_sep_id != -1 ) { printf("%s: SEP token = %d '%s'\n", __func__, vocab.special_sep_id, vocab.id_to_token[vocab.special_sep_id].c_str() ); }
530+
if( vocab.special_pad_id != -1 ) { printf("%s: PAD token = %d '%s'\n", __func__, vocab.special_pad_id, vocab.id_to_token[vocab.special_pad_id].c_str() ); }
531+
if( vocab.linefeed_id != -1 ) { printf("%s: LF token = %d\n", __func__, vocab.linefeed_id ); }
532532

533533
}
534534

@@ -543,13 +543,13 @@ bool falcon_model_load(const std::string & fname, falcon_model & model, gpt2bpe_
543543
{
544544
const int n_tensors = gguf_get_n_tensors(ggufctx);
545545

546-
fprintf(stdout, "%s: n_tensors: %d\n", __func__, n_tensors);
546+
printf("%s: n_tensors: %d\n", __func__, n_tensors);
547547

548548
for (int i = 0; i < n_tensors; ++i) {
549549
const char * name = gguf_get_tensor_name (ggufctx, i);
550550
const size_t offset = gguf_get_tensor_offset(ggufctx, i);
551551

552-
fprintf(stdout, "%s: tensor[%d]: name = %s, offset = %zu\n", __func__, i, name, offset);
552+
printf("%s: tensor[%d]: name = %s, offset = %zu\n", __func__, i, name, offset);
553553
}
554554
}
555555
#endif

0 commit comments

Comments
 (0)