Update namespace of nnapi library (#3965)

Update namespace of nnapi library: nnfw::support::nnapi to nnfw::nnapi
Update header ifdef

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/libs/nnapi/include/nnapi/Utils.h b/libs/nnapi/include/nnapi/Utils.h
index 78a0e75..f9738fe 100644 (file)
--- a/libs/nnapi/include/nnapi/Utils.h
+++ b/libs/nnapi/include/nnapi/Utils.h
@@ -20,15 +20,13 @@
  * @ingroup  COM_AI_RUNTIME
  */
 
-#ifndef __NNFW_SUPPORT_NNAPI_UTILS_H__
-#define __NNFW_SUPPORT_NNAPI_UTILS_H__
+#ifndef __NNFW_NNAPI_UTILS_H__
+#define __NNFW_NNAPI_UTILS_H__
 
 #include "NeuralNetworks.h"
 
 namespace nnfw
 {
-namespace support
-{
 namespace nnapi
 {
 
@@ -40,7 +38,6 @@ namespace nnapi
 const char *to_string(const PaddingCode &code);
 
 } // namespace nnapi
-} // namespace support
 } // namespace nnfw
 
-#endif // __NNFW_SUPPORT_NNAPI_UTILS_H__
+#endif // __NNFW_NNAPI_UTILS_H__

diff --git a/libs/nnapi/include/nnapi/feature/Reader.h b/libs/nnapi/include/nnapi/feature/Reader.h
index 38eb227..6f4b2ac 100644 (file)
--- a/libs/nnapi/include/nnapi/feature/Reader.h
+++ b/libs/nnapi/include/nnapi/feature/Reader.h
@@ -20,8 +20,8 @@
  * @ingroup  COM_AI_RUNTIME
  */
 
-#ifndef __NNFW_SUPPORT_NNAPI_FEATURE_READER_H__
-#define __NNFW_SUPPORT_NNAPI_FEATURE_READER_H__
+#ifndef __NNFW_NNAPI_FEATURE_READER_H__
+#define __NNFW_NNAPI_FEATURE_READER_H__
 
 #include "nnapi/feature/Utils.h"
 
@@ -30,8 +30,6 @@
 
 namespace nnfw
 {
-namespace support
-{
 namespace nnapi
 {
 namespace feature
@@ -74,7 +72,6 @@ private:
 
 } // namespace feature
 } // namespace nnapi
-} // namespace support
 } // namespace nnfw
 
-#endif // __NNFW_SUPPORT_NNAPI_FEATURE_READER_H__
+#endif // __NNFW_NNAPI_FEATURE_READER_H__

diff --git a/libs/nnapi/include/nnapi/feature/Utils.h b/libs/nnapi/include/nnapi/feature/Utils.h
index eac5083..cc438a4 100644 (file)
--- a/libs/nnapi/include/nnapi/feature/Utils.h
+++ b/libs/nnapi/include/nnapi/feature/Utils.h
@@ -20,8 +20,8 @@
  * @ingroup  COM_AI_RUNTIME
  */
 
-#ifndef __NNFW_SUPPORT_NNAPI_FEATURE_UTILS_H__
-#define __NNFW_SUPPORT_NNAPI_FEATURE_UTILS_H__
+#ifndef __NNFW_NNAPI_FEATURE_UTILS_H__
+#define __NNFW_NNAPI_FEATURE_UTILS_H__
 
 #include "util/feature/Shape.h"
 
@@ -29,8 +29,6 @@
 
 namespace nnfw
 {
-namespace support
-{
 namespace nnapi
 {
 namespace feature
@@ -48,7 +46,6 @@ uint32_t indexOf(const nnfw::util::feature::Shape &shape, uint32_t ch, uint32_t
 
 } // namespace feature
 } // namespace nnapi
-} // namespace support
 } // namespace nnfw
 
-#endif // __NNFW_SUPPORT_NNAPI_FEATURE_UTILS_H__
+#endif // __NNFW_NNAPI_FEATURE_UTILS_H__

diff --git a/libs/nnapi/src/Utils.cpp b/libs/nnapi/src/Utils.cpp
index 7825ddc..7be8572 100644 (file)
--- a/libs/nnapi/src/Utils.cpp
+++ b/libs/nnapi/src/Utils.cpp
@@ -4,8 +4,6 @@
 
 namespace nnfw
 {
-namespace support
-{
 namespace nnapi
 {
 
@@ -25,5 +23,4 @@ const char *to_string(const PaddingCode &code)
 }
 
 } // namespace nnapi
-} // namespace support
 } // namespace nnfw

diff --git a/libs/nnapi/src/feature/Utils.cpp b/libs/nnapi/src/feature/Utils.cpp
index 61445bf..3c236ac 100644 (file)
--- a/libs/nnapi/src/feature/Utils.cpp
+++ b/libs/nnapi/src/feature/Utils.cpp
@@ -18,8 +18,6 @@
 
 namespace nnfw
 {
-namespace support
-{
 namespace nnapi
 {
 namespace feature
@@ -39,5 +37,4 @@ uint32_t indexOf(const nnfw::util::feature::Shape &shape, uint32_t ch, uint32_t
 
 } // namespace feature
 } // namespace nnapi
-} // namespace support
 } // namespace nnfw

diff --git a/runtimes/neurun/src/backend/acl_cl/StageGenerator.cc b/runtimes/neurun/src/backend/acl_cl/StageGenerator.cc
index 28a0d8d..4740fcc 100644 (file)
--- a/runtimes/neurun/src/backend/acl_cl/StageGenerator.cc
+++ b/runtimes/neurun/src/backend/acl_cl/StageGenerator.cc
@@ -367,7 +367,7 @@ void StageGenerator::visit(const graph::operation::AvgPool2DNode &node)
   VERBOSE(AvgPool2D) << "KER_W: " << kw << std::endl;
   VERBOSE(AvgPool2D) << "STRIDE_H: " << vstride << std::endl;
   VERBOSE(AvgPool2D) << "STRIDE_W: " << hstride << std::endl;
-  VERBOSE(AvgPool2D) << "PAD: " << ::nnfw::support::nnapi::to_string(padding_type) << std::endl;
+  VERBOSE(AvgPool2D) << "PAD: " << ::nnfw::nnapi::to_string(padding_type) << std::endl;
   VERBOSE(AvgPool2D) << "PAD(T): " << param.padding.top << std::endl;
   VERBOSE(AvgPool2D) << "PAD(B): " << param.padding.bottom << std::endl;
   VERBOSE(AvgPool2D) << "PAD(L): " << param.padding.left << std::endl;

diff --git a/runtimes/neurun/src/backend/cpu/StageGenerator.cc b/runtimes/neurun/src/backend/cpu/StageGenerator.cc
index b2278d6..eaf23f4 100644 (file)
--- a/runtimes/neurun/src/backend/cpu/StageGenerator.cc
+++ b/runtimes/neurun/src/backend/cpu/StageGenerator.cc
@@ -309,7 +309,7 @@ void StageGenerator::visit(const graph::operation::AvgPool2DNode &node)
   VERBOSE(AvgPool2D) << "KER_W: " << kw << std::endl;
   VERBOSE(AvgPool2D) << "STRIDE_H: " << vstride << std::endl;
   VERBOSE(AvgPool2D) << "STRIDE_W: " << hstride << std::endl;
-  VERBOSE(AvgPool2D) << "PAD: " << ::nnfw::support::nnapi::to_string(padding_type) << std::endl;
+  VERBOSE(AvgPool2D) << "PAD: " << ::nnfw::nnapi::to_string(padding_type) << std::endl;
   VERBOSE(AvgPool2D) << "PAD(T): " << param.padding.top << std::endl;
   VERBOSE(AvgPool2D) << "PAD(B): " << param.padding.bottom << std::endl;
   VERBOSE(AvgPool2D) << "PAD(L): " << param.padding.left << std::endl;