[neurun] Separate CMakeLists for frontend/nnapi (#4760)

Separate CMakeLists for frontend/nnapi. And corresponding inclusion path
fixes.

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

diff --git a/runtimes/neurun/CMakeLists.txt b/runtimes/neurun/CMakeLists.txt
index d8bacef..cc0d2f7 100644 (file)
--- a/runtimes/neurun/CMakeLists.txt
+++ b/runtimes/neurun/CMakeLists.txt
@@ -14,6 +14,8 @@ if(NOT "${TARGET_ARCH}" STREQUAL "x86_64")
 endif(NOT "${TARGET_ARCH}" STREQUAL "x86_64")
 add_subdirectory(src/backend)
 
+add_subdirectory(frontend)
+
 file(GLOB SOURCES "src/*.cc")
 file(GLOB SOURCES_BACKEND "src/backend/*.cc")
 file(GLOB_RECURSE SOURCES_GRAPH "src/graph/*.cc")
@@ -37,20 +39,6 @@ target_link_libraries(neurun-core nnfw_lib_misc)
 target_link_libraries(neurun-core nnfw_lib_cpp14)
 target_compile_options(neurun-core PRIVATE -Wall -Wextra -Werror)
 
-file(GLOB_RECURSE SOURCES_FRONTEND "frontend/nnapi/*.cc")
-
-add_library(${LIB_NEURUN} SHARED ${SOURCES_FRONTEND})
-target_include_directories(${LIB_NEURUN} PRIVATE frontend/nnapi)
-target_include_directories(${LIB_NEURUN} PUBLIC ${NEURUN_INCLUDE_DIR})
-target_include_directories(${LIB_NEURUN} PUBLIC ${CMAKE_SOURCE_DIR}/externals/tensorflow)
-target_link_libraries(${LIB_NEURUN} neurun-core)
-
-target_compile_options(${LIB_NEURUN} PRIVATE -Wall -Wextra -Werror)
-
-set_target_properties(${LIB_NEURUN} PROPERTIES OUTPUT_NAME neuralnetworks)
-
-install(TARGETS ${LIB_NEURUN} DESTINATION lib/neurun)
-
 
 # Unit Tests
 

diff --git a/runtimes/neurun/frontend/CMakeLists.txt b/runtimes/neurun/frontend/CMakeLists.txt
new file mode 100644 (file)
index 0000000..5ea6cda
--- /dev/null
+++ b/runtimes/neurun/frontend/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectories()

diff --git a/runtimes/neurun/frontend/nnapi/CMakeLists.txt b/runtimes/neurun/frontend/nnapi/CMakeLists.txt
new file mode 100644 (file)
index 0000000..b372da1
--- /dev/null
+++ b/runtimes/neurun/frontend/nnapi/CMakeLists.txt
@@ -0,0 +1,13 @@
+file(GLOB_RECURSE SOURCES_FRONTEND "*.cc")
+
+add_library(${LIB_NEURUN} SHARED ${SOURCES_FRONTEND})
+target_include_directories(${LIB_NEURUN} PUBLIC ${NEURUN_INCLUDE_DIR})
+target_include_directories(${LIB_NEURUN} PUBLIC ${CMAKE_SOURCE_DIR}/externals/tensorflow)
+target_link_libraries(${LIB_NEURUN} neurun-core)
+
+target_compile_options(${LIB_NEURUN} PRIVATE -Wall -Wextra -Werror)
+
+set_target_properties(${LIB_NEURUN} PROPERTIES OUTPUT_NAME neuralnetworks)
+
+install(TARGETS ${LIB_NEURUN} DESTINATION lib/neurun)
+

diff --git a/runtimes/neurun/frontend/nnapi/frontend/compilation.cc b/runtimes/neurun/frontend/nnapi/frontend/compilation.cc
index 07d9b13..a79bc1c 100644 (file)
--- a/runtimes/neurun/frontend/nnapi/frontend/compilation.cc
+++ b/runtimes/neurun/frontend/nnapi/frontend/compilation.cc
@@ -18,8 +18,8 @@
 
 #include <new>
 
-#include "frontend/wrapper/model.h"
-#include "frontend/wrapper/compilation.h"
+#include "wrapper/model.h"
+#include "wrapper/compilation.h"
 #include "util/logging.h"
 
 //

diff --git a/runtimes/neurun/frontend/nnapi/frontend/event.cc b/runtimes/neurun/frontend/nnapi/frontend/event.cc
index cd47cc6..7c2836d 100644 (file)
--- a/runtimes/neurun/frontend/nnapi/frontend/event.cc
+++ b/runtimes/neurun/frontend/nnapi/frontend/event.cc
@@ -16,7 +16,7 @@
 
 #include <NeuralNetworks.h>
 
-#include "frontend/wrapper/event.h"
+#include "wrapper/event.h"
 
 int ANeuralNetworksEvent_wait(ANeuralNetworksEvent *event)
 {

diff --git a/runtimes/neurun/frontend/nnapi/frontend/execution.cc b/runtimes/neurun/frontend/nnapi/frontend/execution.cc
index 6a89f89..4463c8e 100644 (file)
--- a/runtimes/neurun/frontend/nnapi/frontend/execution.cc
+++ b/runtimes/neurun/frontend/nnapi/frontend/execution.cc
@@ -18,9 +18,9 @@
 
 #include <new>
 
-#include "frontend/wrapper/compilation.h"
-#include "frontend/wrapper/execution.h"
-#include "frontend/wrapper/event.h"
+#include "wrapper/compilation.h"
+#include "wrapper/execution.h"
+#include "wrapper/event.h"
 #include "util/logging.h"
 
 //

diff --git a/runtimes/neurun/frontend/nnapi/frontend/memory.cc b/runtimes/neurun/frontend/nnapi/frontend/memory.cc
index b2f6ab2..e28d1df 100644 (file)
--- a/runtimes/neurun/frontend/nnapi/frontend/memory.cc
+++ b/runtimes/neurun/frontend/nnapi/frontend/memory.cc
@@ -20,7 +20,7 @@
 #include <memory>
 
 #include "cpp14/memory.h"
-#include "frontend/wrapper/memory.h"
+#include "wrapper/memory.h"
 
 int ANeuralNetworksMemory_createFromFd(size_t size, int protect, int fd, size_t offset,
                                        ANeuralNetworksMemory **memory)

diff --git a/runtimes/neurun/frontend/nnapi/frontend/model.cc b/runtimes/neurun/frontend/nnapi/frontend/model.cc
index a3b5dd8..89a54f3 100644 (file)
--- a/runtimes/neurun/frontend/nnapi/frontend/model.cc
+++ b/runtimes/neurun/frontend/nnapi/frontend/model.cc
@@ -19,8 +19,8 @@
 
 #include <new>
 
-#include "frontend/wrapper/model.h"
-#include "frontend/wrapper/memory.h"
+#include "wrapper/model.h"
+#include "wrapper/memory.h"
 #include "util/logging.h"
 
 int ANeuralNetworksModel_create(ANeuralNetworksModel **model)