From 4826a36410fbd9dc813f89385be858a945009805 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Staff=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Tue, 4 Sep 2018 17:39:09 +0900 Subject: [PATCH] [neurun] Change path for wrapping structure (#2571) Change path for NeuralNetworks.h's wrapping structure Signed-off-by: Hyeongseok Oh --- runtimes/neurun/CMakeLists.txt | 2 +- runtimes/neurun/src/frontend/compilation.cc | 4 ++-- runtimes/neurun/src/frontend/event.cc | 2 +- runtimes/neurun/src/frontend/execution.cc | 6 +++--- runtimes/neurun/src/frontend/memory.cc | 2 +- runtimes/neurun/src/frontend/model.cc | 4 ++-- runtimes/neurun/src/{ => frontend/wrapper}/compilation.cc | 0 runtimes/neurun/src/{ => frontend/wrapper}/compilation.h | 0 runtimes/neurun/src/{ => frontend/wrapper}/event.h | 0 runtimes/neurun/src/{ => frontend/wrapper}/execution.h | 0 runtimes/neurun/src/{ => frontend/wrapper}/memory.cc | 0 runtimes/neurun/src/{ => frontend/wrapper}/memory.h | 0 runtimes/neurun/src/{ => frontend/wrapper}/model.cc | 0 runtimes/neurun/src/{ => frontend/wrapper}/model.h | 0 runtimes/neurun/test/model.cc | 2 +- 15 files changed, 11 insertions(+), 11 deletions(-) rename runtimes/neurun/src/{ => frontend/wrapper}/compilation.cc (100%) rename runtimes/neurun/src/{ => frontend/wrapper}/compilation.h (100%) rename runtimes/neurun/src/{ => frontend/wrapper}/event.h (100%) rename runtimes/neurun/src/{ => frontend/wrapper}/execution.h (100%) rename runtimes/neurun/src/{ => frontend/wrapper}/memory.cc (100%) rename runtimes/neurun/src/{ => frontend/wrapper}/memory.h (100%) rename runtimes/neurun/src/{ => frontend/wrapper}/model.cc (100%) rename runtimes/neurun/src/{ => frontend/wrapper}/model.h (100%) diff --git a/runtimes/neurun/CMakeLists.txt b/runtimes/neurun/CMakeLists.txt index ebdfcad..ef95d42 100644 --- a/runtimes/neurun/CMakeLists.txt +++ b/runtimes/neurun/CMakeLists.txt @@ -13,7 +13,7 @@ set(LIB_NEURUN_BACKEND_ACL_CL neurun_backend_acl_cl) add_subdirectory(src/backend) file(GLOB SOURCES "src/*.cc") -file(GLOB SOURCES_FRONTEND "src/frontend/*.cc") +file(GLOB_RECURSE SOURCES_FRONTEND "src/frontend/*.cc") file(GLOB_RECURSE SOURCES_INTERNAL "src/internal/*.cc") file(GLOB_RECURSE SOURCES_GRAPH "src/graph/*.cc") file(GLOB_RECURSE SOURCES_LINEAR "src/linear/*.cc") diff --git a/runtimes/neurun/src/frontend/compilation.cc b/runtimes/neurun/src/frontend/compilation.cc index 9f3a986..b85e626 100644 --- a/runtimes/neurun/src/frontend/compilation.cc +++ b/runtimes/neurun/src/frontend/compilation.cc @@ -2,8 +2,8 @@ #include -#include "model.h" -#include "compilation.h" +#include "frontend/wrapper/model.h" +#include "frontend/wrapper/compilation.h" // // NNAPI Implementation diff --git a/runtimes/neurun/src/frontend/event.cc b/runtimes/neurun/src/frontend/event.cc index 47d77ca..9a517f1 100644 --- a/runtimes/neurun/src/frontend/event.cc +++ b/runtimes/neurun/src/frontend/event.cc @@ -1,6 +1,6 @@ #include -#include "event.h" +#include "frontend/wrapper/event.h" int ANeuralNetworksEvent_wait(ANeuralNetworksEvent *event) { diff --git a/runtimes/neurun/src/frontend/execution.cc b/runtimes/neurun/src/frontend/execution.cc index 98c502f..4114c2d 100644 --- a/runtimes/neurun/src/frontend/execution.cc +++ b/runtimes/neurun/src/frontend/execution.cc @@ -2,9 +2,9 @@ #include -#include "compilation.h" -#include "execution.h" -#include "event.h" +#include "frontend/wrapper/compilation.h" +#include "frontend/wrapper/execution.h" +#include "frontend/wrapper/event.h" #include "internal/Source.h" #include "graph/operand/Index.h" diff --git a/runtimes/neurun/src/frontend/memory.cc b/runtimes/neurun/src/frontend/memory.cc index d2f850f..56bc846 100644 --- a/runtimes/neurun/src/frontend/memory.cc +++ b/runtimes/neurun/src/frontend/memory.cc @@ -2,7 +2,7 @@ #include #include -#include "memory.h" +#include "frontend/wrapper/memory.h" int ANeuralNetworksMemory_createFromFd(size_t size, int protect, int fd, size_t offset, ANeuralNetworksMemory **memory) diff --git a/runtimes/neurun/src/frontend/model.cc b/runtimes/neurun/src/frontend/model.cc index 82ed2fa..050cade 100644 --- a/runtimes/neurun/src/frontend/model.cc +++ b/runtimes/neurun/src/frontend/model.cc @@ -8,8 +8,8 @@ #include "nnfw/std/memory.h" #include "graph/Graph.h" -#include "model.h" -#include "memory.h" +#include "frontend/wrapper/model.h" +#include "frontend/wrapper/memory.h" #include "graph/operation/AvgPool2D.h" #include "graph/operation/Concat.h" #include "graph/operation/Conv2D.h" diff --git a/runtimes/neurun/src/compilation.cc b/runtimes/neurun/src/frontend/wrapper/compilation.cc similarity index 100% rename from runtimes/neurun/src/compilation.cc rename to runtimes/neurun/src/frontend/wrapper/compilation.cc diff --git a/runtimes/neurun/src/compilation.h b/runtimes/neurun/src/frontend/wrapper/compilation.h similarity index 100% rename from runtimes/neurun/src/compilation.h rename to runtimes/neurun/src/frontend/wrapper/compilation.h diff --git a/runtimes/neurun/src/event.h b/runtimes/neurun/src/frontend/wrapper/event.h similarity index 100% rename from runtimes/neurun/src/event.h rename to runtimes/neurun/src/frontend/wrapper/event.h diff --git a/runtimes/neurun/src/execution.h b/runtimes/neurun/src/frontend/wrapper/execution.h similarity index 100% rename from runtimes/neurun/src/execution.h rename to runtimes/neurun/src/frontend/wrapper/execution.h diff --git a/runtimes/neurun/src/memory.cc b/runtimes/neurun/src/frontend/wrapper/memory.cc similarity index 100% rename from runtimes/neurun/src/memory.cc rename to runtimes/neurun/src/frontend/wrapper/memory.cc diff --git a/runtimes/neurun/src/memory.h b/runtimes/neurun/src/frontend/wrapper/memory.h similarity index 100% rename from runtimes/neurun/src/memory.h rename to runtimes/neurun/src/frontend/wrapper/memory.h diff --git a/runtimes/neurun/src/model.cc b/runtimes/neurun/src/frontend/wrapper/model.cc similarity index 100% rename from runtimes/neurun/src/model.cc rename to runtimes/neurun/src/frontend/wrapper/model.cc diff --git a/runtimes/neurun/src/model.h b/runtimes/neurun/src/frontend/wrapper/model.h similarity index 100% rename from runtimes/neurun/src/model.h rename to runtimes/neurun/src/frontend/wrapper/model.h diff --git a/runtimes/neurun/test/model.cc b/runtimes/neurun/test/model.cc index 88cc205..b249b0e 100644 --- a/runtimes/neurun/test/model.cc +++ b/runtimes/neurun/test/model.cc @@ -1,6 +1,6 @@ #include -#include "model.h" +#include "frontend/wrapper/model.h" TEST(MODEL, model_build) { -- 2.7.4