vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better checks for non-optimized builds

Browse source
This commit is contained in:
slaren 2023-08-16 19:24:54 +02:00
parent 3e3396e2e5
commit 5765f90f58
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
examples/llama-bench/llama-bench.cpp
View file

@ -88,7 +88,7 @@ struct cmd_params {
output_formats output_format; output_formats output_format;
}; };
static cmd_params cmd_params_defaults = { static const cmd_params cmd_params_defaults = {
/* model */ {"models/7B/ggml-model-q4_0.bin"}, /* model */ {"models/7B/ggml-model-q4_0.bin"},
/* n_prompt */ {512}, /* n_prompt */ {512},
/* n_gen */ {128}, /* n_gen */ {128},
@ -688,9 +688,9 @@ struct markdown_printer : public printer {
value = backend_params::get_backend(); value = backend_params::get_backend();
} else if (field == "test") { } else if (field == "test") {
char buf[128]; char buf[128];
if (t.bparams.n_prompt > 0) { if (t.bparams.n_prompt > 0 && t.bparams.n_gen == 0) {
snprintf(buf, sizeof(buf), "pp %d", t.bparams.n_prompt); snprintf(buf, sizeof(buf), "pp %d", t.bparams.n_prompt);
} else if (t.bparams.n_gen > 0) { } else if (t.bparams.n_gen > 0 && t.bparams.n_prompt == 0) {
snprintf(buf, sizeof(buf), "tg %d", t.bparams.n_gen); snprintf(buf, sizeof(buf), "tg %d", t.bparams.n_gen);
} else { } else {
assert(false); assert(false);
@ -743,8 +743,16 @@ void llama_null_log_callback(enum llama_log_level level, const char * text, void
} }
int main(int argc, char ** argv) { int main(int argc, char ** argv) {
#ifndef NDEBUG #if !defined(NDEBUG)
fprintf(stderr, "warning: NDEBUG is not defined, performance may be affected\n"); fprintf(stderr, "warning: asserts enabled, performance may be affected\n");
#endif
#if (defined(_MSC_VER) && defined(_DEBUG)) || (!defined(_MSC_VER) && !defined(__OPTIMIZE__))
fprintf(stderr, "warning: debug build, performance may be affected\n");
#endif
#if defined(__SANITIZE_ADDRESS__) || defined(__SANITIZE_THREAD__)
fprintf(stderr, "warning: sanitizer enabled, performance may be affected\n");
#endif #endif
cmd_params params = parse_cmd_params(argc, argv); cmd_params params = parse_cmd_params(argc, argv);