[newrt] Rename namespace `kernels` to `kernel` (#1964)

Rename `kernels` to `kernel` since our general convention is to use
singular.

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

diff --git a/runtimes/new_runtime/src/internal/cpu/StageGenerator.cc b/runtimes/new_runtime/src/internal/cpu/StageGenerator.cc
index f18f9ef..7580087 100644 (file)
--- a/runtimes/new_runtime/src/internal/cpu/StageGenerator.cc
+++ b/runtimes/new_runtime/src/internal/cpu/StageGenerator.cc
@@ -3,13 +3,13 @@
 #include <stdexcept>
 
 #include "internal/Padding.h"
-#include "internal/kernels/cpufallback/ConvolutionLayer.h"
-#include "internal/kernels/cpufallback/AvgPoolLayer.h"
-#include "internal/kernels/cpufallback/MaxPoolLayer.h"
-#include "internal/kernels/cpufallback/ConcatLayer.h"
-#include "internal/kernels/cpufallback/FullyConnectedLayer.h"
-#include "internal/kernels/cpufallback/ReshapeLayer.h"
-#include "internal/kernels/cpufallback/SoftMaxLayer.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 "logging.h"
 
@@ -102,8 +102,8 @@ Stage StageGenerator::generate(const ::internal::tflite::op::Conv2D::implicit::N
     auto ker_alloc = tensors->at(::internal::tflite::operand::Index{param.ker_index});
     auto bias_alloc = tensors->at(::internal::tflite::operand::Index{param.bias_index});
 
-    std::unique_ptr<::internal::kernels::cpu::ConvolutionLayer> fn{
-        new ::internal::kernels::cpu::ConvolutionLayer};
+    std::unique_ptr<::internal::kernel::cpu::ConvolutionLayer> fn{
+        new ::internal::kernel::cpu::ConvolutionLayer};
 
     fn->configure(ifm_alloc->buffer(), param.ifm_shape, ker_alloc->buffer(), param.ker_shape,
                   bias_alloc->buffer(), param.bias_shape, param.padding.left, param.padding.right,
@@ -197,8 +197,8 @@ Stage StageGenerator::generate(const ::internal::tflite::op::MaxPool2D::implicit
     auto ofm_alloc = tensors->at(::internal::tflite::operand::Index{param.ofm_index}).get();
     auto ifm_alloc = tensors->at(::internal::tflite::operand::Index{param.ifm_index}).get();
 
-    std::unique_ptr<::internal::kernels::cpu::MaxPoolLayer> fn{
-        new ::internal::kernels::cpu::MaxPoolLayer};
+    std::unique_ptr<::internal::kernel::cpu::MaxPoolLayer> fn{
+        new ::internal::kernel::cpu::MaxPoolLayer};
 
     fn->configure(ifm_alloc->buffer(), param.ifm_shape, param.padding.left, param.padding.right,
                   param.padding.top, param.padding.bottom, param.stride.horizontal,
@@ -296,8 +296,8 @@ Stage StageGenerator::generate(const ::internal::tflite::op::AvgPool2D::implicit
     auto ofm_alloc = tensors->at(::internal::tflite::operand::Index{param.ofm_index}).get();
     auto ifm_alloc = tensors->at(::internal::tflite::operand::Index{param.ifm_index}).get();
 
-    std::unique_ptr<::internal::kernels::cpu::AvgPoolLayer> fn{
-        new ::internal::kernels::cpu::AvgPoolLayer};
+    std::unique_ptr<::internal::kernel::cpu::AvgPoolLayer> fn{
+        new ::internal::kernel::cpu::AvgPoolLayer};
 
     fn->configure(ifm_alloc->buffer(), param.ifm_shape, param.padding.left, param.padding.right,
                   param.padding.top, param.padding.bottom, param.stride.horizontal,
@@ -352,8 +352,8 @@ Stage StageGenerator::generate(const ::internal::tflite::op::Concat::Node &node)
           tensors->at(::internal::tflite::operand::Index{ifm_ind}).get()->buffer());
     }
 
-    std::unique_ptr<::internal::kernels::cpu::ConcatLayer> fn{
-        new ::internal::kernels::cpu::ConcatLayer};
+    std::unique_ptr<::internal::kernel::cpu::ConcatLayer> fn{
+        new ::internal::kernel::cpu::ConcatLayer};
 
     fn->configure(input_buffers, param.ifm_shapes, param.axis, output_alloc->buffer(),
                   param.ofm_shape);
@@ -410,8 +410,8 @@ Stage StageGenerator::generate(const ::internal::tflite::op::FullyConnected::Nod
     auto weight_alloc = tensors->at(::internal::tflite::operand::Index{param.weight_index}).get();
     auto bias_alloc = tensors->at(::internal::tflite::operand::Index{param.bias_index}).get();
 
-    std::unique_ptr<::internal::kernels::cpu::FullyConnectedLayer> fn{
-        new ::internal::kernels::cpu::FullyConnectedLayer};
+    std::unique_ptr<::internal::kernel::cpu::FullyConnectedLayer> fn{
+        new ::internal::kernel::cpu::FullyConnectedLayer};
 
     fn->configure(input_alloc->buffer(), param.ifm_shape, weight_alloc->buffer(),
                   param.weight_shape, bias_alloc->buffer(), param.bias_shape, param.activation,
@@ -449,8 +449,8 @@ Stage StageGenerator::generate(const ::internal::tflite::op::Reshape::Node &node
     auto output_alloc = tensors->at(::internal::tflite::operand::Index{param.output_index}).get();
     auto input_alloc = tensors->at(::internal::tflite::operand::Index{param.input_index}).get();
 
-    std::unique_ptr<::internal::kernels::cpu::ReshapeLayer> fn{
-        new ::internal::kernels::cpu::ReshapeLayer};
+    std::unique_ptr<::internal::kernel::cpu::ReshapeLayer> fn{
+        new ::internal::kernel::cpu::ReshapeLayer};
 
     fn->configure(input_alloc->buffer(), param.ifm_shape, output_alloc->buffer(), param.ofm_shape);
 
@@ -493,8 +493,8 @@ Stage StageGenerator::generate(const ::internal::tflite::op::Softmax::Node &node
     auto output_alloc = tensors->at(::internal::tflite::operand::Index{param.output_index}).get();
     auto input_alloc = tensors->at(::internal::tflite::operand::Index{param.input_index}).get();
 
-    std::unique_ptr<::internal::kernels::cpu::SoftMaxLayer> fn{
-        new ::internal::kernels::cpu::SoftMaxLayer};
+    std::unique_ptr<::internal::kernel::cpu::SoftMaxLayer> fn{
+        new ::internal::kernel::cpu::SoftMaxLayer};
 
     fn->configure(input_alloc->buffer(), param.ifm_shape, param.scale, output_alloc->buffer(),
                   param.ofm_shape);

diff --git a/runtimes/new_runtime/src/internal/kernels/cpufallback/AvgPoolLayer.cc b/runtimes/new_runtime/src/internal/kernel/cpufallback/AvgPoolLayer.cc
similarity index 97%
rename from runtimes/new_runtime/src/internal/kernels/cpufallback/AvgPoolLayer.cc
rename to runtimes/new_runtime/src/internal/kernel/cpufallback/AvgPoolLayer.cc
index 9e9fbbe..e9cc824 100644 (file)
--- a/runtimes/new_runtime/src/internal/kernels/cpufallback/AvgPoolLayer.cc
+++ b/runtimes/new_runtime/src/internal/kernel/cpufallback/AvgPoolLayer.cc
@@ -18,11 +18,11 @@
 #include "AvgPoolLayer.h"
 
 #include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h"
-#include "internal/kernels/cpufallback/OperationUtils.h"
+#include "internal/kernel/cpufallback/OperationUtils.h"
 
 namespace internal
 {
-namespace kernels
+namespace kernel
 {
 namespace cpu
 {
@@ -105,5 +105,5 @@ void AvgPoolLayer::run()
 #undef AVGPOOLING_PARAMETERS
 
 } // namespace cpu
-} // namespace kernels
+} // namespace kernel
 } // namespace internal

diff --git a/runtimes/new_runtime/src/internal/kernels/cpufallback/AvgPoolLayer.h b/runtimes/new_runtime/src/internal/kernel/cpufallback/AvgPoolLayer.h
similarity index 90%
rename from runtimes/new_runtime/src/internal/kernels/cpufallback/AvgPoolLayer.h
rename to runtimes/new_runtime/src/internal/kernel/cpufallback/AvgPoolLayer.h
index 9b2f4d3..bec001c 100644 (file)
--- a/runtimes/new_runtime/src/internal/kernels/cpufallback/AvgPoolLayer.h
+++ b/runtimes/new_runtime/src/internal/kernel/cpufallback/AvgPoolLayer.h
@@ -6,13 +6,13 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "internal/kernels/cpufallback/OperationUtils.h"
+#include "internal/kernel/cpufallback/OperationUtils.h"
 
-using namespace internal::kernels::cpu;
+using namespace internal::kernel::cpu;
 
 namespace internal
 {
-namespace kernels
+namespace kernel
 {
 namespace cpu
 {
@@ -59,7 +59,7 @@ private:
 };
 
 } // namespace cpu
-} // namespace kernels
+} // namespace kernel
 } // namespace internal
 
 #endif // __INTERNAL_KERNELS_CPU_AVGPOOLLAYER_H__

diff --git a/runtimes/new_runtime/src/internal/kernels/cpufallback/ConcatLayer.cc b/runtimes/new_runtime/src/internal/kernel/cpufallback/ConcatLayer.cc
similarity index 96%
rename from runtimes/new_runtime/src/internal/kernels/cpufallback/ConcatLayer.cc
rename to runtimes/new_runtime/src/internal/kernel/cpufallback/ConcatLayer.cc
index 651fc4b..0805c0c 100644 (file)
--- a/runtimes/new_runtime/src/internal/kernels/cpufallback/ConcatLayer.cc
+++ b/runtimes/new_runtime/src/internal/kernel/cpufallback/ConcatLayer.cc
@@ -18,11 +18,11 @@
 #include "ConcatLayer.h"
 
 #include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h"
-#include "internal/kernels/cpufallback/OperationUtils.h"
+#include "internal/kernel/cpufallback/OperationUtils.h"
 
 namespace internal
 {
-namespace kernels
+namespace kernel
 {
 namespace cpu
 {
@@ -98,5 +98,5 @@ void ConcatLayer::run()
 }
 
 } // namespace cpu
-} // namespace kernels
+} // namespace kernel
 } // namespace internal

diff --git a/runtimes/new_runtime/src/internal/kernels/cpufallback/ConcatLayer.h b/runtimes/new_runtime/src/internal/kernel/cpufallback/ConcatLayer.h
similarity index 92%
rename from runtimes/new_runtime/src/internal/kernels/cpufallback/ConcatLayer.h
rename to runtimes/new_runtime/src/internal/kernel/cpufallback/ConcatLayer.h
index 569d4d8..53f701f 100644 (file)
--- a/runtimes/new_runtime/src/internal/kernels/cpufallback/ConcatLayer.h
+++ b/runtimes/new_runtime/src/internal/kernel/cpufallback/ConcatLayer.h
@@ -23,13 +23,13 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "internal/kernels/cpufallback/OperationUtils.h"
+#include "internal/kernel/cpufallback/OperationUtils.h"
 
-using namespace internal::kernels::cpu;
+using namespace internal::kernel::cpu;
 
 namespace internal
 {
-namespace kernels
+namespace kernel
 {
 namespace cpu
 {
@@ -63,7 +63,7 @@ private:
 };
 
 } // namespace cpu
-} // namespace kernels
+} // namespace kernel
 } // namespace internal
 
 #endif // __INTERNAL_KERNELS_CPU_CONCATLAYER_H__

diff --git a/runtimes/new_runtime/src/internal/kernels/cpufallback/ConvolutionLayer.cc b/runtimes/new_runtime/src/internal/kernel/cpufallback/ConvolutionLayer.cc
similarity index 98%
rename from runtimes/new_runtime/src/internal/kernels/cpufallback/ConvolutionLayer.cc
rename to runtimes/new_runtime/src/internal/kernel/cpufallback/ConvolutionLayer.cc
index b96b906..beac3d0 100644 (file)
--- a/runtimes/new_runtime/src/internal/kernels/cpufallback/ConvolutionLayer.cc
+++ b/runtimes/new_runtime/src/internal/kernel/cpufallback/ConvolutionLayer.cc
@@ -1,11 +1,11 @@
 #include "ConvolutionLayer.h"
 
 #include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h"
-#include "internal/kernels/cpufallback/OperationUtils.h"
+#include "internal/kernel/cpufallback/OperationUtils.h"
 
 namespace internal
 {
-namespace kernels
+namespace kernel
 {
 namespace cpu
 {
@@ -174,5 +174,5 @@ void ConvolutionLayer::run()
 #undef ANDROID_NN_CONV_PARAMETERS
 
 } // namespace cpu
-} // namespace kernels
+} // namespace kernel
 } // namespace internal

diff --git a/runtimes/new_runtime/src/internal/kernels/cpufallback/ConvolutionLayer.h b/runtimes/new_runtime/src/internal/kernel/cpufallback/ConvolutionLayer.h
similarity index 91%
rename from runtimes/new_runtime/src/internal/kernels/cpufallback/ConvolutionLayer.h
rename to runtimes/new_runtime/src/internal/kernel/cpufallback/ConvolutionLayer.h
index 365e55d..863510c 100644 (file)
--- a/runtimes/new_runtime/src/internal/kernels/cpufallback/ConvolutionLayer.h
+++ b/runtimes/new_runtime/src/internal/kernel/cpufallback/ConvolutionLayer.h
@@ -6,13 +6,13 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "internal/kernels/cpufallback/OperationUtils.h"
+#include "internal/kernel/cpufallback/OperationUtils.h"
 
-using namespace internal::kernels::cpu;
+using namespace internal::kernel::cpu;
 
 namespace internal
 {
-namespace kernels
+namespace kernel
 {
 namespace cpu
 {
@@ -60,7 +60,7 @@ private:
 };
 
 } // namespace cpu
-} // namespace kernels
+} // namespace kernel
 } // namespace internal
 
 #endif // __INTERNAL_KERNELS_CPU_CONVOLUTIONLAYER_H__

diff --git a/runtimes/new_runtime/src/internal/kernels/cpufallback/FullyConnectedLayer.cc b/runtimes/new_runtime/src/internal/kernel/cpufallback/FullyConnectedLayer.cc
similarity index 98%
rename from runtimes/new_runtime/src/internal/kernels/cpufallback/FullyConnectedLayer.cc
rename to runtimes/new_runtime/src/internal/kernel/cpufallback/FullyConnectedLayer.cc
index 98cf250..cb511e0 100644 (file)
--- a/runtimes/new_runtime/src/internal/kernels/cpufallback/FullyConnectedLayer.cc
+++ b/runtimes/new_runtime/src/internal/kernel/cpufallback/FullyConnectedLayer.cc
@@ -19,13 +19,13 @@
 
 #include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h"
 #include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h"
-#include "internal/kernels/cpufallback/OperationUtils.h"
+#include "internal/kernel/cpufallback/OperationUtils.h"
 
 #include <mutex>
 
 namespace internal
 {
-namespace kernels
+namespace kernel
 {
 namespace cpu
 {
@@ -127,5 +127,5 @@ void FullyConnectedLayer::run()
 }
 
 } // namespace cpu
-} // namespace kernels
+} // namespace kernel
 } // namespace internal

diff --git a/runtimes/new_runtime/src/internal/kernels/cpufallback/FullyConnectedLayer.h b/runtimes/new_runtime/src/internal/kernel/cpufallback/FullyConnectedLayer.h
similarity index 89%
rename from runtimes/new_runtime/src/internal/kernels/cpufallback/FullyConnectedLayer.h
rename to runtimes/new_runtime/src/internal/kernel/cpufallback/FullyConnectedLayer.h
index 50b40af..0bff45d 100644 (file)
--- a/runtimes/new_runtime/src/internal/kernels/cpufallback/FullyConnectedLayer.h
+++ b/runtimes/new_runtime/src/internal/kernel/cpufallback/FullyConnectedLayer.h
@@ -6,13 +6,13 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "internal/kernels/cpufallback/OperationUtils.h"
+#include "internal/kernel/cpufallback/OperationUtils.h"
 
-using namespace internal::kernels::cpu;
+using namespace internal::kernel::cpu;
 
 namespace internal
 {
-namespace kernels
+namespace kernel
 {
 namespace cpu
 {
@@ -52,7 +52,7 @@ private:
 };
 
 } // namespace cpu
-} // namespace kernels
+} // namespace kernel
 } // namespace internal
 
 #endif // __INTERNAL_KERNELS_CPU_FULLYCONNECTEDLAYER_H__

diff --git a/runtimes/new_runtime/src/internal/kernels/cpufallback/MaxPoolLayer.cc b/runtimes/new_runtime/src/internal/kernel/cpufallback/MaxPoolLayer.cc
similarity index 97%
rename from runtimes/new_runtime/src/internal/kernels/cpufallback/MaxPoolLayer.cc
rename to runtimes/new_runtime/src/internal/kernel/cpufallback/MaxPoolLayer.cc
index 71c24aa..bd12976 100644 (file)
--- a/runtimes/new_runtime/src/internal/kernels/cpufallback/MaxPoolLayer.cc
+++ b/runtimes/new_runtime/src/internal/kernel/cpufallback/MaxPoolLayer.cc
@@ -1,11 +1,11 @@
 #include "MaxPoolLayer.h"
 
 #include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h"
-#include "internal/kernels/cpufallback/OperationUtils.h"
+#include "internal/kernel/cpufallback/OperationUtils.h"
 
 namespace internal
 {
-namespace kernels
+namespace kernel
 {
 namespace cpu
 {
@@ -88,5 +88,5 @@ void MaxPoolLayer::run()
 #undef MAXPOOLING_PARAMETERS
 
 } // namespace cpu
-} // namespace kernels
+} // namespace kernel
 } // namespace internal

diff --git a/runtimes/new_runtime/src/internal/kernels/cpufallback/MaxPoolLayer.h b/runtimes/new_runtime/src/internal/kernel/cpufallback/MaxPoolLayer.h
similarity index 90%
rename from runtimes/new_runtime/src/internal/kernels/cpufallback/MaxPoolLayer.h
rename to runtimes/new_runtime/src/internal/kernel/cpufallback/MaxPoolLayer.h
index f812b31..c5a83e9 100644 (file)
--- a/runtimes/new_runtime/src/internal/kernels/cpufallback/MaxPoolLayer.h
+++ b/runtimes/new_runtime/src/internal/kernel/cpufallback/MaxPoolLayer.h
@@ -6,13 +6,13 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "internal/kernels/cpufallback/OperationUtils.h"
+#include "internal/kernel/cpufallback/OperationUtils.h"
 
-using namespace internal::kernels::cpu;
+using namespace internal::kernel::cpu;
 
 namespace internal
 {
-namespace kernels
+namespace kernel
 {
 namespace cpu
 {
@@ -59,7 +59,7 @@ private:
 };
 
 } // namespace cpu
-} // namespace kernels
+} // namespace kernel
 } // namespace internal
 
 #endif // __INTERNAL_KERNELS_CPU_MAXPOOLLAYER_H__

diff --git a/runtimes/new_runtime/src/internal/kernels/cpufallback/OperationUtils.cc b/runtimes/new_runtime/src/internal/kernel/cpufallback/OperationUtils.cc
similarity index 98%
rename from runtimes/new_runtime/src/internal/kernels/cpufallback/OperationUtils.cc
rename to runtimes/new_runtime/src/internal/kernel/cpufallback/OperationUtils.cc
index ccb0bc2..d5f7dcb 100644 (file)
--- a/runtimes/new_runtime/src/internal/kernels/cpufallback/OperationUtils.cc
+++ b/runtimes/new_runtime/src/internal/kernel/cpufallback/OperationUtils.cc
@@ -1,4 +1,4 @@
-#include "internal/kernels/cpufallback/OperationUtils.h"
+#include "internal/kernel/cpufallback/OperationUtils.h"
 
 #include <cmath>
 #include <algorithm>
@@ -6,7 +6,7 @@
 
 namespace internal
 {
-namespace kernels
+namespace kernel
 {
 namespace cpu
 {
@@ -210,5 +210,5 @@ size_t sizeOfData(OperandType type, const std::vector<uint32_t> &dimensions)
 }
 
 } // namespace cpu
-} // namespace kernels
+} // namespace kernel
 } // namespace internal

diff --git a/runtimes/new_runtime/src/internal/kernels/cpufallback/OperationUtils.h b/runtimes/new_runtime/src/internal/kernel/cpufallback/OperationUtils.h
similarity index 98%
rename from runtimes/new_runtime/src/internal/kernels/cpufallback/OperationUtils.h
rename to runtimes/new_runtime/src/internal/kernel/cpufallback/OperationUtils.h
index 3be938d..f5880b3 100644 (file)
--- a/runtimes/new_runtime/src/internal/kernels/cpufallback/OperationUtils.h
+++ b/runtimes/new_runtime/src/internal/kernel/cpufallback/OperationUtils.h
@@ -12,7 +12,7 @@
 
 namespace internal
 {
-namespace kernels
+namespace kernel
 {
 namespace cpu
 {
@@ -90,7 +90,7 @@ Shape convertShape(const ::internal::tflite::operand::Shape &o);
 uint32_t sizeOfData(OperandType type, const std::vector<uint32_t> &dimensions);
 
 } // namespace cpu
-} // namespace kernels
+} // namespace kernel
 } // namespace internal
 
 #endif // __NNFW_SUPPORT_NNAPI_OPERATION_UTILS_H__

diff --git a/runtimes/new_runtime/src/internal/kernels/cpufallback/ReshapeLayer.cc b/runtimes/new_runtime/src/internal/kernel/cpufallback/ReshapeLayer.cc
similarity index 94%
rename from runtimes/new_runtime/src/internal/kernels/cpufallback/ReshapeLayer.cc
rename to runtimes/new_runtime/src/internal/kernel/cpufallback/ReshapeLayer.cc
index 1027316..e6aa5c7 100644 (file)
--- a/runtimes/new_runtime/src/internal/kernels/cpufallback/ReshapeLayer.cc
+++ b/runtimes/new_runtime/src/internal/kernel/cpufallback/ReshapeLayer.cc
@@ -19,11 +19,11 @@
 
 #include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h"
 #include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h"
-#include "internal/kernels/cpufallback/OperationUtils.h"
+#include "internal/kernel/cpufallback/OperationUtils.h"
 
 namespace internal
 {
-namespace kernels
+namespace kernel
 {
 namespace cpu
 {
@@ -48,5 +48,5 @@ void ReshapeLayer::configure(uint8_t *inputData, const internal::tflite::operand
 void ReshapeLayer::run() { reshapeGeneric(); }
 
 } // namespace cpu
-} // namespace kernels
+} // namespace kernel
 } // namespace internal

diff --git a/runtimes/new_runtime/src/internal/kernels/cpufallback/ReshapeLayer.h b/runtimes/new_runtime/src/internal/kernel/cpufallback/ReshapeLayer.h
similarity index 84%
rename from runtimes/new_runtime/src/internal/kernels/cpufallback/ReshapeLayer.h
rename to runtimes/new_runtime/src/internal/kernel/cpufallback/ReshapeLayer.h
index 65e24ce..ace9e0c 100644 (file)
--- a/runtimes/new_runtime/src/internal/kernels/cpufallback/ReshapeLayer.h
+++ b/runtimes/new_runtime/src/internal/kernel/cpufallback/ReshapeLayer.h
@@ -6,13 +6,13 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "internal/kernels/cpufallback/OperationUtils.h"
+#include "internal/kernel/cpufallback/OperationUtils.h"
 
-using namespace internal::kernels::cpu;
+using namespace internal::kernel::cpu;
 
 namespace internal
 {
-namespace kernels
+namespace kernel
 {
 namespace cpu
 {
@@ -39,7 +39,7 @@ private:
 };
 
 } // namespace cpu
-} // namespace kernels
+} // namespace kernel
 } // namespace internal
 
 #endif // __INTERNAL_KERNELS_CPU_RESHAPELAYER_H__

diff --git a/runtimes/new_runtime/src/internal/kernels/cpufallback/SoftMaxLayer.cc b/runtimes/new_runtime/src/internal/kernel/cpufallback/SoftMaxLayer.cc
similarity index 96%
rename from runtimes/new_runtime/src/internal/kernels/cpufallback/SoftMaxLayer.cc
rename to runtimes/new_runtime/src/internal/kernel/cpufallback/SoftMaxLayer.cc
index bd21fb7..7d295cc 100644 (file)
--- a/runtimes/new_runtime/src/internal/kernels/cpufallback/SoftMaxLayer.cc
+++ b/runtimes/new_runtime/src/internal/kernel/cpufallback/SoftMaxLayer.cc
@@ -1,11 +1,11 @@
 #include "SoftMaxLayer.h"
 
 #include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h"
-#include "internal/kernels/cpufallback/OperationUtils.h"
+#include "internal/kernel/cpufallback/OperationUtils.h"
 
 namespace internal
 {
-namespace kernels
+namespace kernel
 {
 namespace cpu
 {
@@ -102,5 +102,5 @@ void SoftMaxLayer::run()
 }
 
 } // namespace cpu
-} // namespace kernels
+} // namespace kernel
 } // namespace internal

diff --git a/runtimes/new_runtime/src/internal/kernels/cpufallback/SoftMaxLayer.h b/runtimes/new_runtime/src/internal/kernel/cpufallback/SoftMaxLayer.h
similarity index 86%
rename from runtimes/new_runtime/src/internal/kernels/cpufallback/SoftMaxLayer.h
rename to runtimes/new_runtime/src/internal/kernel/cpufallback/SoftMaxLayer.h
index 042a619..d4a84ac 100644 (file)
--- a/runtimes/new_runtime/src/internal/kernels/cpufallback/SoftMaxLayer.h
+++ b/runtimes/new_runtime/src/internal/kernel/cpufallback/SoftMaxLayer.h
@@ -6,13 +6,13 @@
 #include <arm_compute/runtime/IFunction.h>
 
 #include "internal/Model.h"
-#include "internal/kernels/cpufallback/OperationUtils.h"
+#include "internal/kernel/cpufallback/OperationUtils.h"
 
-using namespace internal::kernels::cpu;
+using namespace internal::kernel::cpu;
 
 namespace internal
 {
-namespace kernels
+namespace kernel
 {
 namespace cpu
 {
@@ -46,7 +46,7 @@ private:
 };
 
 } // namespace cpu
-} // namespace kernels
+} // namespace kernel
 } // namespace internal
 
 #endif // __INTERNAL_KERNELS_CPU_SOFTMAXLAYER_H__