Move conv kernel to cl folder (#561)

This will move Conv kernel source into cl folder for cl implementations

Signed-off-by: SaeHie Park <saehie.park@samsung.com>

diff --git a/src/kernel/acl/CMakeLists.txt b/src/kernel/acl/CMakeLists.txt
index 22195ab..372a79c 100644 (file)
--- a/src/kernel/acl/CMakeLists.txt
+++ b/src/kernel/acl/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(${CMAKE_INSTALL_PREFIX}/lib)
 # kernel library
 set(KERNELACL_SRCS "src/Init_acl.cpp"
                    "src/IO_accessor.cpp"
-                   "src/Conv2D_acl.cpp"
+                   "src/cl/Conv2D_acl.cpp"
                    "src/cl/FullyConnected.cpp"
                    )
 
@@ -45,7 +45,7 @@ endif()
 install(TARGETS ${LIB_KERNELACL} DESTINATION lib)
 
 # kernel test executable
-set(KERNELACL_TEST_SRCS "src/Conv2D_acl.test.cpp"
+set(KERNELACL_TEST_SRCS "src/cl/Conv2D_acl.test.cpp"
                         "src/util.cpp"
                         "src/gtest_env.cpp"
                         "src/cl/FullyConnected.test.cpp"

diff --git a/src/kernel/acl/src/Conv2D_acl.cpp b/src/kernel/acl/src/cl/Conv2D_acl.cpp
similarity index 99%
rename from src/kernel/acl/src/Conv2D_acl.cpp
rename to src/kernel/acl/src/cl/Conv2D_acl.cpp
index 8f729e7..7e5c693 100644 (file)
--- a/src/kernel/acl/src/Conv2D_acl.cpp
+++ b/src/kernel/acl/src/cl/Conv2D_acl.cpp
@@ -1,7 +1,7 @@
 #include <OperationsUtils.h>
 #include <arm_compute/core/TensorShape.h>
 #include <arm_compute/core/TensorInfo.h>
-#include "IO_accessor.h"
+#include "../IO_accessor.h"
 
 #include <cassert>
 

diff --git a/src/kernel/acl/src/Conv2D_acl.test.cpp b/src/kernel/acl/src/cl/Conv2D_acl.test.cpp
similarity index 98%
rename from src/kernel/acl/src/Conv2D_acl.test.cpp
rename to src/kernel/acl/src/cl/Conv2D_acl.test.cpp
index 8e632d3..f5a7348 100644 (file)
--- a/src/kernel/acl/src/Conv2D_acl.test.cpp
+++ b/src/kernel/acl/src/cl/Conv2D_acl.test.cpp
@@ -2,7 +2,8 @@
 #include <OperationsUtils.h>
 #include <kernel/acl/nnfw_kernel_acl.h>
 
-#include "util.h"
+// TODO: fix include path in CMakeFiles
+#include "../util.h"
 
 namespace nnfw {
 namespace kernel {