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

ChatON+: ValidateDump dumps All, wrapped in optional LDBUG_LN

Browse source 
GroupKV dump adds needed ":" seperator on its own, so calling
functions can just pass the tag string they want in the log without
worrying about any demarkation.
This commit is contained in:
HanishKVC 2024-05-14 18:25:58 +05:30
parent 28ddd2c474
commit bb9ce52b11
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/chaton.hpp
View file

@ -595,7 +595,7 @@ inline bool chaton_meta_load(const std::string &fname) {
gCT.set_value(group, { K_SYSTEMUSER_1ST_USER_HAS_PREFIX }, userHasPrefix); gCT.set_value(group, { K_SYSTEMUSER_1ST_USER_HAS_PREFIX }, userHasPrefix);
} }
LOGXLN("%s", gCT.dump("", "DBUG:ChatONMetaLoad:ChatTemplates:").c_str()); LOGXLN("%s", gCT.dump("", "DBUG:ChatONMetaLoad:ChatTemplates").c_str());
return true; return true;
} }
@ -838,7 +838,7 @@ inline std::vector<llama_token> chaton_llama_tokenize_ex(
* keys/fields are present wrt the specified template-standard/model-id or not. * keys/fields are present wrt the specified template-standard/model-id or not.
*/ */
inline bool _chaton_meta_validate_dump(std::string &tmpl) { inline bool _chaton_meta_validate_dump(std::string &tmpl) {
LOGXLN("\n\nINFO:%s:%s:\n%s", __func__, tmpl.c_str(), gCT.dump(tmpl, "INFO:ChatOnMetaValidateDump:").c_str()); LDBUG_LN("\n\nINFO:%s:%s:\n%s", __func__, tmpl.c_str(), gCT.dump("", "INFO:ChatOnMetaValidateDump").c_str());
if (tmpl.empty()) { if (tmpl.empty()) {
return true; return true;
} }

4
common/groupkv.hpp
View file

@ -107,9 +107,9 @@ public:
LDBUG_LN("DBUG:GKV:%s:%s:%s:Skipping...", __func__, msgTag.c_str(), gm.first.c_str()); LDBUG_LN("DBUG:GKV:%s:%s:%s:Skipping...", __func__, msgTag.c_str(), gm.first.c_str());
continue; continue;
} }
ss << "\n" << msgTag << gm.first << ":\n"; ss << "\n" << msgTag + ":" << gm.first << ":\n";
for(auto k: gm.second) { for(auto k: gm.second) {
ss << msgTag << "\t" << k.first << ":" << to_str(k.second) << "\n"; ss << msgTag + ":" << "\t" << k.first << ":" << to_str(k.second) << "\n";
} }
} }
return ss.str(); return ss.str();

2
tests/test-chaton-groupkv.cpp
View file

@ -19,7 +19,7 @@ static void gkv_inited() {
}}; }};
std::cout << "**** gkv inited **** " << std::endl; std::cout << "**** gkv inited **** " << std::endl;
std::cout << gkv.dump("", "INFO:GKV:Inited:") << std::endl; std::cout << gkv.dump("", "INFO:GKV:Inited") << std::endl;
} }

6
tests/test-chaton-simpcfg.cpp
View file

@ -116,7 +116,7 @@ static void sc_inited() {
}}; }};
std::cout << "**** sc inited **** " << std::endl; std::cout << "**** sc inited **** " << std::endl;
std::cout << sc.dump("") << std::endl; std::cout << sc.dump("", "INFO:SC:Inited") << std::endl;
} }
@ -125,7 +125,7 @@ static void sc_set(const std::string &fname) {
std::cout << "**** sc set **** " << std::endl; std::cout << "**** sc set **** " << std::endl;
SimpCfg sc = {{}}; SimpCfg sc = {{}};
sc.load(fname); sc.load(fname);
std::cout << sc.dump("", "INFO:SC:Set:AfterLoad:") << std::endl; std::cout << sc.dump("", "INFO:SC:Set:AfterLoad") << std::endl;
sc.get_bool("testme", {"key101b"}, false); sc.get_bool("testme", {"key101b"}, false);
sc.get_string("testme", {"key101s"}, "Not found"); sc.get_string("testme", {"key101s"}, "Not found");
@ -137,7 +137,7 @@ static void sc_set(const std::string &fname) {
sc.set_int64("testme", {"key201i"}, 987654); sc.set_int64("testme", {"key201i"}, 987654);
sc.set_double("testme", {"key201d"}, 9988.7766); sc.set_double("testme", {"key201d"}, 9988.7766);
std::cout << sc.dump("testme", "INFO:SC:Set:AfterSet:") << std::endl; std::cout << sc.dump("testme", "INFO:SC:Set:AfterSet") << std::endl;
sc.get_bool("testme", {"key201b"}, false); sc.get_bool("testme", {"key201b"}, false);
sc.get_string("testme", {"key201s"}, "Not found"); sc.get_string("testme", {"key201s"}, "Not found");
sc.get_int64("testme", {"key201i"}, 123456); sc.get_int64("testme", {"key201i"}, 123456);