From: 이한종/동작제어Lab(SR)/Engineer/삼성전자 <hanjoung.lee@samsung.com>
Date: Wed, 10 Oct 2018 05:28:55 +0000 (+0900)
Subject: [neurun] Move backend interfaces to interface dir (#3041)
X-Git-Tag: 0.3~686
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1eb0dad2bd8e97e12ac9493e02b40ebf1eb7202e;p=platform%2Fcore%2Fml%2Fnnfw.git

[neurun] Move backend interfaces to interface dir (#3041)

Move backend interfaces to interface dir.

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

diff --git a/runtimes/neurun/src/backend/acl_cl/BackendConfig.h b/runtimes/neurun/src/backend/acl_cl/BackendConfig.h
index 9372c33..87ba214 100644
--- a/runtimes/neurun/src/backend/acl_cl/BackendConfig.h
+++ b/runtimes/neurun/src/backend/acl_cl/BackendConfig.h
@@ -17,7 +17,7 @@
 #ifndef __NEURUN_BACKEND_ACL_CL_BACKEND_CONFIG_H__
 #define __NEURUN_BACKEND_ACL_CL_BACKEND_CONFIG_H__
 
-#include "backend/IBackendConfig.h"
+#include "backend/interface/IBackendConfig.h"
 
 namespace neurun
 {
diff --git a/runtimes/neurun/src/backend/acl_cl/InitializerGenerator.h b/runtimes/neurun/src/backend/acl_cl/InitializerGenerator.h
index 78b7efb..3171498 100644
--- a/runtimes/neurun/src/backend/acl_cl/InitializerGenerator.h
+++ b/runtimes/neurun/src/backend/acl_cl/InitializerGenerator.h
@@ -17,7 +17,7 @@
 #ifndef __NEURUN_BACKEND_ACL_CL_INITIALIZER_GENERATOR_H__
 #define __NEURUN_BACKEND_ACL_CL_INITIALIZER_GENERATOR_H__
 
-#include "backend/IInitializerGenerator.h"
+#include "backend/interface/IInitializerGenerator.h"
 
 #include "graph/operand/Set.h"
 
diff --git a/runtimes/neurun/src/backend/acl_cl/StageGenerator.h b/runtimes/neurun/src/backend/acl_cl/StageGenerator.h
index 6112166..11b900d 100644
--- a/runtimes/neurun/src/backend/acl_cl/StageGenerator.h
+++ b/runtimes/neurun/src/backend/acl_cl/StageGenerator.h
@@ -17,7 +17,7 @@
 #ifndef __NEURUN_BACKEND_ACL_CL_STAGE_GENERATOR_H__
 #define __NEURUN_BACKEND_ACL_CL_STAGE_GENERATOR_H__
 
-#include "backend/IStageGenerator.h"
+#include "backend/interface/IStageGenerator.h"
 
 #include "graph/operand/Set.h"
 #include "backend/acl_cl/TensorBuilder.h"
diff --git a/runtimes/neurun/src/backend/acl_cl/TensorBuilder.h b/runtimes/neurun/src/backend/acl_cl/TensorBuilder.h
index 1655b3d..78a985a 100644
--- a/runtimes/neurun/src/backend/acl_cl/TensorBuilder.h
+++ b/runtimes/neurun/src/backend/acl_cl/TensorBuilder.h
@@ -17,7 +17,7 @@
 #ifndef __NEURUN_BACKEND_ACL_CL_TENSOR_BUILDER_H__
 #define __NEURUN_BACKEND_ACL_CL_TENSOR_BUILDER_H__
 
-#include "backend/ITensorBuilder.h"
+#include "backend/interface/ITensorBuilder.h"
 
 #include <unordered_map>
 
diff --git a/runtimes/neurun/src/backend/acl_cl/operand/Object.h b/runtimes/neurun/src/backend/acl_cl/operand/Object.h
index da33c05..4a4c384 100644
--- a/runtimes/neurun/src/backend/acl_cl/operand/Object.h
+++ b/runtimes/neurun/src/backend/acl_cl/operand/Object.h
@@ -20,7 +20,7 @@
 #include <memory>
 #include <arm_compute/core/CL/ICLTensor.h>
 
-#include "backend/IObject.h"
+#include "backend/interface/operand/IObject.h"
 
 namespace neurun
 {
diff --git a/runtimes/neurun/src/backend/cpu/BackendConfig.h b/runtimes/neurun/src/backend/cpu/BackendConfig.h
index c5693db..5d2c36e 100644
--- a/runtimes/neurun/src/backend/cpu/BackendConfig.h
+++ b/runtimes/neurun/src/backend/cpu/BackendConfig.h
@@ -17,7 +17,7 @@
 #ifndef __NEURUN_BACKEND_CPU_BACKEND_CONFIG_H__
 #define __NEURUN_BACKEND_CPU_BACKEND_CONFIG_H__
 
-#include "backend/IBackendConfig.h"
+#include "backend/interface/IBackendConfig.h"
 
 namespace neurun
 {
diff --git a/runtimes/neurun/src/backend/cpu/InitializerGenerator.h b/runtimes/neurun/src/backend/cpu/InitializerGenerator.h
index 42d37f4..d04212d 100644
--- a/runtimes/neurun/src/backend/cpu/InitializerGenerator.h
+++ b/runtimes/neurun/src/backend/cpu/InitializerGenerator.h
@@ -17,7 +17,7 @@
 #ifndef __NEURUN_BACKEND_CPU_INITIALIZER_GENERATOR_H__
 #define __NEURUN_BACKEND_CPU_INITIALIZER_GENERATOR_H__
 
-#include "backend/IInitializerGenerator.h"
+#include "backend/interface/IInitializerGenerator.h"
 
 #include "graph/operand/Set.h"
 
diff --git a/runtimes/neurun/src/backend/cpu/StageGenerator.cc b/runtimes/neurun/src/backend/cpu/StageGenerator.cc
index 2e9bbde..40c4c9c 100644
--- a/runtimes/neurun/src/backend/cpu/StageGenerator.cc
+++ b/runtimes/neurun/src/backend/cpu/StageGenerator.cc
@@ -30,7 +30,7 @@
 #include "kernel/cpu/SoftMaxLayer.h"
 #include "kernel/cpu/PermuteLayer.h"
 #include "backend/BackendManager.h"
-#include "backend/IBackendConfig.h"
+#include "backend/interface/IBackendConfig.h"
 
 #include "logging.h"
 
diff --git a/runtimes/neurun/src/backend/cpu/StageGenerator.h b/runtimes/neurun/src/backend/cpu/StageGenerator.h
index f886ecf..8aa62b8 100644
--- a/runtimes/neurun/src/backend/cpu/StageGenerator.h
+++ b/runtimes/neurun/src/backend/cpu/StageGenerator.h
@@ -17,7 +17,7 @@
 #ifndef __NEURUN_BACKEND_CPU_STAGE_GENERATOR_H__
 #define __NEURUN_BACKEND_CPU_STAGE_GENERATOR_H__
 
-#include "backend/IStageGenerator.h"
+#include "backend/interface/IStageGenerator.h"
 
 #include "graph/operand/Set.h"
 #include "backend/cpu/operand/Tensor.h"
diff --git a/runtimes/neurun/src/backend/cpu/TensorBuilder.h b/runtimes/neurun/src/backend/cpu/TensorBuilder.h
index 709e54c..cd4d25f 100644
--- a/runtimes/neurun/src/backend/cpu/TensorBuilder.h
+++ b/runtimes/neurun/src/backend/cpu/TensorBuilder.h
@@ -19,7 +19,7 @@
 
 #include <unordered_map>
 
-#include "backend/ITensorBuilder.h"
+#include "backend/interface/ITensorBuilder.h"
 #include "backend/cpu/operand/Tensor.h"
 #include "graph/operand/Index.h"
 
diff --git a/runtimes/neurun/src/backend/cpu/operand/Object.h b/runtimes/neurun/src/backend/cpu/operand/Object.h
index 08f63f3..a2af9b1 100644
--- a/runtimes/neurun/src/backend/cpu/operand/Object.h
+++ b/runtimes/neurun/src/backend/cpu/operand/Object.h
@@ -20,7 +20,7 @@
 #include <memory>
 #include <arm_compute/core/ITensor.h>
 
-#include "backend/IObject.h"
+#include "backend/interface/operand/IObject.h"
 
 namespace neurun
 {
diff --git a/runtimes/neurun/src/backend/IBackendConfig.h b/runtimes/neurun/src/backend/interface/IBackendConfig.h
similarity index 100%
rename from runtimes/neurun/src/backend/IBackendConfig.h
rename to runtimes/neurun/src/backend/interface/IBackendConfig.h
diff --git a/runtimes/neurun/src/backend/IInitializerGenerator.h b/runtimes/neurun/src/backend/interface/IInitializerGenerator.h
similarity index 100%
rename from runtimes/neurun/src/backend/IInitializerGenerator.h
rename to runtimes/neurun/src/backend/interface/IInitializerGenerator.h
diff --git a/runtimes/neurun/src/backend/IStageGenerator.h b/runtimes/neurun/src/backend/interface/IStageGenerator.h
similarity index 98%
rename from runtimes/neurun/src/backend/IStageGenerator.h
rename to runtimes/neurun/src/backend/interface/IStageGenerator.h
index 6d844f5..657ab6f 100644
--- a/runtimes/neurun/src/backend/IStageGenerator.h
+++ b/runtimes/neurun/src/backend/interface/IStageGenerator.h
@@ -22,7 +22,7 @@
 
 #include <arm_compute/runtime/IFunction.h>
 
-#include "backend/ITensorBuilder.h"
+#include "backend/interface/ITensorBuilder.h"
 #include "graph/operation/Conv2D.h"
 #include "graph/operation/MaxPool2D.h"
 #include "graph/operation/AvgPool2D.h"
diff --git a/runtimes/neurun/src/backend/ITensorBuilder.h b/runtimes/neurun/src/backend/interface/ITensorBuilder.h
similarity index 98%
rename from runtimes/neurun/src/backend/ITensorBuilder.h
rename to runtimes/neurun/src/backend/interface/ITensorBuilder.h
index 1499635..1e87ed1 100644
--- a/runtimes/neurun/src/backend/ITensorBuilder.h
+++ b/runtimes/neurun/src/backend/interface/ITensorBuilder.h
@@ -21,7 +21,7 @@
 #include <arm_compute/core/TensorInfo.h>
 
 #include "graph/operand/Index.h"
-#include "IObject.h"
+#include "operand/IObject.h"
 
 namespace neurun
 {
diff --git a/runtimes/neurun/src/backend/IObject.h b/runtimes/neurun/src/backend/interface/operand/IObject.h
similarity index 100%
rename from runtimes/neurun/src/backend/IObject.h
rename to runtimes/neurun/src/backend/interface/operand/IObject.h
diff --git a/runtimes/neurun/src/codegen/BackendResolver.h b/runtimes/neurun/src/codegen/BackendResolver.h
index 0d628af..9037ee9 100644
--- a/runtimes/neurun/src/codegen/BackendResolver.h
+++ b/runtimes/neurun/src/codegen/BackendResolver.h
@@ -24,8 +24,8 @@
 #include "logging.h"
 #include "util/EnvVar.h"
 #include "backend/BackendManager.h"
-#include "backend/IInitializerGenerator.h"
-#include "backend/IStageGenerator.h"
+#include "backend/interface/IInitializerGenerator.h"
+#include "backend/interface/IStageGenerator.h"
 
 namespace neurun
 {
diff --git a/runtimes/neurun/src/codegen/IPlanBuilder.h b/runtimes/neurun/src/codegen/IPlanBuilder.h
index 1976814..0ef78cd 100644
--- a/runtimes/neurun/src/codegen/IPlanBuilder.h
+++ b/runtimes/neurun/src/codegen/IPlanBuilder.h
@@ -18,8 +18,8 @@
 #define __NEURUN_CODEGEN_I_PLAN_BUILDER_H__
 
 #include "arm_compute/core/TensorInfo.h"
-#include "backend/IStageGenerator.h"
-#include "backend/IInitializerGenerator.h"
+#include "backend/interface/IStageGenerator.h"
+#include "backend/interface/IInitializerGenerator.h"
 
 namespace neurun
 {
diff --git a/runtimes/neurun/src/codegen/PlanBuilder.cc b/runtimes/neurun/src/codegen/PlanBuilder.cc
index 91bf2b5..22232eb 100644
--- a/runtimes/neurun/src/codegen/PlanBuilder.cc
+++ b/runtimes/neurun/src/codegen/PlanBuilder.cc
@@ -16,7 +16,7 @@
 
 #include "PlanBuilder.h"
 
-#include "backend/IObject.h"
+#include "backend/interface/operand/IObject.h"
 
 namespace neurun
 {
diff --git a/runtimes/neurun/src/codegen/PlanBuilder.h b/runtimes/neurun/src/codegen/PlanBuilder.h
index 4323143..18ffedc 100644
--- a/runtimes/neurun/src/codegen/PlanBuilder.h
+++ b/runtimes/neurun/src/codegen/PlanBuilder.h
@@ -19,8 +19,8 @@
 
 #include "IPlanBuilder.h"
 #include "codegen/Plan.h"
-#include "backend/IStageGenerator.h"
-#include "backend/ITensorBuilder.h"
+#include "backend/interface/IStageGenerator.h"
+#include "backend/interface/ITensorBuilder.h"
 
 namespace neurun
 {
diff --git a/runtimes/neurun/src/codegen/operand/Context.h b/runtimes/neurun/src/codegen/operand/Context.h
index 92f1f2b..b1000a8 100644
--- a/runtimes/neurun/src/codegen/operand/Context.h
+++ b/runtimes/neurun/src/codegen/operand/Context.h
@@ -17,7 +17,7 @@
 #ifndef __NEURUN_CODEGEN_OPERAND_CONTEXT_H__
 #define __NEURUN_CODEGEN_OPERAND_CONTEXT_H__
 
-#include "backend/IObject.h"
+#include "backend/interface/operand/IObject.h"
 #include "graph/operand/Index.h"
 
 #include <map>
diff --git a/runtimes/neurun/src/dumper/dot/DotNodeInfo.cc b/runtimes/neurun/src/dumper/dot/DotNodeInfo.cc
index 1ee95cf..f39321e 100644
--- a/runtimes/neurun/src/dumper/dot/DotNodeInfo.cc
+++ b/runtimes/neurun/src/dumper/dot/DotNodeInfo.cc
@@ -18,7 +18,7 @@
 
 #include "DotNodeInfo.h"
 #include "graph/operation/LowerInfo.h"
-#include "backend/IBackendConfig.h"
+#include "backend/interface/IBackendConfig.h"
 
 namespace neurun
 {
diff --git a/runtimes/neurun/src/graph/Graph.cc b/runtimes/neurun/src/graph/Graph.cc
index 1e939b8..fd9f3ae 100644
--- a/runtimes/neurun/src/graph/Graph.cc
+++ b/runtimes/neurun/src/graph/Graph.cc
@@ -27,7 +27,7 @@
 #include "operand/LowerInfo.h"
 #include "operand/Shape4DConvert.h"
 #include "codegen/BackendResolver.h"
-#include "backend/IBackendConfig.h"
+#include "backend/interface/IBackendConfig.h"
 #include "operation/Permute.h"
 #include "pass/PermutationInsertionPass.h"
 
diff --git a/runtimes/neurun/src/graph/pass/PermutationInsertionPass.cc b/runtimes/neurun/src/graph/pass/PermutationInsertionPass.cc
index 703072d..dc8e067 100644
--- a/runtimes/neurun/src/graph/pass/PermutationInsertionPass.cc
+++ b/runtimes/neurun/src/graph/pass/PermutationInsertionPass.cc
@@ -23,7 +23,7 @@
 #include "graph/operand/Object.h"
 #include "graph/operation/LowerInfo.h"
 #include "graph/Graph.h"
-#include "backend/IBackendConfig.h"
+#include "backend/interface/IBackendConfig.h"
 #include "logging.h"
 
 namespace neurun
diff --git a/runtimes/neurun/src/linear/Linear.cc b/runtimes/neurun/src/linear/Linear.cc
index 8d6968f..2d0a54f 100644
--- a/runtimes/neurun/src/linear/Linear.cc
+++ b/runtimes/neurun/src/linear/Linear.cc
@@ -19,7 +19,7 @@
 #include "graph/Graph.h"
 
 #include "graph/operation/LowerInfo.h"
-#include "backend/IStageGenerator.h"
+#include "backend/interface/IStageGenerator.h"
 #include "internal/Convert.h"
 
 namespace neurun
diff --git a/runtimes/neurun/src/linear/Linear.h b/runtimes/neurun/src/linear/Linear.h
index 90be6b8..46815e4 100644
--- a/runtimes/neurun/src/linear/Linear.h
+++ b/runtimes/neurun/src/linear/Linear.h
@@ -20,7 +20,7 @@
 #include <vector>
 
 #include "graph/operation/Node.h"
-#include "backend/ITensorBuilder.h"
+#include "backend/interface/ITensorBuilder.h"
 
 namespace neurun
 {