From 4d8402bfa056667cbe60643450cfa9497a1b52e6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=EC=9D=B4=ED=95=9C=EC=A2=85/=EB=8F=99=EC=9E=91=EC=A0=9C?=
 =?utf8?q?=EC=96=B4Lab=28SR=29/Engineer/=EC=82=BC=EC=84=B1=EC=A0=84?=
 =?utf8?q?=EC=9E=90?= <hanjoung.lee@samsung.com>
Date: Thu, 6 Dec 2018 17:08:54 +0900
Subject: [PATCH] [neurun] Move Swizzle.h to acl backend dir (#3893)

Move Swizzle.h to acl backend dir since it is only used there.

Signed-off-by: Hanjoung Lee <hanjoung.lee@samsung.com>
---
 runtimes/neurun/src/backend/acl_cl/Convert.cc            |  5 ++---
 .../neurun/src/{internal => backend/acl_cl}/Swizzle.h    | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)
 rename runtimes/neurun/src/{internal => backend/acl_cl}/Swizzle.h (87%)

diff --git a/runtimes/neurun/src/backend/acl_cl/Convert.cc b/runtimes/neurun/src/backend/acl_cl/Convert.cc
index a75cc0d..2ee7b10 100644
--- a/runtimes/neurun/src/backend/acl_cl/Convert.cc
+++ b/runtimes/neurun/src/backend/acl_cl/Convert.cc
@@ -16,7 +16,7 @@
 
 #include "Convert.h"
 
-#include "internal/Swizzle.h"
+#include "Swizzle.h"
 #include "graph/operand/DataType.h"
 
 namespace neurun
@@ -44,8 +44,7 @@ namespace acl_cl
     // However, if the dimension correction is applied to input_to_input_weights with input_size
     // equal to 1, it will be changed to 1-D.
     // So input_to_input_weights is not used by the weight of FullyConnected.
-    res.set(::internal::ToARMComputeAxis(rank, axis).value(), shape.dim(axis),
-            apply_dim_correction);
+    res.set(ToARMComputeAxis(rank, axis).value(), shape.dim(axis), apply_dim_correction);
   }
 
   return res;
diff --git a/runtimes/neurun/src/internal/Swizzle.h b/runtimes/neurun/src/backend/acl_cl/Swizzle.h
similarity index 87%
rename from runtimes/neurun/src/internal/Swizzle.h
rename to runtimes/neurun/src/backend/acl_cl/Swizzle.h
index eb982a9..838e571 100644
--- a/runtimes/neurun/src/internal/Swizzle.h
+++ b/runtimes/neurun/src/backend/acl_cl/Swizzle.h
@@ -14,12 +14,16 @@
  * limitations under the License.
  */
 
-#ifndef __INTERNAL_SWIZZLE_H__
-#define __INTERNAL_SWIZZLE_H__
+#ifndef __NEURUN_BACKEND_ACL_CL_SWIZZLE_H__
+#define __NEURUN_BACKEND_ACL_CL_SWIZZLE_H__
 
 #include <cassert>
 
-namespace internal
+namespace neurun
+{
+namespace backend
+{
+namespace acl_cl
 {
 
 class ARMComputeAxis
@@ -84,6 +88,8 @@ template <typename T> inline T ReorderBits(T in, size_t numOfBits)
   return out;
 }
 
-} // namespace internal
+} // namespace acl_cl
+} // namespace backend
+} // namespace neurun
 
-#endif // __INTERNAL_SWIZZLE_H__
+#endif // __NEURUN_BACKEND_ACL_CL_SWIZZLE_H__
-- 
2.7.4