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

SimpCfg: Put GroupMap back into Map, Iterate during get if DBUG

Browse source 
TODO: Have to look into C++ a bit later including these default
container types. Not sure my current flow is efficient.
This commit is contained in:
HanishKVC 2024-04-28 16:45:38 +05:30
parent 9940bd8ed7
commit 82348e2840
1 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
common/simpcfg.hpp
View file

@ -14,6 +14,7 @@
#include <vector> #include <vector>
#include <fstream> #include <fstream>
#define SC_DEBUG
#define TEST_LOGIC #define TEST_LOGIC
#ifdef TEST_LOGIC #ifdef TEST_LOGIC
#define LDBUG_LN(FMT, ...) printf(FMT"\n", __VA_ARGS__) #define LDBUG_LN(FMT, ...) printf(FMT"\n", __VA_ARGS__)
@ -42,17 +43,24 @@ public:
void set_string(const std::string &group, const std::string &key, const std::string &value) { void set_string(const std::string &group, const std::string &key, const std::string &value) {
auto gm = mapStrings[group]; auto gm = mapStrings[group];
gm[key] = value; gm[key] = value;
mapStrings[group] = gm;
LDBUG_LN("DBUG:SC:%s:%s:%s:%s", __func__, group.c_str(), key.c_str(), value.c_str()); LDBUG_LN("DBUG:SC:%s:%s:%s:%s", __func__, group.c_str(), key.c_str(), value.c_str());
} }
void set_bool(const std::string &group, const std::string &key, bool value) { void set_bool(const std::string &group, const std::string &key, bool value) {
auto gm = mapBools[group]; auto gm = mapBools[group];
gm[key] = value; gm[key] = value;
mapBools[group] = gm;
LDBUG_LN("DBUG:SC:%s:%s:%s:%d", __func__, group.c_str(), key.c_str(), value); LDBUG_LN("DBUG:SC:%s:%s:%s:%d", __func__, group.c_str(), key.c_str(), value);
} }
std::string get_string(const std::string &group, const std::string &key, const std::string &defaultValue) { std::string get_string(const std::string &group, const std::string &key, const std::string &defaultValue) {
auto gm = mapStrings[group]; auto gm = mapStrings[group];
#ifdef SC_DEBUG
for(auto k: gm) {
LDBUG_LN("DBUG:SC:%s:Iterate:%s:%s", __func__, k.first.c_str(), k.second.c_str());
}
#endif
if (gm.find(key) == gm.end()) { if (gm.find(key) == gm.end()) {
LWARN_LN("DBUG:SC:%s:%s:%s:%s[default]", __func__, group.c_str(), key.c_str(), defaultValue.c_str()); LWARN_LN("DBUG:SC:%s:%s:%s:%s[default]", __func__, group.c_str(), key.c_str(), defaultValue.c_str());
return defaultValue; return defaultValue;
@ -64,6 +72,11 @@ public:
bool get_bool(const std::string &group, const std::string &key, bool defaultValue) { bool get_bool(const std::string &group, const std::string &key, bool defaultValue) {
auto gm = mapBools[group]; auto gm = mapBools[group];
#ifdef SC_DEBUG
for(auto k: gm) {
LDBUG_LN("DBUG:SC:%s:Iterate:%s:%d", __func__, k.first.c_str(), k.second);
}
#endif
if (gm.find(key) == gm.end()) { if (gm.find(key) == gm.end()) {
LWARN_LN("DBUG:SC:%s:%s:%s:%d[default]", __func__, group.c_str(), key.c_str(), defaultValue); LWARN_LN("DBUG:SC:%s:%s:%s:%d[default]", __func__, group.c_str(), key.c_str(), defaultValue);
return defaultValue; return defaultValue;
@ -140,6 +153,8 @@ int main(int argc, char **argv) {
sc.set_string("testme", "key201s", "hello world"); sc.set_string("testme", "key201s", "hello world");
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_string("mistral", "system-prefix", "Not found");
sc.get_string("\"mistral\"", "\"system-prefix\"", "Not found");
return 0; return 0;
} }
#endif #endif