Remove ConfigManager that is no longer used (#5641)

Now `ConfigSource` is used instead.

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

diff --git a/runtimes/neurun/backend/acl_cl/Config.h b/runtimes/neurun/backend/acl_cl/Config.h
index 737bb63..db42a5a 100644 (file)
--- a/runtimes/neurun/backend/acl_cl/Config.h
+++ b/runtimes/neurun/backend/acl_cl/Config.h
@@ -19,8 +19,6 @@
 
 #include <backend/IConfig.h>
 
-#include "util/ConfigManager.h"
-
 namespace neurun
 {
 namespace backend

diff --git a/runtimes/neurun/backend/acl_cl/MemoryManager.h b/runtimes/neurun/backend/acl_cl/MemoryManager.h
index f817713..b11abcb 100644 (file)
--- a/runtimes/neurun/backend/acl_cl/MemoryManager.h
+++ b/runtimes/neurun/backend/acl_cl/MemoryManager.h
@@ -30,7 +30,6 @@
 #include "operand/CLSubTensor.h"
 #include "operand/Object.h"
 
-#include "util/ConfigManager.h"
 #include "util/logging.h"
 
 namespace neurun

diff --git a/runtimes/neurun/backend/acl_common/TemplTensorBuilder.h b/runtimes/neurun/backend/acl_common/TemplTensorBuilder.h
index b9f9440..3da55cb 100644 (file)
--- a/runtimes/neurun/backend/acl_common/TemplTensorBuilder.h
+++ b/runtimes/neurun/backend/acl_common/TemplTensorBuilder.h
@@ -23,7 +23,6 @@
 #include <backend/ITensorBuilder.h>
 #include "model/OperandIndexMap.h"
 #include "AclMemoryManager.h"
-#include "util/ConfigManager.h"
 #include "cpp14/memory.h"
 
 namespace neurun

diff --git a/runtimes/neurun/backend/acl_neon/Config.h b/runtimes/neurun/backend/acl_neon/Config.h
index a87e2fa..f593d8b 100644 (file)
--- a/runtimes/neurun/backend/acl_neon/Config.h
+++ b/runtimes/neurun/backend/acl_neon/Config.h
@@ -19,8 +19,6 @@
 
 #include <backend/IConfig.h>
 
-#include "util/ConfigManager.h"
-
 namespace neurun
 {
 namespace backend

diff --git a/runtimes/neurun/backend/acl_neon/MemoryManager.h b/runtimes/neurun/backend/acl_neon/MemoryManager.h
index 14d7388..f89cd61 100644 (file)
--- a/runtimes/neurun/backend/acl_neon/MemoryManager.h
+++ b/runtimes/neurun/backend/acl_neon/MemoryManager.h
@@ -30,7 +30,6 @@
 #include "operand/NESubTensor.h"
 #include <backend/operand/Object.h>
 
-#include "util/ConfigManager.h"
 #include "util/logging.h"
 
 namespace neurun

diff --git a/runtimes/neurun/core/include/util/ConfigManager.h b/runtimes/neurun/core/include/util/ConfigManager.h
deleted file mode 100644 (file)
index 58b8498..0000000
--- a/runtimes/neurun/core/include/util/ConfigManager.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __NEURUN_CONFIG_CONFIG_MANAGER_H__
-#define __NEURUN_CONFIG_CONFIG_MANAGER_H__
-
-#include <algorithm>
-#include <string>
-#include <unordered_map>
-
-#include "IConfigSource.h"
-
-/**
- * @file ConfigManager.h
- * @brief This file contains neurun::util::ConfigManager class
- */
-
-namespace neurun
-{
-namespace util
-{
-
-/**
- * @brief Class that manages configurations
- */
-
-class ConfigManager
-{
-public:
-  static ConfigManager &instance();
-
-private:
-  /**
-   * @brief Construct a new ConfigManager object
-   */
-  ConfigManager(const IConfigSource &source);
-
-public:
-  /**
-   * @brief Return the configuration value of given key
-   *
-   * @tparam T Type of the config
-   * @param key String key value
-   *
-   * @return The configuration value of given key value
-   */
-  template <typename T> T get(const std::string &key) const;
-
-private:
-  std::unordered_map<std::string, std::string> _map;
-};
-
-template <> bool ConfigManager::get<bool>(const std::string &key) const;
-template <> int ConfigManager::get<int>(const std::string &key) const;
-template <> std::string ConfigManager::get<std::string>(const std::string &key) const;
-
-} // namespace util
-} // namespace neurun
-
-#endif // __NEURUN_CONFIG_CONFIG_MANAGER_H__

diff --git a/runtimes/neurun/core/src/util/ConfigManager.cc b/runtimes/neurun/core/src/util/ConfigManager.cc
deleted file mode 100644 (file)
index 5cc78da..0000000
--- a/runtimes/neurun/core/src/util/ConfigManager.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "util/ConfigManager.h"
-
-#include <cassert>
-
-#include "util/EnvConfigSource.h"
-#include "util/logging.h"
-
-namespace neurun
-{
-namespace util
-{
-
-#define CONFIG(Name, Type, Default) const char *Name = #Name;
-
-#include "util/Config.lst"
-
-#undef CONFIG
-
-ConfigManager &ConfigManager::instance()
-{
-  static ConfigManager manager{EnvConfigSource{}};
-  return manager;
-}
-
-ConfigManager::ConfigManager(const IConfigSource &source)
-{
-#define CONFIG(Name, Type, Default)                                \
-  {                                                                \
-    auto name = std::string{#Name};                                \
-    auto insert_status = _map.emplace(name, std::string{Default}); \
-    assert(insert_status.second); /* Insertion must success */     \
-    auto value = source.get(name);                                 \
-    if (!value.empty())                                            \
-    {                                                              \
-      insert_status.first->second = value;                         \
-    }                                                              \
-  }
-
-#include "util/Config.lst"
-
-#undef CONFIG
-}
-
-template <> bool ConfigManager::get<bool>(const std::string &key) const
-{
-  auto raw = _map.at(key);
-
-  static const std::array<std::string, 5> false_list{"0", "OFF", "FALSE", "N", "NO"};
-  auto false_found = std::find(false_list.begin(), false_list.end(), raw);
-
-  return (false_found == false_list.end());
-}
-
-template <> int ConfigManager::get<int>(const std::string &key) const
-{
-  auto raw = _map.at(key);
-  return std::stoi(raw);
-}
-
-template <> std::string ConfigManager::get<std::string>(const std::string &key) const
-{
-  auto raw = _map.at(key);
-  return raw;
-}
-
-} // namespace util
-} // namespace neurun