tqcq/llama.cpp
0
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2025-08-16 05:02:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

llama-bench : fix unexpected global variable initialize sequence issue (#11832)

Browse Source 
* llama-bench : fix unexpected global variable initialize sequence issue

* Update examples/llama-bench/llama-bench.cpp

---------

Co-authored-by: Diego Devesa <slarengh@gmail.com>
This commit is contained in:
theraininsky
2025-02-14 09:13:43 +08:00
committed by GitHub
parent 04045bb842
commit a7b8ce2260
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
examples/llama-bench/llama-bench.cpp
View File

@@ -876,8 +876,8 @@ static std::vector<cmd_params_instance> get_cmd_params_instances(const cmd_param
struct test { struct test {
static const std::string build_commit; static const std::string build_commit;
static const int build_number; static const int build_number;
static const std::string cpu_info; const std::string cpu_info;
static const std::string gpu_info; const std::string gpu_info;
std::string model_filename; std::string model_filename;
std::string model_type; std::string model_type;
uint64_t model_size; uint64_t model_size;
@@ -903,7 +903,10 @@ struct test {
std::string test_time; std::string test_time;
std::vector<uint64_t> samples_ns; std::vector<uint64_t> samples_ns;
test(const cmd_params_instance & inst, const llama_model * lmodel, const llama_context * ctx) { test(const cmd_params_instance & inst, const llama_model * lmodel, const llama_context * ctx) :
cpu_info(get_cpu_info()),
gpu_info(get_gpu_info()) {
model_filename = inst.model; model_filename = inst.model;
char buf[128]; char buf[128];
llama_model_desc(lmodel, buf, sizeof(buf)); llama_model_desc(lmodel, buf, sizeof(buf));
@@ -1058,8 +1061,6 @@ struct test {
const std::string test::build_commit = LLAMA_COMMIT; const std::string test::build_commit = LLAMA_COMMIT;
const int test::build_number = LLAMA_BUILD_NUMBER; const int test::build_number = LLAMA_BUILD_NUMBER;
const std::string test::cpu_info = get_cpu_info();
const std::string test::gpu_info = get_gpu_info();
struct printer { struct printer {
virtual ~printer() {} virtual ~printer() {}