tqcq/llama.cpp
0
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2025-08-14 20:29:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

llama-bench: rename DB table name from test to llama_bench (#15003)

Browse Source 
Signed-off-by: Xiaodong Ye <xiaodong.ye@mthreads.com>
This commit is contained in:
R0CKSTAR
2025-08-02 17:20:40 +08:00
committed by GitHub
parent ec0b18802c
commit 3025b621d1
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/compare-llama-bench.py
View File

@@ -326,7 +326,7 @@ class LlamaBenchDataSQLite3(LlamaBenchData):
# Set table name and schema based on tool # Set table name and schema based on tool
if self.tool == "llama-bench": if self.tool == "llama-bench":
self.table_name = "test" self.table_name = "llama_bench"
db_fields = LLAMA_BENCH_DB_FIELDS db_fields = LLAMA_BENCH_DB_FIELDS
db_types = LLAMA_BENCH_DB_TYPES db_types = LLAMA_BENCH_DB_TYPES
elif self.tool == "test-backend-ops": elif self.tool == "test-backend-ops":
@@ -409,8 +409,8 @@ class LlamaBenchDataSQLite3File(LlamaBenchDataSQLite3):
# Tool selection logic # Tool selection logic
if tool is None: if tool is None:
if "test" in table_names: if "llama_bench" in table_names:
self.table_name = "test" self.table_name = "llama_bench"
self.tool = "llama-bench" self.tool = "llama-bench"
elif "test_backend_ops" in table_names: elif "test_backend_ops" in table_names:
self.table_name = "test_backend_ops" self.table_name = "test_backend_ops"
@@ -418,8 +418,8 @@ class LlamaBenchDataSQLite3File(LlamaBenchDataSQLite3):
else: else:
raise RuntimeError(f"No suitable table found in database. Available tables: {table_names}") raise RuntimeError(f"No suitable table found in database. Available tables: {table_names}")
elif tool == "llama-bench": elif tool == "llama-bench":
if "test" in table_names: if "llama_bench" in table_names:
self.table_name = "test" self.table_name = "llama_bench"
self.tool = "llama-bench" self.tool = "llama-bench"
else: else:
raise RuntimeError(f"Table 'test' not found for tool 'llama-bench'. Available tables: {table_names}") raise RuntimeError(f"Table 'test' not found for tool 'llama-bench'. Available tables: {table_names}")

4
tools/llama-bench/llama-bench.cpp
View File

@@ -1738,7 +1738,7 @@ struct sql_printer : public printer {
void print_header(const cmd_params & params) override { void print_header(const cmd_params & params) override {
std::vector<std::string> fields = test::get_fields(); std::vector<std::string> fields = test::get_fields();
fprintf(fout, "CREATE TABLE IF NOT EXISTS test (\n"); fprintf(fout, "CREATE TABLE IF NOT EXISTS llama_bench (\n");
for (size_t i = 0; i < fields.size(); i++) { for (size_t i = 0; i < fields.size(); i++) {
fprintf(fout, " %s %s%s\n", fields.at(i).c_str(), get_sql_field_type(fields.at(i)).c_str(), fprintf(fout, " %s %s%s\n", fields.at(i).c_str(), get_sql_field_type(fields.at(i)).c_str(),
i < fields.size() - 1 ? "," : ""); i < fields.size() - 1 ? "," : "");
@@ -1749,7 +1749,7 @@ struct sql_printer : public printer {
} }
void print_test(const test & t) override { void print_test(const test & t) override {
fprintf(fout, "INSERT INTO test (%s) ", join(test::get_fields(), ", ").c_str()); fprintf(fout, "INSERT INTO llama_bench (%s) ", join(test::get_fields(), ", ").c_str());
fprintf(fout, "VALUES ("); fprintf(fout, "VALUES (");
std::vector<std::string> values = t.get_values(); std::vector<std::string> values = t.get_values();
for (size_t i = 0; i < values.size(); i++) { for (size_t i = 0; i < values.size(); i++) {