Rename `kernel/cpufallback` to `kernel/cpu` (#2282)

Rename the directory to remove inconsistency with namespace name in
the code and backend module(cpu backend is in `backend/cpu`).

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

diff --git a/runtimes/neurun/src/backend/cpu/StageGenerator.cc b/runtimes/neurun/src/backend/cpu/StageGenerator.cc
index 66060e8..d1f08e1 100644 (file)
--- a/runtimes/neurun/src/backend/cpu/StageGenerator.cc
+++ b/runtimes/neurun/src/backend/cpu/StageGenerator.cc
@@ -3,15 +3,15 @@
 #include <stdexcept>
 
 #include "internal/Padding.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 "kernel/cpufallback/TensorConvertFromCommonLayer.h"
-#include "kernel/cpufallback/TensorConvertToCommonLayer.h"
+#include "kernel/cpu/ConvolutionLayer.h"
+#include "kernel/cpu/AvgPoolLayer.h"
+#include "kernel/cpu/MaxPoolLayer.h"
+#include "kernel/cpu/ConcatLayer.h"
+#include "kernel/cpu/FullyConnectedLayer.h"
+#include "kernel/cpu/ReshapeLayer.h"
+#include "kernel/cpu/SoftMaxLayer.h"
+#include "kernel/cpu/TensorConvertFromCommonLayer.h"
+#include "kernel/cpu/TensorConvertToCommonLayer.h"
 
 #include "logging.h"
 

diff --git a/runtimes/neurun/src/kernel/CMakeLists.txt b/runtimes/neurun/src/kernel/CMakeLists.txt
index 3ae2476..a398231 100644 (file)
--- a/runtimes/neurun/src/kernel/CMakeLists.txt
+++ b/runtimes/neurun/src/kernel/CMakeLists.txt
@@ -1,2 +1,2 @@
-add_subdirectory(cpufallback)
+add_subdirectory(cpu)
 add_subdirectory(acl_cl)

diff --git a/runtimes/neurun/src/kernel/acl_cl/ConcatLayer.h b/runtimes/neurun/src/kernel/acl_cl/ConcatLayer.h
index abbea71..5c886d8 100644 (file)
--- a/runtimes/neurun/src/kernel/acl_cl/ConcatLayer.h
+++ b/runtimes/neurun/src/kernel/acl_cl/ConcatLayer.h
@@ -26,7 +26,7 @@
 
 // TODO Remove this unnecessary dependency. This is only for OperandType.
 // If we remove this, we can also remove cpu kernel library dependency
-#include "kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpu/OperationUtils.h"
 
 using namespace neurun::kernel::cpu;
 

diff --git a/runtimes/neurun/src/kernel/cpufallback/AvgPoolLayer.cc b/runtimes/neurun/src/kernel/cpu/AvgPoolLayer.cc
similarity index 98%
rename from runtimes/neurun/src/kernel/cpufallback/AvgPoolLayer.cc
rename to runtimes/neurun/src/kernel/cpu/AvgPoolLayer.cc
index 1955d76..f65411d 100644 (file)
--- a/runtimes/neurun/src/kernel/cpufallback/AvgPoolLayer.cc
+++ b/runtimes/neurun/src/kernel/cpu/AvgPoolLayer.cc
@@ -18,7 +18,7 @@
 #include "AvgPoolLayer.h"
 
 #include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h"
-#include "kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpu/OperationUtils.h"
 
 namespace neurun
 {

diff --git a/runtimes/neurun/src/kernel/cpufallback/AvgPoolLayer.h b/runtimes/neurun/src/kernel/cpu/AvgPoolLayer.h
similarity index 96%
rename from runtimes/neurun/src/kernel/cpufallback/AvgPoolLayer.h
rename to runtimes/neurun/src/kernel/cpu/AvgPoolLayer.h
index d888fad..2bdd430 100644 (file)
--- a/runtimes/neurun/src/kernel/cpufallback/AvgPoolLayer.h
+++ b/runtimes/neurun/src/kernel/cpu/AvgPoolLayer.h
@@ -6,7 +6,7 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpu/OperationUtils.h"
 
 using namespace neurun::kernel::cpu;
 

diff --git a/runtimes/neurun/src/kernel/cpufallback/CMakeLists.txt b/runtimes/neurun/src/kernel/cpu/CMakeLists.txt
similarity index 100%
rename from runtimes/neurun/src/kernel/cpufallback/CMakeLists.txt
rename to runtimes/neurun/src/kernel/cpu/CMakeLists.txt

diff --git a/runtimes/neurun/src/kernel/cpufallback/ConcatLayer.cc b/runtimes/neurun/src/kernel/cpu/ConcatLayer.cc
similarity index 98%
rename from runtimes/neurun/src/kernel/cpufallback/ConcatLayer.cc
rename to runtimes/neurun/src/kernel/cpu/ConcatLayer.cc
index 29e4791..03a1e4e 100644 (file)
--- a/runtimes/neurun/src/kernel/cpufallback/ConcatLayer.cc
+++ b/runtimes/neurun/src/kernel/cpu/ConcatLayer.cc
@@ -18,7 +18,7 @@
 #include "ConcatLayer.h"
 
 #include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h"
-#include "kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpu/OperationUtils.h"
 
 namespace neurun
 {

diff --git a/runtimes/neurun/src/kernel/cpufallback/ConcatLayer.h b/runtimes/neurun/src/kernel/cpu/ConcatLayer.h
similarity index 97%
rename from runtimes/neurun/src/kernel/cpufallback/ConcatLayer.h
rename to runtimes/neurun/src/kernel/cpu/ConcatLayer.h
index 251279a..febae6a 100644 (file)
--- a/runtimes/neurun/src/kernel/cpufallback/ConcatLayer.h
+++ b/runtimes/neurun/src/kernel/cpu/ConcatLayer.h
@@ -23,7 +23,7 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpu/OperationUtils.h"
 
 using namespace neurun::kernel::cpu;
 

diff --git a/runtimes/neurun/src/kernel/cpufallback/ConvolutionLayer.cc b/runtimes/neurun/src/kernel/cpu/ConvolutionLayer.cc
similarity index 99%
rename from runtimes/neurun/src/kernel/cpufallback/ConvolutionLayer.cc
rename to runtimes/neurun/src/kernel/cpu/ConvolutionLayer.cc
index 88cd78e..0150682 100644 (file)
--- a/runtimes/neurun/src/kernel/cpufallback/ConvolutionLayer.cc
+++ b/runtimes/neurun/src/kernel/cpu/ConvolutionLayer.cc
@@ -1,7 +1,7 @@
 #include "ConvolutionLayer.h"
 
 #include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h"
-#include "kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpu/OperationUtils.h"
 
 namespace neurun
 {

diff --git a/runtimes/neurun/src/kernel/cpufallback/ConvolutionLayer.h b/runtimes/neurun/src/kernel/cpu/ConvolutionLayer.h
similarity index 97%
rename from runtimes/neurun/src/kernel/cpufallback/ConvolutionLayer.h
rename to runtimes/neurun/src/kernel/cpu/ConvolutionLayer.h
index db1b3f2..33f3cd7 100644 (file)
--- a/runtimes/neurun/src/kernel/cpufallback/ConvolutionLayer.h
+++ b/runtimes/neurun/src/kernel/cpu/ConvolutionLayer.h
@@ -6,7 +6,7 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpu/OperationUtils.h"
 
 using namespace neurun::kernel::cpu;
 

diff --git a/runtimes/neurun/src/kernel/cpufallback/FullyConnectedLayer.cc b/runtimes/neurun/src/kernel/cpu/FullyConnectedLayer.cc
similarity index 99%
rename from runtimes/neurun/src/kernel/cpufallback/FullyConnectedLayer.cc
rename to runtimes/neurun/src/kernel/cpu/FullyConnectedLayer.cc
index 6d7069c..602f1ce 100644 (file)
--- a/runtimes/neurun/src/kernel/cpufallback/FullyConnectedLayer.cc
+++ b/runtimes/neurun/src/kernel/cpu/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 "kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpu/OperationUtils.h"
 
 #include <mutex>
 

diff --git a/runtimes/neurun/src/kernel/cpufallback/FullyConnectedLayer.h b/runtimes/neurun/src/kernel/cpu/FullyConnectedLayer.h
similarity index 96%
rename from runtimes/neurun/src/kernel/cpufallback/FullyConnectedLayer.h
rename to runtimes/neurun/src/kernel/cpu/FullyConnectedLayer.h
index 0c66ab9..c25c2a1 100644 (file)
--- a/runtimes/neurun/src/kernel/cpufallback/FullyConnectedLayer.h
+++ b/runtimes/neurun/src/kernel/cpu/FullyConnectedLayer.h
@@ -6,7 +6,7 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpu/OperationUtils.h"
 
 using namespace neurun::kernel::cpu;
 

diff --git a/runtimes/neurun/src/kernel/cpufallback/MaxPoolLayer.cc b/runtimes/neurun/src/kernel/cpu/MaxPoolLayer.cc
similarity index 98%
rename from runtimes/neurun/src/kernel/cpufallback/MaxPoolLayer.cc
rename to runtimes/neurun/src/kernel/cpu/MaxPoolLayer.cc
index 92e813c..c914d91 100644 (file)
--- a/runtimes/neurun/src/kernel/cpufallback/MaxPoolLayer.cc
+++ b/runtimes/neurun/src/kernel/cpu/MaxPoolLayer.cc
@@ -1,7 +1,7 @@
 #include "MaxPoolLayer.h"
 
 #include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h"
-#include "kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpu/OperationUtils.h"
 
 namespace neurun
 {

diff --git a/runtimes/neurun/src/kernel/cpufallback/MaxPoolLayer.h b/runtimes/neurun/src/kernel/cpu/MaxPoolLayer.h
similarity index 96%
rename from runtimes/neurun/src/kernel/cpufallback/MaxPoolLayer.h
rename to runtimes/neurun/src/kernel/cpu/MaxPoolLayer.h
index 470870a..b48f068 100644 (file)
--- a/runtimes/neurun/src/kernel/cpufallback/MaxPoolLayer.h
+++ b/runtimes/neurun/src/kernel/cpu/MaxPoolLayer.h
@@ -6,7 +6,7 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpu/OperationUtils.h"
 
 using namespace neurun::kernel::cpu;
 

diff --git a/runtimes/neurun/src/kernel/cpufallback/OperationUtils.cc b/runtimes/neurun/src/kernel/cpu/OperationUtils.cc
similarity index 99%
rename from runtimes/neurun/src/kernel/cpufallback/OperationUtils.cc
rename to runtimes/neurun/src/kernel/cpu/OperationUtils.cc
index ca25bb1..99968ef 100644 (file)
--- a/runtimes/neurun/src/kernel/cpufallback/OperationUtils.cc
+++ b/runtimes/neurun/src/kernel/cpu/OperationUtils.cc
@@ -1,4 +1,4 @@
-#include "kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpu/OperationUtils.h"
 
 #include <cmath>
 #include <algorithm>

diff --git a/runtimes/neurun/src/kernel/cpufallback/OperationUtils.h b/runtimes/neurun/src/kernel/cpu/OperationUtils.h
similarity index 100%
rename from runtimes/neurun/src/kernel/cpufallback/OperationUtils.h
rename to runtimes/neurun/src/kernel/cpu/OperationUtils.h

diff --git a/runtimes/neurun/src/kernel/cpufallback/ReshapeLayer.cc b/runtimes/neurun/src/kernel/cpu/ReshapeLayer.cc
similarity index 97%
rename from runtimes/neurun/src/kernel/cpufallback/ReshapeLayer.cc
rename to runtimes/neurun/src/kernel/cpu/ReshapeLayer.cc
index 2a02a21..a83c254 100644 (file)
--- a/runtimes/neurun/src/kernel/cpufallback/ReshapeLayer.cc
+++ b/runtimes/neurun/src/kernel/cpu/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 "kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpu/OperationUtils.h"
 
 namespace neurun
 {

diff --git a/runtimes/neurun/src/kernel/cpufallback/ReshapeLayer.h b/runtimes/neurun/src/kernel/cpu/ReshapeLayer.h
similarity index 94%
rename from runtimes/neurun/src/kernel/cpufallback/ReshapeLayer.h
rename to runtimes/neurun/src/kernel/cpu/ReshapeLayer.h
index d683b25..5a93a0f 100644 (file)
--- a/runtimes/neurun/src/kernel/cpufallback/ReshapeLayer.h
+++ b/runtimes/neurun/src/kernel/cpu/ReshapeLayer.h
@@ -6,7 +6,7 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpu/OperationUtils.h"
 
 using namespace neurun::kernel::cpu;
 

diff --git a/runtimes/neurun/src/kernel/cpufallback/SoftMaxLayer.cc b/runtimes/neurun/src/kernel/cpu/SoftMaxLayer.cc
similarity index 98%
rename from runtimes/neurun/src/kernel/cpufallback/SoftMaxLayer.cc
rename to runtimes/neurun/src/kernel/cpu/SoftMaxLayer.cc
index f713fb0..a23fed8 100644 (file)
--- a/runtimes/neurun/src/kernel/cpufallback/SoftMaxLayer.cc
+++ b/runtimes/neurun/src/kernel/cpu/SoftMaxLayer.cc
@@ -1,7 +1,7 @@
 #include "SoftMaxLayer.h"
 
 #include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h"
-#include "kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpu/OperationUtils.h"
 
 namespace neurun
 {

diff --git a/runtimes/neurun/src/kernel/cpufallback/SoftMaxLayer.h b/runtimes/neurun/src/kernel/cpu/SoftMaxLayer.h
similarity index 95%
rename from runtimes/neurun/src/kernel/cpufallback/SoftMaxLayer.h
rename to runtimes/neurun/src/kernel/cpu/SoftMaxLayer.h
index 913c1a9..f232576 100644 (file)
--- a/runtimes/neurun/src/kernel/cpufallback/SoftMaxLayer.h
+++ b/runtimes/neurun/src/kernel/cpu/SoftMaxLayer.h
@@ -6,7 +6,7 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "kernel/cpufallback/OperationUtils.h"
+#include "kernel/cpu/OperationUtils.h"
 
 using namespace neurun::kernel::cpu;
 

diff --git a/runtimes/neurun/src/kernel/cpufallback/TensorConvertFromCommonLayer.cc b/runtimes/neurun/src/kernel/cpu/TensorConvertFromCommonLayer.cc
similarity index 100%
rename from runtimes/neurun/src/kernel/cpufallback/TensorConvertFromCommonLayer.cc
rename to runtimes/neurun/src/kernel/cpu/TensorConvertFromCommonLayer.cc

diff --git a/runtimes/neurun/src/kernel/cpufallback/TensorConvertFromCommonLayer.h b/runtimes/neurun/src/kernel/cpu/TensorConvertFromCommonLayer.h
similarity index 100%
rename from runtimes/neurun/src/kernel/cpufallback/TensorConvertFromCommonLayer.h
rename to runtimes/neurun/src/kernel/cpu/TensorConvertFromCommonLayer.h

diff --git a/runtimes/neurun/src/kernel/cpufallback/TensorConvertToCommonLayer.cc b/runtimes/neurun/src/kernel/cpu/TensorConvertToCommonLayer.cc
similarity index 100%
rename from runtimes/neurun/src/kernel/cpufallback/TensorConvertToCommonLayer.cc
rename to runtimes/neurun/src/kernel/cpu/TensorConvertToCommonLayer.cc

diff --git a/runtimes/neurun/src/kernel/cpufallback/TensorConvertToCommonLayer.h b/runtimes/neurun/src/kernel/cpu/TensorConvertToCommonLayer.h
similarity index 100%
rename from runtimes/neurun/src/kernel/cpufallback/TensorConvertToCommonLayer.h
rename to runtimes/neurun/src/kernel/cpu/TensorConvertToCommonLayer.h