[onert] Update basic backend namespace (Samsung#6323)

This commit updates namespace onert::backend::cpu_common to onert::backend::basic. Signed-off-by: Hyeongseok Oh <[email protected]>
chxckj · Mar 24, 2021 · 255903b · 255903b
1 parent 3d3f88f
commit 255903b
Show file tree

Hide file tree

Showing 57 changed files with 116 additions and 116 deletions.
diff --git a/runtime/onert/backend/acl_cl/KernelGenerator.cc b/runtime/onert/backend/acl_cl/KernelGenerator.cc
@@ -47,7 +47,7 @@ using ActivationBuilder = ::onert::backend::acl_common::AclActivationBuilder<
 KernelGenerator::KernelGenerator(
   const ir::Graph &graph, const std::shared_ptr<TensorBuilder> &tensor_builder,
   const std::shared_ptr<acl_common::AclTensorRegistry<TensorManager>> &tensor_reg)
-  : cpu_common::KernelGeneratorBase{graph}, _ctx(graph.operands()),
+  : basic::KernelGeneratorBase{graph}, _ctx(graph.operands()),
     _operations_ctx(graph.operations()), _current_layout{graph.layout()},
     _tensor_builder(tensor_builder), _tensor_reg(tensor_reg)
 {

diff --git a/runtime/onert/backend/acl_cl/KernelGenerator.h b/runtime/onert/backend/acl_cl/KernelGenerator.h
@@ -30,7 +30,7 @@ namespace backend
 namespace acl_cl
 {
 
-class KernelGenerator : public cpu_common::KernelGeneratorBase
+class KernelGenerator : public basic::KernelGeneratorBase
 {
 public:
   KernelGenerator(const ir::Graph &graph, const std::shared_ptr<TensorBuilder> &tensor_builder,

diff --git a/runtime/onert/backend/acl_neon/KernelGenerator.cc b/runtime/onert/backend/acl_neon/KernelGenerator.cc
@@ -46,7 +46,7 @@ using ActivationBuilder = ::onert::backend::acl_common::AclActivationBuilder<
 KernelGenerator::KernelGenerator(
   const ir::Graph &graph, const std::shared_ptr<TensorBuilder> &tensor_builder,
   const std::shared_ptr<acl_common::AclTensorRegistry<TensorManager>> &tensor_reg)
-  : cpu_common::KernelGeneratorBase{graph}, _ctx(graph.operands()),
+  : basic::KernelGeneratorBase{graph}, _ctx(graph.operands()),
     _operations_ctx(graph.operations()), _current_layout{graph.layout()},
     _tensor_builder(tensor_builder), _tensor_reg(tensor_reg)
 {

diff --git a/runtime/onert/backend/acl_neon/KernelGenerator.h b/runtime/onert/backend/acl_neon/KernelGenerator.h
@@ -31,7 +31,7 @@ namespace backend
 namespace acl_neon
 {
 
-class KernelGenerator : public cpu_common::KernelGeneratorBase
+class KernelGenerator : public basic::KernelGeneratorBase
 {
 public:
   KernelGenerator(const ir::Graph &graph, const std::shared_ptr<TensorBuilder> &tensor_builder,

diff --git a/runtime/onert/backend/cpu/Backend.h b/runtime/onert/backend/cpu/Backend.h
@@ -44,7 +44,7 @@ class Backend : public ::onert::backend::Backend
     auto custom_kernel_builder = data.custom_kernel_builder;
     auto &graph = *data.graph;
     auto context = std::make_unique<BackendContext>(this, std::move(data));
-    auto tr = std::make_shared<cpu_common::TensorRegistry>();
+    auto tr = std::make_shared<basic::TensorRegistry>();
     auto tb = std::make_shared<TensorBuilder>(tr);
     context->tensor_registry = tr;
     context->tensor_builder = tb;

diff --git a/runtime/onert/backend/cpu/BackendContext.cc b/runtime/onert/backend/cpu/BackendContext.cc
@@ -31,7 +31,7 @@ namespace backend
 namespace cpu
 {
 
-ITensorRegistry *BackendContext::genTensors() { return cpu_common::genTensors(*this); }
+ITensorRegistry *BackendContext::genTensors() { return basic::genTensors(*this); }
 
 FunctionMap BackendContext::genKernels()
 {
@@ -43,7 +43,7 @@ FunctionMap BackendContext::genKernels()
     ret.emplace_back(op_ind, std::move(fn_seq));
   }
 
-  cpu_common::initConsts(*this);
+  basic::initConsts(*this);
 
   // NOTE For memory optimization, we want to free some operand data
   const_cast<ir::Graph &>(*_data.graph)

diff --git a/runtime/onert/backend/cpu/KernelGenerator.cc b/runtime/onert/backend/cpu/KernelGenerator.cc
@@ -223,10 +223,10 @@ ops::ReduceType convertReduceType(ir::operation::Reduce::ReduceType reduce_type_
 
 KernelGenerator::KernelGenerator(
   const ir::Graph &graph, const std::shared_ptr<TensorBuilder> &tensor_builder,
-  const std::shared_ptr<cpu_common::TensorRegistry> &tensor_reg,
+  const std::shared_ptr<basic::TensorRegistry> &tensor_reg,
   const std::shared_ptr<backend::custom::IKernelBuilder> &kernel_builder,
   const std::shared_ptr<ExternalContext> &external_context)
-  : cpu_common::KernelGeneratorBase{graph},
+  : basic::KernelGeneratorBase{graph},
     _ctx(graph.operands()), _operations_ctx{graph.operations()}, _current_layout{graph.layout()},
     _tensor_builder(tensor_builder), _tensor_reg{tensor_reg}, _kernel_builder(kernel_builder),
     _external_context(external_context)

diff --git a/runtime/onert/backend/cpu/KernelGenerator.h b/runtime/onert/backend/cpu/KernelGenerator.h
@@ -34,11 +34,11 @@ namespace backend
 namespace cpu
 {
 
-class KernelGenerator : public cpu_common::KernelGeneratorBase
+class KernelGenerator : public basic::KernelGeneratorBase
 {
 public:
   KernelGenerator(const ir::Graph &graph, const std::shared_ptr<TensorBuilder> &tensor_builder,
-                  const std::shared_ptr<cpu_common::TensorRegistry> &tensor_reg,
+                  const std::shared_ptr<basic::TensorRegistry> &tensor_reg,
                   const std::shared_ptr<custom::IKernelBuilder> &kernel_builder,
                   const std::shared_ptr<ExternalContext> &external_context);
 
@@ -101,7 +101,7 @@ class KernelGenerator : public cpu_common::KernelGeneratorBase
   const ir::Operations &_operations_ctx;
   ir::Layout _current_layout;
   std::shared_ptr<TensorBuilder> _tensor_builder;
-  std::shared_ptr<cpu_common::TensorRegistry> _tensor_reg;
+  std::shared_ptr<basic::TensorRegistry> _tensor_reg;
   std::shared_ptr<backend::custom::IKernelBuilder> _kernel_builder;
   const std::shared_ptr<ExternalContext> _external_context;
 };

diff --git a/runtime/onert/backend/cpu/StaticTensorManager.h b/runtime/onert/backend/cpu/StaticTensorManager.h
@@ -26,7 +26,7 @@ namespace backend
 namespace cpu
 {
 
-using StaticTensorManager = cpu_common::StaticTensorManager;
+using StaticTensorManager = basic::StaticTensorManager;
 
 } // namespace cpu
 } // namespace backend

diff --git a/runtime/onert/backend/cpu/Tensor.h b/runtime/onert/backend/cpu/Tensor.h
@@ -27,8 +27,8 @@ namespace backend
 namespace cpu
 {
 
-using Tensor = cpu_common::Tensor;
-using ExternalTensor = cpu_common::ExternalTensor;
+using Tensor = basic::Tensor;
+using ExternalTensor = basic::ExternalTensor;
 
 } // namespace cpu
 } // namespace backend

diff --git a/runtime/onert/backend/cpu/TensorBuilder.h b/runtime/onert/backend/cpu/TensorBuilder.h
@@ -26,7 +26,7 @@ namespace backend
 namespace cpu
 {
 
-using TensorBuilder = cpu_common::TensorBuilder;
+using TensorBuilder = basic::TensorBuilder;
 
 } // namespace cpu
 } // namespace backend

diff --git a/runtime/onert/backend/ruy/Backend.h b/runtime/onert/backend/ruy/Backend.h
@@ -44,7 +44,7 @@ class Backend : public ::onert::backend::Backend
     auto custom_kernel_builder = data.custom_kernel_builder;
     auto &graph = *data.graph;
     auto context = std::make_unique<BackendContext>(this, std::move(data));
-    auto tr = std::make_shared<cpu_common::TensorRegistry>();
+    auto tr = std::make_shared<basic::TensorRegistry>();
     auto tb = std::make_shared<TensorBuilder>(tr);
     context->tensor_registry = tr;
     context->tensor_builder = tb;

diff --git a/runtime/onert/backend/ruy/BackendContext.cc b/runtime/onert/backend/ruy/BackendContext.cc
@@ -31,7 +31,7 @@ namespace backend
 namespace ruy
 {
 
-ITensorRegistry *BackendContext::genTensors() { return cpu_common::genTensors(*this); }
+ITensorRegistry *BackendContext::genTensors() { return basic::genTensors(*this); }
 
 FunctionMap BackendContext::genKernels()
 {
@@ -43,7 +43,7 @@ FunctionMap BackendContext::genKernels()
     ret.emplace_back(op_ind, std::move(fn_seq));
   }
 
-  cpu_common::initConsts(*this);
+  basic::initConsts(*this);
 
   // NOTE For memory optimization, we want to free some operand data
   const_cast<ir::Graph &>(*_data.graph)

diff --git a/runtime/onert/backend/ruy/KernelGenerator.cc b/runtime/onert/backend/ruy/KernelGenerator.cc
@@ -78,10 +78,10 @@ std::unique_ptr<exec::FunctionSequence> KernelGenerator::generate(ir::OperationI
 
 KernelGenerator::KernelGenerator(
   const ir::Graph &graph, const std::shared_ptr<TensorBuilder> &tensor_builder,
-  const std::shared_ptr<cpu_common::TensorRegistry> &tensor_reg,
+  const std::shared_ptr<basic::TensorRegistry> &tensor_reg,
   const std::shared_ptr<backend::custom::IKernelBuilder> &kernel_builder,
   const std::shared_ptr<ExternalContext> &external_context)
-  : cpu_common::KernelGeneratorBase{graph},
+  : basic::KernelGeneratorBase{graph},
     _ctx(graph.operands()), _operations_ctx{graph.operations()}, _current_layout{graph.layout()},
     _tensor_builder(tensor_builder), _tensor_reg{tensor_reg}, _kernel_builder(kernel_builder),
     _external_context(external_context)

diff --git a/runtime/onert/backend/ruy/KernelGenerator.h b/runtime/onert/backend/ruy/KernelGenerator.h
@@ -34,11 +34,11 @@ namespace backend
 namespace ruy
 {
 
-class KernelGenerator : public cpu_common::KernelGeneratorBase
+class KernelGenerator : public basic::KernelGeneratorBase
 {
 public:
   KernelGenerator(const ir::Graph &graph, const std::shared_ptr<TensorBuilder> &tensor_builder,
-                  const std::shared_ptr<cpu_common::TensorRegistry> &tensor_reg,
+                  const std::shared_ptr<basic::TensorRegistry> &tensor_reg,
                   const std::shared_ptr<custom::IKernelBuilder> &kernel_builder,
                   const std::shared_ptr<ExternalContext> &external_context);
 
@@ -53,7 +53,7 @@ class KernelGenerator : public cpu_common::KernelGeneratorBase
   const ir::Operations &_operations_ctx;
   const ir::Layout _current_layout;
   std::shared_ptr<TensorBuilder> _tensor_builder;
-  std::shared_ptr<cpu_common::TensorRegistry> _tensor_reg;
+  std::shared_ptr<basic::TensorRegistry> _tensor_reg;
   std::shared_ptr<backend::custom::IKernelBuilder> _kernel_builder;
   const std::shared_ptr<ExternalContext> _external_context;
 };

diff --git a/runtime/onert/backend/ruy/StaticTensorManager.h b/runtime/onert/backend/ruy/StaticTensorManager.h
@@ -26,7 +26,7 @@ namespace backend
 namespace ruy
 {
 
-using StaticTensorManager = cpu_common::StaticTensorManager;
+using StaticTensorManager = basic::StaticTensorManager;
 
 } // namespace ruy
 } // namespace backend

diff --git a/runtime/onert/backend/ruy/Tensor.h b/runtime/onert/backend/ruy/Tensor.h
@@ -27,8 +27,8 @@ namespace backend
 namespace ruy
 {
 
-using Tensor = cpu_common::Tensor;
-using ExternalTensor = cpu_common::ExternalTensor;
+using Tensor = basic::Tensor;
+using ExternalTensor = basic::ExternalTensor;
 
 } // namespace ruy
 } // namespace backend

diff --git a/runtime/onert/backend/ruy/TensorBuilder.h b/runtime/onert/backend/ruy/TensorBuilder.h
@@ -26,7 +26,7 @@ namespace backend
 namespace ruy
 {
 
-using TensorBuilder = cpu_common::TensorBuilder;
+using TensorBuilder = basic::TensorBuilder;
 
 } // namespace ruy
 } // namespace backend

diff --git a/runtime/onert/backend/xnnpack/Backend.h b/runtime/onert/backend/xnnpack/Backend.h
@@ -44,7 +44,7 @@ class Backend : public ::onert::backend::Backend
     auto custom_kernel_builder = data.custom_kernel_builder;
     auto &graph = *data.graph;
     auto context = std::make_unique<BackendContext>(this, std::move(data));
-    auto tr = std::make_shared<cpu_common::TensorRegistry>();
+    auto tr = std::make_shared<basic::TensorRegistry>();
     auto tb = std::make_shared<TensorBuilder>(tr);
     context->tensor_registry = tr;
     context->tensor_builder = tb;

diff --git a/runtime/onert/backend/xnnpack/BackendContext.cc b/runtime/onert/backend/xnnpack/BackendContext.cc
@@ -31,7 +31,7 @@ namespace backend
 namespace xnnpack
 {
 
-ITensorRegistry *BackendContext::genTensors() { return cpu_common::genTensors(*this); }
+ITensorRegistry *BackendContext::genTensors() { return basic::genTensors(*this); }
 
 FunctionMap BackendContext::genKernels()
 {
@@ -43,7 +43,7 @@ FunctionMap BackendContext::genKernels()
     ret.emplace_back(op_ind, std::move(fn_seq));
   }
 
-  cpu_common::initConsts(*this);
+  basic::initConsts(*this);
 
   // NOTE For memory optimization, we want to free some operand data
   const_cast<ir::Graph &>(*_data.graph)

diff --git a/runtime/onert/backend/xnnpack/KernelGenerator.cc b/runtime/onert/backend/xnnpack/KernelGenerator.cc
@@ -38,10 +38,10 @@ namespace xnnpack
 
 KernelGenerator::KernelGenerator(
   const ir::Graph &graph, const std::shared_ptr<TensorBuilder> &tensor_builder,
-  const std::shared_ptr<cpu_common::TensorRegistry> &tensor_reg,
+  const std::shared_ptr<basic::TensorRegistry> &tensor_reg,
   const std::shared_ptr<backend::custom::IKernelBuilder> &kernel_builder,
   const std::shared_ptr<ExternalContext> &external_context)
-  : cpu_common::KernelGeneratorBase{graph},
+  : basic::KernelGeneratorBase{graph},
     _ctx(graph.operands()), _operations_ctx{graph.operations()}, _current_layout{graph.layout()},
     _tensor_builder(tensor_builder), _tensor_reg{tensor_reg}, _kernel_builder(kernel_builder),
     _external_context(external_context)

diff --git a/runtime/onert/backend/xnnpack/KernelGenerator.h b/runtime/onert/backend/xnnpack/KernelGenerator.h
@@ -34,11 +34,11 @@ namespace backend
 namespace xnnpack
 {
 
-class KernelGenerator : public cpu_common::KernelGeneratorBase
+class KernelGenerator : public basic::KernelGeneratorBase
 {
 public:
   KernelGenerator(const ir::Graph &graph, const std::shared_ptr<TensorBuilder> &tensor_builder,
-                  const std::shared_ptr<cpu_common::TensorRegistry> &tensor_reg,
+                  const std::shared_ptr<basic::TensorRegistry> &tensor_reg,
                   const std::shared_ptr<custom::IKernelBuilder> &kernel_builder,
                   const std::shared_ptr<ExternalContext> &external_context);
 
@@ -54,7 +54,7 @@ class KernelGenerator : public cpu_common::KernelGeneratorBase
   const ir::Operations &_operations_ctx;
   ir::Layout _current_layout;
   std::shared_ptr<TensorBuilder> _tensor_builder;
-  std::shared_ptr<cpu_common::TensorRegistry> _tensor_reg;
+  std::shared_ptr<basic::TensorRegistry> _tensor_reg;
   std::shared_ptr<backend::custom::IKernelBuilder> _kernel_builder;
   const std::shared_ptr<ExternalContext> _external_context;
 };

diff --git a/runtime/onert/backend/xnnpack/StaticTensorManager.h b/runtime/onert/backend/xnnpack/StaticTensorManager.h
@@ -26,7 +26,7 @@ namespace backend
 namespace xnnpack
 {
 
-using StaticTensorManager = cpu_common::StaticTensorManager;
+using StaticTensorManager = basic::StaticTensorManager;
 
 } // namespace xnnpack
 } // namespace backend

diff --git a/runtime/onert/backend/xnnpack/Tensor.h b/runtime/onert/backend/xnnpack/Tensor.h
@@ -27,8 +27,8 @@ namespace backend
 namespace xnnpack
 {
 
-using Tensor = cpu_common::Tensor;
-using ExternalTensor = cpu_common::ExternalTensor;
+using Tensor = basic::Tensor;
+using ExternalTensor = basic::ExternalTensor;
 
 } // namespace xnnpack
 } // namespace backend

diff --git a/runtime/onert/backend/xnnpack/TensorBuilder.h b/runtime/onert/backend/xnnpack/TensorBuilder.h
@@ -26,7 +26,7 @@ namespace backend
 namespace xnnpack
 {
 
-using TensorBuilder = cpu_common::TensorBuilder;
+using TensorBuilder = basic::TensorBuilder;
 
 } // namespace xnnpack
 } // namespace backend

diff --git a/runtime/onert/core/include/backend/basic/Allocator.h b/runtime/onert/core/include/backend/basic/Allocator.h
@@ -28,7 +28,7 @@ namespace onert
 {
 namespace backend
 {
-namespace cpu_common
+namespace basic
 {
 
 /**
@@ -49,7 +49,7 @@ class Allocator
   std::unique_ptr<uint8_t[]> _base;
 };
 
-} // namespace cpu_common
+} // namespace basic
 } // namespace backend
 } // namespace onert
 

diff --git a/runtime/onert/core/include/backend/basic/BackendContextHelpers.h b/runtime/onert/core/include/backend/basic/BackendContextHelpers.h
@@ -30,7 +30,7 @@ namespace onert
 {
 namespace backend
 {
-namespace cpu_common
+namespace basic
 {
 
 // TODO Remove the template param BackendContext once unification of cpu backend context is done
@@ -205,7 +205,7 @@ template <typename T_BackendContext> ITensorRegistry *genTensors(T_BackendContex
   // TODO Get compiler options from compiler, and use it rather than getting it from Env
   if (util::getConfigString(util::config::EXECUTOR) == "Linear")
   {
-    cpu_common::planTensors(ctx);
+    basic::planTensors(ctx);
   }
   else
   {
@@ -244,7 +244,7 @@ inline void initConsts(BackendContext &ctx)
   });
 }
 
-} // namespace cpu_common
+} // namespace basic
 } // namespace backend
 } // namespace onert
 

diff --git a/runtime/onert/core/include/backend/basic/DynamicTensorManager.h b/runtime/onert/core/include/backend/basic/DynamicTensorManager.h
@@ -28,7 +28,7 @@ namespace onert
 {
 namespace backend
 {
-namespace cpu_common
+namespace basic
 {
 
 // TODO Find optimized algorithm to manage memory.
@@ -65,7 +65,7 @@ class DynamicTensorManager
     _dealloc_tensor_map;
 };
 
-} // namespace cpu_common
+} // namespace basic
 } // namespace backend
 } // namespace onert
 

diff --git a/runtime/onert/core/include/backend/basic/IMemoryPlanner.h b/runtime/onert/core/include/backend/basic/IMemoryPlanner.h
@@ -23,7 +23,7 @@ namespace onert
 {
 namespace backend
 {
-namespace cpu_common
+namespace basic
 {
 
 /**
@@ -67,7 +67,7 @@ struct IMemoryPlanner
   virtual ~IMemoryPlanner() = default;
 };
 
-} // namespace cpu_common
+} // namespace basic
 } // namespace backend
 } // namespace onert