[neurun] Auto-generate Config strings (#4515)

With macro expansion, this commit generates variables for config
strings. It is recommended to use auto-generated Config string rather
than raw strings.

Signed-off-by: Hanjoung Lee <hanjoung.lee@samsung.com>

diff --git a/runtimes/neurun/src/backend/BackendManager.cc b/runtimes/neurun/src/backend/BackendManager.cc
index 5d19d40..eb8772c 100644 (file)
--- a/runtimes/neurun/src/backend/BackendManager.cc
+++ b/runtimes/neurun/src/backend/BackendManager.cc
@@ -96,7 +96,7 @@ void BackendManager::loadBackend(const std::string &backend,
 
 BackendManager::BackendManager(const neurun::model::operand::Set &operands)
 {
-  const auto backends = config::ConfigManager::instance().get<std::string>("BACKENDS");
+  const auto backends = config::ConfigManager::instance().get<std::string>(config::BACKENDS);
   size_t prev_pos = 0;
   auto pos = backends.find(";");
   while (pos != std::string::npos)

diff --git a/runtimes/neurun/src/compiler/BackendResolver.h b/runtimes/neurun/src/compiler/BackendResolver.h
index 4742b2d..07c5fc5 100644 (file)
--- a/runtimes/neurun/src/compiler/BackendResolver.h
+++ b/runtimes/neurun/src/compiler/BackendResolver.h
@@ -39,7 +39,7 @@ public:
     _backend_manager = std::make_shared<backend::BackendManager>(operands);
 
     const auto backend_all_str =
-        config::ConfigManager::instance().get<std::string>("OP_BACKEND_ALLOPS");
+        config::ConfigManager::instance().get<std::string>(config::OP_BACKEND_ALLOPS);
     if (backend_all_str.compare("none") != 0)
     {
       VERBOSE(BackendResolver) << "Use backend for all ops: " << backend_all_str << std::endl;
@@ -58,7 +58,7 @@ public:
   if (IsNnApi)                                                                                    \
   {                                                                                               \
     const auto &backend_str =                                                                     \
-        config::ConfigManager::instance().get<std::string>("OP_BACKEND_" #NnApiName);             \
+        config::ConfigManager::instance().get<std::string>(config::OP_BACKEND_##NnApiName);       \
     auto backend = _backend_manager->get(backend_str);                                            \
     VERBOSE(BackendResolver) << "backend for " << #NnApiName << ": " << backend_str << std::endl; \
     _gen_map[typeid(model::operation::InternalName)] = backend;                                   \

diff --git a/runtimes/neurun/src/compiler/Compiler.cc b/runtimes/neurun/src/compiler/Compiler.cc
index 82a9b90..73f8fa5 100644 (file)
--- a/runtimes/neurun/src/compiler/Compiler.cc
+++ b/runtimes/neurun/src/compiler/Compiler.cc
@@ -127,7 +127,8 @@ bool Compiler::checkCompilable()
 {
   // Disable compile phase
   // When ready to use interpreter backend, remove this config and use backend setting
-  const auto env_disable_compile = config::ConfigManager::instance().get<bool>("DISABLE_COMPILE");
+  const auto env_disable_compile =
+      config::ConfigManager::instance().get<bool>(config::DISABLE_COMPILE);
   if (env_disable_compile)
   {
     return false;

diff --git a/runtimes/neurun/src/dumper/dot/DotDumper.h b/runtimes/neurun/src/dumper/dot/DotDumper.h
index 0c0a9b8..040f434 100644 (file)
--- a/runtimes/neurun/src/dumper/dot/DotDumper.h
+++ b/runtimes/neurun/src/dumper/dot/DotDumper.h
@@ -39,7 +39,7 @@ class DotDumper
 public:
   DotDumper(const neurun::graph::Graph &graph) : _graph(graph)
   {
-    _option = config::ConfigManager::instance().get<int>("GRAPH_DOT_DUMP");
+    _option = config::ConfigManager::instance().get<int>(config::GRAPH_DOT_DUMP);
   }
 
 public:

diff --git a/runtimes/neurun/src/util/config/ConfigManager.cc b/runtimes/neurun/src/util/config/ConfigManager.cc
index 46b8031..588f440 100644 (file)
--- a/runtimes/neurun/src/util/config/ConfigManager.cc
+++ b/runtimes/neurun/src/util/config/ConfigManager.cc
@@ -23,6 +23,12 @@ namespace neurun
 namespace config
 {
 
+#define CONFIG(Name, Type, Default) const char *Name = #Name;
+
+#include "Config.lst"
+
+#undef CONFIG
+
 ConfigManager &ConfigManager::instance()
 {
   static ConfigManager manager;

diff --git a/runtimes/neurun/src/util/config/ConfigManager.h b/runtimes/neurun/src/util/config/ConfigManager.h
index 78db03d..2dd5a79 100644 (file)
--- a/runtimes/neurun/src/util/config/ConfigManager.h
+++ b/runtimes/neurun/src/util/config/ConfigManager.h
@@ -31,6 +31,12 @@ namespace neurun
 namespace config
 {
 
+#define CONFIG(Name, Type, Default) extern const char *Name;
+
+#include "Config.lst"
+
+#undef CONFIG
+
 /**
  * @brief Class that manages configurations
  */

diff --git a/runtimes/neurun/src/util/logging.h b/runtimes/neurun/src/util/logging.h
index 9a56326..2d90d66 100644 (file)
--- a/runtimes/neurun/src/util/logging.h
+++ b/runtimes/neurun/src/util/logging.h
@@ -33,7 +33,7 @@ class Context
 public:
   Context() : _enabled{false}
   {
-    const auto env = config::ConfigManager::instance().get<bool>("NEURUN_LOG_ENABLE");
+    const auto env = config::ConfigManager::instance().get<bool>(config::NEURUN_LOG_ENABLE);
 
     if (env)
     {