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

formatting

Browse source
This commit is contained in:
slaren 2023-08-17 22:11:40 +02:00
parent b6c81e28cd
commit df87dd74a5
1 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -391,20 +391,19 @@ static std::vector<cmd_params_instance> get_cmd_params_instances_int(const cmd_p
for (const auto & lv : params.low_vram) for (const auto & lv : params.low_vram)
for (const auto & ts : params.tensor_split) for (const auto & ts : params.tensor_split)
for (const auto & nt : params.n_threads) { for (const auto & nt : params.n_threads) {
cmd_params_instance instance; cmd_params_instance instance = {
/* .model = */ m,
instance.model = m; /* .n_prompt = */ n_prompt,
instance.n_prompt = n_prompt; /* .n_gen = */ n_gen,
instance.n_gen = n_gen; /* .n_batch = */ nb,
instance.n_batch = nb; /* .f32_kv = */ fk,
instance.f32_kv = fk; /* .n_threads = */ nt,
instance.n_gpu_layers = nl; /* .n_gpu_layers = */ nl,
instance.main_gpu = mg; /* .main_gpu = */ mg,
instance.mul_mat_q = mmq; /* .mul_mat_q = */ mmq,
instance.low_vram = lv; /* .low_vram = */ lv,
std::copy(std::begin(ts), std::end(ts), std::begin(instance.tensor_split)); /* .tensor_split = */ ts,
instance.n_threads = nt; };
instances.push_back(instance); instances.push_back(instance);
} }
return instances; return instances;
@ -721,6 +720,7 @@ struct markdown_printer : public printer {
} }
void print_header(const cmd_params & params) override { void print_header(const cmd_params & params) override {
// select fields to print
fields = { "model", "backend" }; fields = { "model", "backend" };
bool is_cpu_backend = test::get_backend() == "CPU" || test::get_backend() == "BLAS"; bool is_cpu_backend = test::get_backend() == "CPU" || test::get_backend() == "BLAS";
if (!is_cpu_backend) { if (!is_cpu_backend) {
@ -756,12 +756,11 @@ struct markdown_printer : public printer {
} }
fprintf(fout, "\n"); fprintf(fout, "\n");
fprintf(fout, "|"); fprintf(fout, "|");
for (const auto & field: fields) { for (const auto & field : fields) {
int width = get_field_width(field); int width = get_field_width(field);
fprintf(fout, " %s%s |", std::string(std::abs(width) - 1, '-').c_str(), width > 0 ? ":" : "-"); fprintf(fout, " %s%s |", std::string(std::abs(width) - 1, '-').c_str(), width > 0 ? ":" : "-");
} }
fprintf(fout, "\n"); fprintf(fout, "\n");
(void) params;
} }
void print_test(const test & t) override { void print_test(const test & t) override {