From: 이한종/동작제어Lab(SR)/Engineer/삼성전자 <hanjoung.lee@samsung.com>
Date: Wed, 25 Jul 2018 01:35:08 +0000 (+0900)
Subject: [neurun] Move `kernel` to upper directory (#2071)
X-Git-Tag: 0.2~402
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=144d4390665765bd0061634a08f7b5a631433bdf;p=platform%2Fcore%2Fml%2Fnnfw.git

[neurun] Move `kernel` to upper directory (#2071)

Move `kernel` directory to be the top level.

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

diff --git a/runtimes/neurun/CMakeLists.txt b/runtimes/neurun/CMakeLists.txt
index b766f67..8fbdec4 100644
--- a/runtimes/neurun/CMakeLists.txt
+++ b/runtimes/neurun/CMakeLists.txt
@@ -9,11 +9,12 @@ add_subdirectory(src/backend)
 
 file(GLOB SOURCES "src/*.cc")
 file(GLOB_RECURSE SOURCES_INTERNAL "src/internal/*.cc")
+file(GLOB_RECURSE SOURCES_KERNEL "src/kernel/*.cc") # TODO should be built as a separate lib
 
 # TODO This must be built separately, just like "backend/cpu"
 file(GLOB_RECURSE SOURCES_BACKEND_ACL "src/backend/acl_cl/*.cc")
 
-set(SOURCES ${SOURCES} ${SOURCES_INTERNAL} ${SOURCES_BACKEND_ACL})
+set(SOURCES ${SOURCES} ${SOURCES_INTERNAL} ${SOURCES_BACKEND_ACL} ${SOURCES_KERNEL})
 
 # NOTE For now ARMCompute is necessary
 # TODO Remove required package below(should be optional)
diff --git a/runtimes/neurun/src/backend/acl_cl/StageGenerator.cc b/runtimes/neurun/src/backend/acl_cl/StageGenerator.cc
index 3f7ad45..5de30f7 100644
--- a/runtimes/neurun/src/backend/acl_cl/StageGenerator.cc
+++ b/runtimes/neurun/src/backend/acl_cl/StageGenerator.cc
@@ -7,7 +7,7 @@
 #include <arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h>
 #include <arm_compute/runtime/CL/functions/CLSoftmaxLayer.h>
 
-#include "internal/kernel/acl_cl/ConcatLayer.h"
+#include "kernel/acl_cl/ConcatLayer.h"
 
 #include "internal/Padding.h"
 #include "internal/Model.h"
diff --git a/runtimes/neurun/src/backend/cpu/StageGenerator.cc b/runtimes/neurun/src/backend/cpu/StageGenerator.cc
index d2e719d..d05d2a8 100644
--- a/runtimes/neurun/src/backend/cpu/StageGenerator.cc
+++ b/runtimes/neurun/src/backend/cpu/StageGenerator.cc
@@ -3,13 +3,13 @@
 #include <stdexcept>
 
 #include "internal/Padding.h"
-#include "internal/kernel/cpufallback/ConvolutionLayer.h"
-#include "internal/kernel/cpufallback/AvgPoolLayer.h"
-#include "internal/kernel/cpufallback/MaxPoolLayer.h"
-#include "internal/kernel/cpufallback/ConcatLayer.h"
-#include "internal/kernel/cpufallback/FullyConnectedLayer.h"
-#include "internal/kernel/cpufallback/ReshapeLayer.h"
-#include "internal/kernel/cpufallback/SoftMaxLayer.h"
+#include "kernel/cpufallback/ConvolutionLayer.h"
+#include "kernel/cpufallback/AvgPoolLayer.h"
+#include "kernel/cpufallback/MaxPoolLayer.h"
+#include "kernel/cpufallback/ConcatLayer.h"
+#include "kernel/cpufallback/FullyConnectedLayer.h"
+#include "kernel/cpufallback/ReshapeLayer.h"
+#include "kernel/cpufallback/SoftMaxLayer.h"
 
 #include "logging.h"
 
diff --git a/runtimes/neurun/src/internal/kernel/acl_cl/ConcatLayer.cc b/runtimes/neurun/src/kernel/acl_cl/ConcatLayer.cc
similarity index 100%
rename from runtimes/neurun/src/internal/kernel/acl_cl/ConcatLayer.cc
rename to runtimes/neurun/src/kernel/acl_cl/ConcatLayer.cc
diff --git a/runtimes/neurun/src/internal/kernel/acl_cl/ConcatLayer.h b/runtimes/neurun/src/kernel/acl_cl/ConcatLayer.h
similarity index 96%
rename from runtimes/neurun/src/internal/kernel/acl_cl/ConcatLayer.h
rename to runtimes/neurun/src/kernel/acl_cl/ConcatLayer.h
index a8aa675..4182faa 100644
--- a/runtimes/neurun/src/internal/kernel/acl_cl/ConcatLayer.h
+++ b/runtimes/neurun/src/kernel/acl_cl/ConcatLayer.h
@@ -23,7 +23,7 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "internal/kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpufallback/OperationUtils.h"
 
 using namespace internal::kernel::cpu;
 
diff --git a/runtimes/neurun/src/internal/kernel/cpufallback/AvgPoolLayer.cc b/runtimes/neurun/src/kernel/cpufallback/AvgPoolLayer.cc
similarity index 98%
rename from runtimes/neurun/src/internal/kernel/cpufallback/AvgPoolLayer.cc
rename to runtimes/neurun/src/kernel/cpufallback/AvgPoolLayer.cc
index e9cc824..dbf0889 100644
--- a/runtimes/neurun/src/internal/kernel/cpufallback/AvgPoolLayer.cc
+++ b/runtimes/neurun/src/kernel/cpufallback/AvgPoolLayer.cc
@@ -18,7 +18,7 @@
 #include "AvgPoolLayer.h"
 
 #include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h"
-#include "internal/kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpufallback/OperationUtils.h"
 
 namespace internal
 {
diff --git a/runtimes/neurun/src/internal/kernel/cpufallback/AvgPoolLayer.h b/runtimes/neurun/src/kernel/cpufallback/AvgPoolLayer.h
similarity index 96%
rename from runtimes/neurun/src/internal/kernel/cpufallback/AvgPoolLayer.h
rename to runtimes/neurun/src/kernel/cpufallback/AvgPoolLayer.h
index bec001c..fac6603 100644
--- a/runtimes/neurun/src/internal/kernel/cpufallback/AvgPoolLayer.h
+++ b/runtimes/neurun/src/kernel/cpufallback/AvgPoolLayer.h
@@ -6,7 +6,7 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "internal/kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpufallback/OperationUtils.h"
 
 using namespace internal::kernel::cpu;
 
diff --git a/runtimes/neurun/src/internal/kernel/cpufallback/ConcatLayer.cc b/runtimes/neurun/src/kernel/cpufallback/ConcatLayer.cc
similarity index 98%
rename from runtimes/neurun/src/internal/kernel/cpufallback/ConcatLayer.cc
rename to runtimes/neurun/src/kernel/cpufallback/ConcatLayer.cc
index 0805c0c..dced4bd 100644
--- a/runtimes/neurun/src/internal/kernel/cpufallback/ConcatLayer.cc
+++ b/runtimes/neurun/src/kernel/cpufallback/ConcatLayer.cc
@@ -18,7 +18,7 @@
 #include "ConcatLayer.h"
 
 #include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h"
-#include "internal/kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpufallback/OperationUtils.h"
 
 namespace internal
 {
diff --git a/runtimes/neurun/src/internal/kernel/cpufallback/ConcatLayer.h b/runtimes/neurun/src/kernel/cpufallback/ConcatLayer.h
similarity index 96%
rename from runtimes/neurun/src/internal/kernel/cpufallback/ConcatLayer.h
rename to runtimes/neurun/src/kernel/cpufallback/ConcatLayer.h
index 53f701f..af819b5 100644
--- a/runtimes/neurun/src/internal/kernel/cpufallback/ConcatLayer.h
+++ b/runtimes/neurun/src/kernel/cpufallback/ConcatLayer.h
@@ -23,7 +23,7 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "internal/kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpufallback/OperationUtils.h"
 
 using namespace internal::kernel::cpu;
 
diff --git a/runtimes/neurun/src/internal/kernel/cpufallback/ConvolutionLayer.cc b/runtimes/neurun/src/kernel/cpufallback/ConvolutionLayer.cc
similarity index 99%
rename from runtimes/neurun/src/internal/kernel/cpufallback/ConvolutionLayer.cc
rename to runtimes/neurun/src/kernel/cpufallback/ConvolutionLayer.cc
index beac3d0..0cb2110 100644
--- a/runtimes/neurun/src/internal/kernel/cpufallback/ConvolutionLayer.cc
+++ b/runtimes/neurun/src/kernel/cpufallback/ConvolutionLayer.cc
@@ -1,7 +1,7 @@
 #include "ConvolutionLayer.h"
 
 #include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h"
-#include "internal/kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpufallback/OperationUtils.h"
 
 namespace internal
 {
diff --git a/runtimes/neurun/src/internal/kernel/cpufallback/ConvolutionLayer.h b/runtimes/neurun/src/kernel/cpufallback/ConvolutionLayer.h
similarity index 96%
rename from runtimes/neurun/src/internal/kernel/cpufallback/ConvolutionLayer.h
rename to runtimes/neurun/src/kernel/cpufallback/ConvolutionLayer.h
index 863510c..fd614c8 100644
--- a/runtimes/neurun/src/internal/kernel/cpufallback/ConvolutionLayer.h
+++ b/runtimes/neurun/src/kernel/cpufallback/ConvolutionLayer.h
@@ -6,7 +6,7 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "internal/kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpufallback/OperationUtils.h"
 
 using namespace internal::kernel::cpu;
 
diff --git a/runtimes/neurun/src/internal/kernel/cpufallback/FullyConnectedLayer.cc b/runtimes/neurun/src/kernel/cpufallback/FullyConnectedLayer.cc
similarity index 98%
rename from runtimes/neurun/src/internal/kernel/cpufallback/FullyConnectedLayer.cc
rename to runtimes/neurun/src/kernel/cpufallback/FullyConnectedLayer.cc
index cb511e0..920d3a6 100644
--- a/runtimes/neurun/src/internal/kernel/cpufallback/FullyConnectedLayer.cc
+++ b/runtimes/neurun/src/kernel/cpufallback/FullyConnectedLayer.cc
@@ -19,7 +19,7 @@
 
 #include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h"
 #include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h"
-#include "internal/kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpufallback/OperationUtils.h"
 
 #include <mutex>
 
diff --git a/runtimes/neurun/src/internal/kernel/cpufallback/FullyConnectedLayer.h b/runtimes/neurun/src/kernel/cpufallback/FullyConnectedLayer.h
similarity index 95%
rename from runtimes/neurun/src/internal/kernel/cpufallback/FullyConnectedLayer.h
rename to runtimes/neurun/src/kernel/cpufallback/FullyConnectedLayer.h
index 0bff45d..6ac7a94 100644
--- a/runtimes/neurun/src/internal/kernel/cpufallback/FullyConnectedLayer.h
+++ b/runtimes/neurun/src/kernel/cpufallback/FullyConnectedLayer.h
@@ -6,7 +6,7 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "internal/kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpufallback/OperationUtils.h"
 
 using namespace internal::kernel::cpu;
 
diff --git a/runtimes/neurun/src/internal/kernel/cpufallback/MaxPoolLayer.cc b/runtimes/neurun/src/kernel/cpufallback/MaxPoolLayer.cc
similarity index 98%
rename from runtimes/neurun/src/internal/kernel/cpufallback/MaxPoolLayer.cc
rename to runtimes/neurun/src/kernel/cpufallback/MaxPoolLayer.cc
index bd12976..73e8278 100644
--- a/runtimes/neurun/src/internal/kernel/cpufallback/MaxPoolLayer.cc
+++ b/runtimes/neurun/src/kernel/cpufallback/MaxPoolLayer.cc
@@ -1,7 +1,7 @@
 #include "MaxPoolLayer.h"
 
 #include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h"
-#include "internal/kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpufallback/OperationUtils.h"
 
 namespace internal
 {
diff --git a/runtimes/neurun/src/internal/kernel/cpufallback/MaxPoolLayer.h b/runtimes/neurun/src/kernel/cpufallback/MaxPoolLayer.h
similarity index 96%
rename from runtimes/neurun/src/internal/kernel/cpufallback/MaxPoolLayer.h
rename to runtimes/neurun/src/kernel/cpufallback/MaxPoolLayer.h
index c5a83e9..facf221 100644
--- a/runtimes/neurun/src/internal/kernel/cpufallback/MaxPoolLayer.h
+++ b/runtimes/neurun/src/kernel/cpufallback/MaxPoolLayer.h
@@ -6,7 +6,7 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "internal/kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpufallback/OperationUtils.h"
 
 using namespace internal::kernel::cpu;
 
diff --git a/runtimes/neurun/src/internal/kernel/cpufallback/OperationUtils.cc b/runtimes/neurun/src/kernel/cpufallback/OperationUtils.cc
similarity index 99%
rename from runtimes/neurun/src/internal/kernel/cpufallback/OperationUtils.cc
rename to runtimes/neurun/src/kernel/cpufallback/OperationUtils.cc
index d5f7dcb..623261f 100644
--- a/runtimes/neurun/src/internal/kernel/cpufallback/OperationUtils.cc
+++ b/runtimes/neurun/src/kernel/cpufallback/OperationUtils.cc
@@ -1,4 +1,4 @@
-#include "internal/kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpufallback/OperationUtils.h"
 
 #include <cmath>
 #include <algorithm>
diff --git a/runtimes/neurun/src/internal/kernel/cpufallback/OperationUtils.h b/runtimes/neurun/src/kernel/cpufallback/OperationUtils.h
similarity index 100%
rename from runtimes/neurun/src/internal/kernel/cpufallback/OperationUtils.h
rename to runtimes/neurun/src/kernel/cpufallback/OperationUtils.h
diff --git a/runtimes/neurun/src/internal/kernel/cpufallback/ReshapeLayer.cc b/runtimes/neurun/src/kernel/cpufallback/ReshapeLayer.cc
similarity index 96%
rename from runtimes/neurun/src/internal/kernel/cpufallback/ReshapeLayer.cc
rename to runtimes/neurun/src/kernel/cpufallback/ReshapeLayer.cc
index e6aa5c7..f4e1bee 100644
--- a/runtimes/neurun/src/internal/kernel/cpufallback/ReshapeLayer.cc
+++ b/runtimes/neurun/src/kernel/cpufallback/ReshapeLayer.cc
@@ -19,7 +19,7 @@
 
 #include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h"
 #include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h"
-#include "internal/kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpufallback/OperationUtils.h"
 
 namespace internal
 {
diff --git a/runtimes/neurun/src/internal/kernel/cpufallback/ReshapeLayer.h b/runtimes/neurun/src/kernel/cpufallback/ReshapeLayer.h
similarity index 93%
rename from runtimes/neurun/src/internal/kernel/cpufallback/ReshapeLayer.h
rename to runtimes/neurun/src/kernel/cpufallback/ReshapeLayer.h
index ace9e0c..10cd08a 100644
--- a/runtimes/neurun/src/internal/kernel/cpufallback/ReshapeLayer.h
+++ b/runtimes/neurun/src/kernel/cpufallback/ReshapeLayer.h
@@ -6,7 +6,7 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "internal/kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpufallback/OperationUtils.h"
 
 using namespace internal::kernel::cpu;
 
diff --git a/runtimes/neurun/src/internal/kernel/cpufallback/SoftMaxLayer.cc b/runtimes/neurun/src/kernel/cpufallback/SoftMaxLayer.cc
similarity index 98%
rename from runtimes/neurun/src/internal/kernel/cpufallback/SoftMaxLayer.cc
rename to runtimes/neurun/src/kernel/cpufallback/SoftMaxLayer.cc
index 7d295cc..fbd4f02 100644
--- a/runtimes/neurun/src/internal/kernel/cpufallback/SoftMaxLayer.cc
+++ b/runtimes/neurun/src/kernel/cpufallback/SoftMaxLayer.cc
@@ -1,7 +1,7 @@
 #include "SoftMaxLayer.h"
 
 #include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h"
-#include "internal/kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpufallback/OperationUtils.h"
 
 namespace internal
 {
diff --git a/runtimes/neurun/src/internal/kernel/cpufallback/SoftMaxLayer.h b/runtimes/neurun/src/kernel/cpufallback/SoftMaxLayer.h
similarity index 94%
rename from runtimes/neurun/src/internal/kernel/cpufallback/SoftMaxLayer.h
rename to runtimes/neurun/src/kernel/cpufallback/SoftMaxLayer.h
index d4a84ac..316937a 100644
--- a/runtimes/neurun/src/internal/kernel/cpufallback/SoftMaxLayer.h
+++ b/runtimes/neurun/src/kernel/cpufallback/SoftMaxLayer.h
@@ -6,7 +6,7 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "internal/kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpufallback/OperationUtils.h"
 
 using namespace internal::kernel::cpu;