From 524cdadda671bf9cdb01963621238daef6ca830a Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EA=B9=80=EC=88=98=EC=A7=84/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Engineer/=EC=82=BC=EC=84=B1=EC=A0=84?= =?utf8?q?=EC=9E=90?= Date: Wed, 5 Sep 2018 18:50:26 +0900 Subject: [PATCH] [neurun] Change namespace of BackendXX to backend (#2603) * [neurun] Change namespace of BackendXX to backend Tshi commit changes namespace of BackendXX to backend. Signed-off-by: sjsujinkim * Revert BackendResolver namespace * Remove neurun:: --- runtimes/neurun/CMakeLists.txt | 3 ++- .../neurun/src/{internal => backend}/BackendManager.cc | 9 ++++++--- .../neurun/src/{internal => backend}/BackendManager.h | 15 +++++---------- runtimes/neurun/src/codegen/BackendResolver.cc | 2 +- runtimes/neurun/src/codegen/BackendResolver.h | 10 +++++----- runtimes/neurun/src/graph/Graph.cc | 2 +- runtimes/neurun/src/graph/operation/LowerInfo.cc | 2 +- runtimes/neurun/src/graph/operation/LowerInfo.h | 8 ++++---- 8 files changed, 25 insertions(+), 26 deletions(-) rename runtimes/neurun/src/{internal => backend}/BackendManager.cc (95%) rename runtimes/neurun/src/{internal => backend}/BackendManager.h (88%) diff --git a/runtimes/neurun/CMakeLists.txt b/runtimes/neurun/CMakeLists.txt index ef95d42..2cbd702 100644 --- a/runtimes/neurun/CMakeLists.txt +++ b/runtimes/neurun/CMakeLists.txt @@ -14,13 +14,14 @@ add_subdirectory(src/backend) file(GLOB SOURCES "src/*.cc") file(GLOB_RECURSE SOURCES_FRONTEND "src/frontend/*.cc") +file(GLOB SOURCES_BACKEND "src/backend/*.cc") file(GLOB_RECURSE SOURCES_INTERNAL "src/internal/*.cc") file(GLOB_RECURSE SOURCES_GRAPH "src/graph/*.cc") file(GLOB_RECURSE SOURCES_LINEAR "src/linear/*.cc") file(GLOB_RECURSE SOURCES_CODEGEN "src/codegen/*.cc") file(GLOB_RECURSE SOURCES_VERIFIER "src/verifier/*.cc") -set(SOURCES ${SOURCES} ${SOURCES_FRONTEND} ${SOURCES_INTERNAL} ${SOURCES_GRAPH} ${SOURCES_LINEAR} ${SOURCES_CODEGEN} ${SOURCES_VERIFIER}) +set(SOURCES ${SOURCES} ${SOURCES_FRONTEND} ${SOURCES_BACKEND} ${SOURCES_INTERNAL} ${SOURCES_GRAPH} ${SOURCES_LINEAR} ${SOURCES_CODEGEN} ${SOURCES_VERIFIER}) # NOTE For now ARMCompute is necessary # TODO Remove required package below(should be optional) diff --git a/runtimes/neurun/src/internal/BackendManager.cc b/runtimes/neurun/src/backend/BackendManager.cc similarity index 95% rename from runtimes/neurun/src/internal/BackendManager.cc rename to runtimes/neurun/src/backend/BackendManager.cc index 6d57632..46adee5 100644 --- a/runtimes/neurun/src/internal/BackendManager.cc +++ b/runtimes/neurun/src/backend/BackendManager.cc @@ -1,4 +1,4 @@ -#include "internal/BackendManager.h" +#include "BackendManager.h" #include "backend/acl_cl/BackendConfig.h" #include "backend/acl_cl/TensorBuilder.h" @@ -9,7 +9,9 @@ #include "backend/cpu/InitializerGenerator.h" #include "backend/cpu/StageGenerator.h" -namespace internal +namespace neurun +{ +namespace backend { Backend::Backend(const std::shared_ptr &backend_config, @@ -64,4 +66,5 @@ BackendManager::BackendManager(const neurun::graph::operand::Set &operands) Backend BackendManager::get(const std::string &key) { return _gen_map.at(key); } -} // namespace internal +} // namespace backend +} // namespace neurun diff --git a/runtimes/neurun/src/internal/BackendManager.h b/runtimes/neurun/src/backend/BackendManager.h similarity index 88% rename from runtimes/neurun/src/internal/BackendManager.h rename to runtimes/neurun/src/backend/BackendManager.h index 98d1926..ca047d8 100644 --- a/runtimes/neurun/src/internal/BackendManager.h +++ b/runtimes/neurun/src/backend/BackendManager.h @@ -1,5 +1,5 @@ -#ifndef __INTERNAL_BACKEND_MANAGER_H__ -#define __INTERNAL_BACKEND_MANAGER_H__ +#ifndef __NEURUN_BACKEND_BACKEND_MANAGER_H__ +#define __NEURUN_BACKEND_BACKEND_MANAGER_H__ #include #include @@ -16,12 +16,6 @@ struct IInitializerGenerator; struct IStageGenerator; struct ITensorBuilder; -} // namespace backend -} // namespace neurun - -namespace internal -{ - class Backend { public: @@ -55,6 +49,7 @@ private: std::map _gen_map; }; -} // namespace internal +} // namespace backend +} // namespace neurun -#endif // __INTERNAL_BACKEND_MANAGER_H__ +#endif // __NEURUN_BACKEND_BACKEND_MANAGER_H__ diff --git a/runtimes/neurun/src/codegen/BackendResolver.cc b/runtimes/neurun/src/codegen/BackendResolver.cc index 17f5dcf..0ca3df6 100644 --- a/runtimes/neurun/src/codegen/BackendResolver.cc +++ b/runtimes/neurun/src/codegen/BackendResolver.cc @@ -7,5 +7,5 @@ namespace codegen // NOT IMPLEMENTED -} // namespace neurun } // namespace codegen +} // namespace neurun diff --git a/runtimes/neurun/src/codegen/BackendResolver.h b/runtimes/neurun/src/codegen/BackendResolver.h index 25c854a..b4251e8 100644 --- a/runtimes/neurun/src/codegen/BackendResolver.h +++ b/runtimes/neurun/src/codegen/BackendResolver.h @@ -7,7 +7,7 @@ #include "logging.h" #include "util/EnvVar.h" -#include "internal/BackendManager.h" +#include "backend/BackendManager.h" #include "backend/IInitializerGenerator.h" #include "backend/IStageGenerator.h" @@ -21,7 +21,7 @@ class BackendResolver public: BackendResolver(const neurun::graph::operand::Set &operands) { - _backend_manager = std::make_shared<::internal::BackendManager>(operands); + _backend_manager = std::make_shared(operands); const auto &backend_all_str = ::nnfw::util::EnvVar{std::string("OP_BACKEND_ALLOPS")}.asString("none"); @@ -53,11 +53,11 @@ public: } public: - const ::internal::Backend &getBackend(const std::type_index &type) { return _gen_map[type]; } + const backend::Backend &getBackend(const std::type_index &type) { return _gen_map[type]; } private: - std::unordered_map _gen_map; - std::shared_ptr<::internal::BackendManager> _backend_manager; + std::unordered_map _gen_map; + std::shared_ptr _backend_manager; }; } // namespace codegen diff --git a/runtimes/neurun/src/graph/Graph.cc b/runtimes/neurun/src/graph/Graph.cc index 531ef6d..8783210 100644 --- a/runtimes/neurun/src/graph/Graph.cc +++ b/runtimes/neurun/src/graph/Graph.cc @@ -111,7 +111,7 @@ void Graph::lower(void) // Lower { - auto _backend_resolver = neurun::codegen::BackendResolver(_operands); + auto _backend_resolver = codegen::BackendResolver(_operands); _operations.iterate([&](const operation::Index &, operation::Node &node) { auto backend = _backend_resolver.getBackend(typeid(node)); node.lower_info(nnfw::make_unique(backend)); diff --git a/runtimes/neurun/src/graph/operation/LowerInfo.cc b/runtimes/neurun/src/graph/operation/LowerInfo.cc index e8c19c8..680ca05 100644 --- a/runtimes/neurun/src/graph/operation/LowerInfo.cc +++ b/runtimes/neurun/src/graph/operation/LowerInfo.cc @@ -7,7 +7,7 @@ namespace graph namespace operation { -LowerInfo::LowerInfo(const internal::Backend &backend) : _backend(backend) +LowerInfo::LowerInfo(const backend::Backend &backend) : _backend(backend) { // DO NOTHING } diff --git a/runtimes/neurun/src/graph/operation/LowerInfo.h b/runtimes/neurun/src/graph/operation/LowerInfo.h index 56d1aa1..e775b9f 100644 --- a/runtimes/neurun/src/graph/operation/LowerInfo.h +++ b/runtimes/neurun/src/graph/operation/LowerInfo.h @@ -3,7 +3,7 @@ #include -#include "internal/BackendManager.h" +#include "backend/BackendManager.h" namespace neurun { @@ -15,11 +15,11 @@ namespace operation class LowerInfo { public: - LowerInfo(const internal::Backend &backend); - const internal::Backend &backend() const { return _backend; } + LowerInfo(const backend::Backend &backend); + const backend::Backend &backend() const { return _backend; } private: - internal::Backend _backend; + backend::Backend _backend; }; } // namespace operation -- 2.7.4