[neurun] Move namespace of nnapi::feature classes (#2875)

Move namespace `internal::nnapi::feature` to
`neurun::util::feature::nhwc`. This will introduce the namespace
`neurun::util`.

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

diff --git a/runtimes/neurun/CMakeLists.txt b/runtimes/neurun/CMakeLists.txt
index 2cbd702..7cb9112 100644 (file)
--- a/runtimes/neurun/CMakeLists.txt
+++ b/runtimes/neurun/CMakeLists.txt
@@ -20,6 +20,7 @@ file(GLOB_RECURSE SOURCES_GRAPH "src/graph/*.cc")
 file(GLOB_RECURSE SOURCES_LINEAR "src/linear/*.cc")
 file(GLOB_RECURSE SOURCES_CODEGEN "src/codegen/*.cc")
 file(GLOB_RECURSE SOURCES_VERIFIER "src/verifier/*.cc")
+file(GLOB_RECURSE SOURCES_VERIFIER "src/util/*.cc")
 
 set(SOURCES ${SOURCES} ${SOURCES_FRONTEND} ${SOURCES_BACKEND} ${SOURCES_INTERNAL} ${SOURCES_GRAPH} ${SOURCES_LINEAR} ${SOURCES_CODEGEN} ${SOURCES_VERIFIER})
 

diff --git a/runtimes/neurun/src/exec/Sink.h b/runtimes/neurun/src/exec/Sink.h
index eaeea66..9df83e1 100644 (file)
--- a/runtimes/neurun/src/exec/Sink.h
+++ b/runtimes/neurun/src/exec/Sink.h
@@ -27,8 +27,8 @@
 #include <util/tensor/Shape.h>
 
 #include "backend/cpu/operand/Tensor.h" // TODO Remove this dependency to backend
-#include "internal/nnapi/feature/View.h"
-#include "internal/nnapi/feature/Reader.h"
+#include "util/feature/nhwc/View.h"
+#include "util/feature/nhwc/Reader.h"
 
 namespace neurun
 {
@@ -194,7 +194,7 @@ public:
     else if (typeid(tensor) == typeid(::arm_compute::CLTensor))
     {
       const ::internal::arm_compute::feature::View<T> from{&tensor};
-      ::internal::nnapi::feature::View<T> into{_shape, _base, _size};
+      util::feature::nhwc::View<T> into{_shape, _base, _size};
 
       ::nnfw::util::feature::iterate(_shape)
           << [&](uint32_t bat, uint32_t ch, uint32_t row, uint32_t col) {

diff --git a/runtimes/neurun/src/exec/Source.h b/runtimes/neurun/src/exec/Source.h
index b9cffe6..a8d85d2 100644 (file)
--- a/runtimes/neurun/src/exec/Source.h
+++ b/runtimes/neurun/src/exec/Source.h
@@ -27,8 +27,8 @@
 #include <util/tensor/Shape.h>
 
 #include "backend/cpu/operand/Tensor.h" // TODO Remove this dependency to backend
-#include "internal/nnapi/feature/Reader.h"
-#include "internal/nnapi/feature/View.h"
+#include "util/feature/nhwc/Reader.h"
+#include "util/feature/nhwc/View.h"
 
 #include "backend/acl_cl/feature/View.h"
 
@@ -191,7 +191,7 @@ public:
     }
     else if (typeid(tensor) == typeid(::arm_compute::CLTensor))
     {
-      const ::internal::nnapi::feature::Reader<T> from{_shape, _base, _size};
+      const util::feature::nhwc::Reader<T> from{_shape, _base, _size};
       ::internal::arm_compute::feature::View<T> into{&tensor};
 
       ::nnfw::util::feature::iterate(_shape)

diff --git a/runtimes/neurun/src/kernel/cpu/PermuteLayer.cc b/runtimes/neurun/src/kernel/cpu/PermuteLayer.cc
index 5136735..f22432b 100644 (file)
--- a/runtimes/neurun/src/kernel/cpu/PermuteLayer.cc
+++ b/runtimes/neurun/src/kernel/cpu/PermuteLayer.cc
@@ -16,8 +16,8 @@
 
 #include "PermuteLayer.h"
 
-#include "internal/nnapi/feature/Reader.h"
-#include "internal/nnapi/feature/View.h"
+#include "util/feature/nhwc/Reader.h"
+#include "util/feature/nhwc/View.h"
 #include "backend/acl_cl/feature/View.h"
 
 #include <util/feature/IndexIterator.h>
@@ -57,7 +57,7 @@ void PermuteLayer::run()
   {
     case Type::NHWC_TO_NCHW:
     {
-      const ::internal::nnapi::feature::Reader<float> from{
+      const util::feature::nhwc::Reader<float> from{
           feature, reinterpret_cast<const float *>(input_buffer), input_size};
       ::internal::arm_compute::feature::View<float> into{_output};
 
@@ -84,8 +84,8 @@ void PermuteLayer::run()
       _input_cl->map(queue);
 
       const ::internal::arm_compute::feature::View<float> from{_input};
-      ::internal::nnapi::feature::View<float> into{
-          feature, reinterpret_cast<float *>(output_buffer), output_size};
+      util::feature::nhwc::View<float> into{feature, reinterpret_cast<float *>(output_buffer),
+                                            output_size};
 
       ::nnfw::util::feature::iterate(feature)
           << [&](uint32_t batch, uint32_t ch, uint32_t row, uint32_t col) {

diff --git a/runtimes/neurun/src/kernel/cpu/PermuteLayer.h b/runtimes/neurun/src/kernel/cpu/PermuteLayer.h
index 5960871..9a28442 100644 (file)
--- a/runtimes/neurun/src/kernel/cpu/PermuteLayer.h
+++ b/runtimes/neurun/src/kernel/cpu/PermuteLayer.h
@@ -22,7 +22,7 @@
 #include <arm_compute/runtime/IFunction.h>
 #include <arm_compute/core/ITensor.h>
 
-#include "internal/nnapi/feature/View.h"
+#include "util/feature/nhwc/View.h"
 #include "OperationUtils.h"
 
 namespace neurun

diff --git a/runtimes/neurun/src/internal/nnapi/feature/Reader.h b/runtimes/neurun/src/util/feature/nhwc/Reader.h
similarity index 85%
rename from runtimes/neurun/src/internal/nnapi/feature/Reader.h
rename to runtimes/neurun/src/util/feature/nhwc/Reader.h
index 3aac361..18ccdd9 100644 (file)
--- a/runtimes/neurun/src/internal/nnapi/feature/Reader.h
+++ b/runtimes/neurun/src/util/feature/nhwc/Reader.h
@@ -14,19 +14,21 @@
  * limitations under the License.
  */
 
-#ifndef __INTERNAL_NNAPI_FEATURE_READER_H__
-#define __INTERNAL_NNAPI_FEATURE_READER_H__
+#ifndef __NEURUN_UTIL_FEATURE_NHWC_READER_H__
+#define __NEURUN_UTIL_FEATURE_NHWC_READER_H__
 
-#include "internal/nnapi/feature/Utils.h"
+#include "Utils.h"
 
 #include "util/feature/Reader.h"
 
-namespace internal
+namespace neurun
 {
-namespace nnapi
+namespace util
 {
 namespace feature
 {
+namespace nhwc
+{
 
 template <typename T> class Reader final : public nnfw::util::feature::Reader<T>
 {
@@ -62,8 +64,9 @@ private:
   const T *_ptr;
 };
 
+} // namespace nhwc
 } // namespace feature
-} // namespace nnapi
-} // namespace internal
+} // namespace util
+} // namespace neurun
 
-#endif // __INTERNAL_NNAPI_FEATURE_READER_H__
+#endif // __NEURUN_UTIL_FEATURE_NHWC_READER_H__

diff --git a/runtimes/neurun/src/internal/nnapi/feature/Utils.h b/runtimes/neurun/src/util/feature/nhwc/Utils.h
similarity index 84%
rename from runtimes/neurun/src/internal/nnapi/feature/Utils.h
rename to runtimes/neurun/src/util/feature/nhwc/Utils.h
index e6e1e71..6437a20 100644 (file)
--- a/runtimes/neurun/src/internal/nnapi/feature/Utils.h
+++ b/runtimes/neurun/src/util/feature/nhwc/Utils.h
@@ -14,17 +14,19 @@
  * limitations under the License.
  */
 
-#ifndef __INTERNAL_NNAPI_FEATURE_UTILS_H__
-#define __INTERNAL_NNAPI_FEATURE_UTILS_H__
+#ifndef __NEURUN_UTIL_FEATURE_NHWC_UTILS_H__
+#define __NEURUN_UTIL_FEATURE_NHWC_UTILS_H__
 
 #include "util/feature/Shape.h"
 
-namespace internal
+namespace neurun
 {
-namespace nnapi
+namespace util
 {
 namespace feature
 {
+namespace nhwc
+{
 
 inline uint32_t index_of(const ::nnfw::util::feature::Shape &shape, uint32_t ch, uint32_t row,
                          uint32_t col)
@@ -53,8 +55,9 @@ inline uint32_t index_of(const ::nnfw::util::feature::Shape &shape, uint32_t bat
   return res;
 }
 
+} // namespace nhwc
 } // namespace feature
-} // namespace nnapi
-} // namespace internal
+} // namespace util
+} // namespace neurun
 
-#endif // __INTERNAL_NNAPI_FEATURE_UTILS_H__
+#endif // __NEURUN_UTIL_FEATURE_NHWC_UTILS_H__

diff --git a/runtimes/neurun/src/internal/nnapi/feature/View.h b/runtimes/neurun/src/util/feature/nhwc/View.h
similarity index 87%
rename from runtimes/neurun/src/internal/nnapi/feature/View.h
rename to runtimes/neurun/src/util/feature/nhwc/View.h
index 2c55b2e..94d44da 100644 (file)
--- a/runtimes/neurun/src/internal/nnapi/feature/View.h
+++ b/runtimes/neurun/src/util/feature/nhwc/View.h
@@ -14,21 +14,23 @@
  * limitations under the License.
  */
 
-#ifndef __INTERNAL_NNAPI_FEATURE_VIEW_H__
-#define __INTERNAL_NNAPI_FEATURE_VIEW_H__
+#ifndef __NEURUN_UTIL_FEATURE_NHWC_VIEW_H__
+#define __NEURUN_UTIL_FEATURE_NHWC_VIEW_H__
 
 #include <cassert>
 
-#include "internal/nnapi/feature/Utils.h"
+#include "Utils.h"
 
 #include "util/feature/Reader.h"
 
-namespace internal
+namespace neurun
 {
-namespace nnapi
+namespace util
 {
 namespace feature
 {
+namespace nhwc
+{
 
 template <typename T> class View final : public nnfw::util::feature::Reader<T>
 {
@@ -78,8 +80,9 @@ private:
   T *_ptr;
 };
 
+} // namespace nhwc
 } // namespace feature
-} // namespace nnapi
-} // namespace internal
+} // namespace util
+} // namespace neurun
 
-#endif // __INTERNAL_NNAPI_FEATURE_VIEW_H__
+#endif // __NEURUN_UTIL_FEATURE_NHWC_VIEW_H__