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

SimpCfg:GetArray flesh out, helpers to convert to string

Browse source 
Good: Forgotten love, All the light we cant see, laapataa ladies
This commit is contained in:
HanishKVC 2024-05-01 17:43:25 +05:30
parent 561f50930e
commit 1e1f54ec1d
1 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

33
common/simpcfg.hpp
View file

@ -79,6 +79,29 @@ void str_compare_dump(const std::string &s1, const std::string &s2) {
} }
} }
template<typename TypeWithStrSupp>
std::string str(TypeWithStrSupp value) {
std::stringstream ss;
ss << value;
return ss.str();
}
template<typename TypeWithStrSupp>
std::string str(std::vector<TypeWithStrSupp> values) {
std::stringstream ss;
ss << "[ ";
int cnt = 0;
for(auto value: values) {
cnt += 1;
if (cnt != 1) ss << ", ";
ss << value;
}
ss << " ]";
return ss.str();
}
typedef std::variant<std::string, bool, int64_t, double> SimpCfgData; typedef std::variant<std::string, bool, int64_t, double> SimpCfgData;
class SimpCfg { class SimpCfg {
@ -197,14 +220,13 @@ public:
break; break;
} }
array.push_back(std::get<SupportedDataType>(gm[arrayKey])); array.push_back(std::get<SupportedDataType>(gm[arrayKey]));
i += 1;
} }
if (array.empty()) { if (array.empty()) {
std::stringstream ss; LWARN_LN("DBUG:SC:%s_%s:%s:%s:%s[default]", __func__, callerName.c_str(), group.c_str(), key.c_str(), str(defaultValue).c_str());
ss << defaultValue;
LWARN_LN("DBUG:SC:%s_%s:%s:%s:%s[default]", __func__, callerName.c_str(), group.c_str(), key.c_str(), ss.str().c_str());
return defaultValue; return defaultValue;
} }
LDBUG_LN("DBUG:SC:%s_%s:%s:%s:%s", __func__, callerName.c_str(), group.c_str(), key.c_str(), to_str(value).c_str()); LDBUG_LN("DBUG:SC:%s_%s:%s:%s:%s", __func__, callerName.c_str(), group.c_str(), key.c_str(), str(array).c_str());
return array; return array;
} }
@ -308,10 +330,11 @@ int main(int argc, char **argv) {
sc.get_string("mistral", "system-prefix", "Not found"); sc.get_string("mistral", "system-prefix", "Not found");
sc.get_string("\"mistral\"", "\"system-prefix\"", "Not found"); sc.get_string("\"mistral\"", "\"system-prefix\"", "Not found");
sc.get_array<int64_t>("testme", "keyA100", {1, 2, 3});
sc.set_int64("testme", "keyA300-0", 330); sc.set_int64("testme", "keyA300-0", 330);
sc.set_int64("testme", "keyA300-1", 331); sc.set_int64("testme", "keyA300-1", 331);
sc.set_int64("testme", "keyA300-2", 332); sc.set_int64("testme", "keyA300-2", 332);
sc.get_array<int>("testme", "keyA300", {1, 2, 3}); sc.get_array<int64_t>("testme", "keyA300", {1, 2, 3});
return 0; return 0;
} }
#endif #endif