Move libs/support/nnapi to libs/nnapi (#3895)

Move libs/support/nnapi to libs/nnapi
Update header include path

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

diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
index 736d313..176631c 100644 (file)
--- a/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
@@ -2,3 +2,4 @@ add_subdirectory(util)
 add_subdirectory(support)
 add_subdirectory(ARMComputeEx)
 add_subdirectory(cpp14)
+add_subdirectory(nnapi)

diff --git a/libs/support/nnapi/CMakeLists.txt b/libs/nnapi/CMakeLists.txt
similarity index 82%
rename from libs/support/nnapi/CMakeLists.txt
rename to libs/nnapi/CMakeLists.txt
index aa6fd8c..92b27b1 100644 (file)
--- a/libs/support/nnapi/CMakeLists.txt
+++ b/libs/nnapi/CMakeLists.txt
@@ -2,5 +2,5 @@ file(GLOB_RECURSE SOURCES "src/*.cpp")
 
 add_library(nnfw_support_nnapi ${SOURCES})
 set_property(TARGET nnfw_support_nnapi PROPERTY POSITION_INDEPENDENT_CODE ON)
-target_include_directories(nnfw_support_nnapi PUBLIC ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/libs/support/include)
+target_include_directories(nnfw_support_nnapi PUBLIC ${CMAKE_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include)
 target_link_libraries(nnfw_support_nnapi static_nnfw_util)

diff --git a/libs/support/include/support/nnapi/Utils.h b/libs/nnapi/include/nnapi/Utils.h
similarity index 100%
rename from libs/support/include/support/nnapi/Utils.h
rename to libs/nnapi/include/nnapi/Utils.h

diff --git a/libs/support/include/support/nnapi/feature/Reader.h b/libs/nnapi/include/nnapi/feature/Reader.h
similarity index 98%
rename from libs/support/include/support/nnapi/feature/Reader.h
rename to libs/nnapi/include/nnapi/feature/Reader.h
index 23bd478..38eb227 100644 (file)
--- a/libs/support/include/support/nnapi/feature/Reader.h
+++ b/libs/nnapi/include/nnapi/feature/Reader.h
@@ -23,7 +23,7 @@
 #ifndef __NNFW_SUPPORT_NNAPI_FEATURE_READER_H__
 #define __NNFW_SUPPORT_NNAPI_FEATURE_READER_H__
 
-#include "support/nnapi/feature/Utils.h"
+#include "nnapi/feature/Utils.h"
 
 #include "util/feature/Shape.h"
 #include "util/feature/Reader.h"

diff --git a/libs/support/include/support/nnapi/feature/Utils.h b/libs/nnapi/include/nnapi/feature/Utils.h
similarity index 100%
rename from libs/support/include/support/nnapi/feature/Utils.h
rename to libs/nnapi/include/nnapi/feature/Utils.h

diff --git a/libs/support/nnapi/src/Utils.cpp b/libs/nnapi/src/Utils.cpp
similarity index 93%
rename from libs/support/nnapi/src/Utils.cpp
rename to libs/nnapi/src/Utils.cpp
index ae1076f..7825ddc 100644 (file)
--- a/libs/support/nnapi/src/Utils.cpp
+++ b/libs/nnapi/src/Utils.cpp
@@ -1,4 +1,4 @@
-#include "support/nnapi/Utils.h"
+#include "nnapi/Utils.h"
 
 #include <cassert>
 

diff --git a/libs/support/nnapi/src/feature/Utils.cpp b/libs/nnapi/src/feature/Utils.cpp
similarity index 96%
rename from libs/support/nnapi/src/feature/Utils.cpp
rename to libs/nnapi/src/feature/Utils.cpp
index 62939ff..61445bf 100644 (file)
--- a/libs/support/nnapi/src/feature/Utils.cpp
+++ b/libs/nnapi/src/feature/Utils.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/nnapi/feature/Utils.h"
+#include "nnapi/feature/Utils.h"
 
 namespace nnfw
 {

diff --git a/libs/support/CMakeLists.txt b/libs/support/CMakeLists.txt
index c916772..3e0ecbb 100644 (file)
--- a/libs/support/CMakeLists.txt
+++ b/libs/support/CMakeLists.txt
@@ -1,2 +1 @@
 add_subdirectory(tflite)
-add_subdirectory(nnapi)

diff --git a/runtimes/neurun/src/backend/acl_cl/StageGenerator.cc b/runtimes/neurun/src/backend/acl_cl/StageGenerator.cc
index 00e4948..2583b0a 100644 (file)
--- a/runtimes/neurun/src/backend/acl_cl/StageGenerator.cc
+++ b/runtimes/neurun/src/backend/acl_cl/StageGenerator.cc
@@ -35,7 +35,7 @@
 
 #include "NeuralNetworks.h"
 
-#include "support/nnapi/Utils.h"
+#include "nnapi/Utils.h"
 
 template <typename T> std::unique_ptr<T> make_layer(void) { return std::unique_ptr<T>{new T}; }
 

diff --git a/runtimes/neurun/src/backend/cpu/StageGenerator.cc b/runtimes/neurun/src/backend/cpu/StageGenerator.cc
index 4207027..75ebf9a 100644 (file)
--- a/runtimes/neurun/src/backend/cpu/StageGenerator.cc
+++ b/runtimes/neurun/src/backend/cpu/StageGenerator.cc
@@ -34,7 +34,7 @@
 
 #include "logging.h"
 
-#include "support/nnapi/Utils.h"
+#include "nnapi/Utils.h"
 
 namespace neurun
 {