From 9d8684a9ff3877adedf4b9c8c73db77000738735 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: Thu, 6 Dec 2018 17:09:41 +0900 Subject: [PATCH] Move include/nnfw/std (#3892) Move include/nnfw/std to libs/cpp14/ Update include path Update cmake to include cpp14 library using interface Signed-off-by: Hyeongseok Oh --- libs/CMakeLists.txt | 1 + libs/cpp14/CMakeLists.txt | 2 ++ {include/nnfw/std => libs/cpp14/include/cpp14}/memory.h | 0 runtimes/neurun/src/backend/cpu/CMakeLists.txt | 1 + runtimes/neurun/src/backend/cpu/StageGenerator.cc | 2 +- runtimes/neurun/src/compiler/SubTensorAnalyzer.cc | 2 +- runtimes/neurun/src/exec/Sink.h | 2 +- runtimes/neurun/src/exec/Source.h | 2 +- runtimes/neurun/src/frontend/memory.cc | 2 +- runtimes/neurun/src/frontend/model.cc | 2 +- runtimes/neurun/src/graph/Graph.cc | 2 +- runtimes/neurun/src/graph/operand/Set.cc | 2 +- runtimes/neurun/src/graph/pass/PermutationInsertionPass.cc | 2 +- runtimes/neurun/test/graph/operand/UseDef.cc | 2 +- runtimes/neurun/test/graph/operation/SetIO.cc | 2 +- runtimes/neurun/test/graph/verifier/Verifier.cc | 2 +- runtimes/pure_arm_compute/CMakeLists.txt | 1 + runtimes/pure_arm_compute/src/compilation.cc | 2 +- runtimes/pure_arm_compute/src/memory.cc | 2 +- 19 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 libs/cpp14/CMakeLists.txt rename {include/nnfw/std => libs/cpp14/include/cpp14}/memory.h (100%) diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt index 6871597..736d313 100644 --- a/libs/CMakeLists.txt +++ b/libs/CMakeLists.txt @@ -1,3 +1,4 @@ add_subdirectory(util) add_subdirectory(support) add_subdirectory(ARMComputeEx) +add_subdirectory(cpp14) diff --git a/libs/cpp14/CMakeLists.txt b/libs/cpp14/CMakeLists.txt new file mode 100644 index 0000000..bba9e13 --- /dev/null +++ b/libs/cpp14/CMakeLists.txt @@ -0,0 +1,2 @@ +add_library(nnfw_lib_cpp14 INTERFACE) +target_include_directories(nnfw_lib_cpp14 INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include) diff --git a/include/nnfw/std/memory.h b/libs/cpp14/include/cpp14/memory.h similarity index 100% rename from include/nnfw/std/memory.h rename to libs/cpp14/include/cpp14/memory.h diff --git a/runtimes/neurun/src/backend/cpu/CMakeLists.txt b/runtimes/neurun/src/backend/cpu/CMakeLists.txt index 731aa31..d01c8ee 100644 --- a/runtimes/neurun/src/backend/cpu/CMakeLists.txt +++ b/runtimes/neurun/src/backend/cpu/CMakeLists.txt @@ -10,6 +10,7 @@ target_link_libraries(${LIB_NEURUN_BACKEND_CPU} arm_compute) # TODO We should no target_link_libraries(${LIB_NEURUN_BACKEND_CPU} tensorflow-lite) target_link_libraries(${LIB_NEURUN_BACKEND_CPU} nnfw_util) target_link_libraries(${LIB_NEURUN_BACKEND_CPU} nnfw_support_nnapi) +target_link_libraries(${LIB_NEURUN_BACKEND_CPU} nnfw_lib_cpp14) target_link_libraries(${LIB_NEURUN_BACKEND_CPU} ${LIB_NEURUN_KERNEL_CPU}) # TODO remove this line once acl dependency is removed from PermuteLayer target_link_libraries(${LIB_NEURUN_BACKEND_CPU} ${LIB_NEURUN_BACKEND_ACL_CL}) diff --git a/runtimes/neurun/src/backend/cpu/StageGenerator.cc b/runtimes/neurun/src/backend/cpu/StageGenerator.cc index f242d1a..a0c3a9c 100644 --- a/runtimes/neurun/src/backend/cpu/StageGenerator.cc +++ b/runtimes/neurun/src/backend/cpu/StageGenerator.cc @@ -18,7 +18,7 @@ #include -#include "nnfw/std/memory.h" +#include "cpp14/memory.h" #include "internal/Padding.h" #include "kernel/cpu/OperationUtils.h" #include "kernel/cpu/ConvolutionLayer.h" diff --git a/runtimes/neurun/src/compiler/SubTensorAnalyzer.cc b/runtimes/neurun/src/compiler/SubTensorAnalyzer.cc index 9c88d39..8d75e78 100644 --- a/runtimes/neurun/src/compiler/SubTensorAnalyzer.cc +++ b/runtimes/neurun/src/compiler/SubTensorAnalyzer.cc @@ -18,7 +18,7 @@ #include -#include "nnfw/std/memory.h" +#include "cpp14/memory.h" #include "graph/operand/Set.h" #include "graph/operation/LowerInfo.h" #include "logging.h" diff --git a/runtimes/neurun/src/exec/Sink.h b/runtimes/neurun/src/exec/Sink.h index 086010f..d175897 100644 --- a/runtimes/neurun/src/exec/Sink.h +++ b/runtimes/neurun/src/exec/Sink.h @@ -19,7 +19,7 @@ #include -#include "nnfw/std/memory.h" +#include "cpp14/memory.h" #include "util/feature/nhwc/View.h" #include "util/feature/nchw/View.h" #include diff --git a/runtimes/neurun/src/exec/Source.h b/runtimes/neurun/src/exec/Source.h index 2e33bd2..371af91 100644 --- a/runtimes/neurun/src/exec/Source.h +++ b/runtimes/neurun/src/exec/Source.h @@ -19,7 +19,7 @@ #include -#include "nnfw/std/memory.h" +#include "cpp14/memory.h" #include "util/feature/nchw/View.h" #include "util/feature/nhwc/Reader.h" #include diff --git a/runtimes/neurun/src/frontend/memory.cc b/runtimes/neurun/src/frontend/memory.cc index cc891fe..eadeb54 100644 --- a/runtimes/neurun/src/frontend/memory.cc +++ b/runtimes/neurun/src/frontend/memory.cc @@ -19,7 +19,7 @@ #include #include -#include "nnfw/std/memory.h" +#include "cpp14/memory.h" #include "frontend/wrapper/memory.h" int ANeuralNetworksMemory_createFromFd(size_t size, int protect, int fd, size_t offset, diff --git a/runtimes/neurun/src/frontend/model.cc b/runtimes/neurun/src/frontend/model.cc index 5baf86f..85c3a60 100644 --- a/runtimes/neurun/src/frontend/model.cc +++ b/runtimes/neurun/src/frontend/model.cc @@ -21,7 +21,7 @@ #include #include -#include "nnfw/std/memory.h" +#include "cpp14/memory.h" #include "graph/Graph.h" #include "frontend/wrapper/model.h" diff --git a/runtimes/neurun/src/graph/Graph.cc b/runtimes/neurun/src/graph/Graph.cc index f581831..a523437 100644 --- a/runtimes/neurun/src/graph/Graph.cc +++ b/runtimes/neurun/src/graph/Graph.cc @@ -21,7 +21,7 @@ #include "logging.h" #include "verifier/Verifier.h" -#include "nnfw/std/memory.h" +#include "cpp14/memory.h" #include "linear/Linear.h" #include "operation/LowerInfo.h" #include "operand/LowerInfo.h" diff --git a/runtimes/neurun/src/graph/operand/Set.cc b/runtimes/neurun/src/graph/operand/Set.cc index dff690a..92f9b10 100644 --- a/runtimes/neurun/src/graph/operand/Set.cc +++ b/runtimes/neurun/src/graph/operand/Set.cc @@ -16,7 +16,7 @@ #include "Set.h" -#include "nnfw/std/memory.h" +#include "cpp14/memory.h" namespace neurun { diff --git a/runtimes/neurun/src/graph/pass/PermutationInsertionPass.cc b/runtimes/neurun/src/graph/pass/PermutationInsertionPass.cc index 5d61e74..7549be0 100644 --- a/runtimes/neurun/src/graph/pass/PermutationInsertionPass.cc +++ b/runtimes/neurun/src/graph/pass/PermutationInsertionPass.cc @@ -25,7 +25,7 @@ #include "graph/Graph.h" #include "backend/interface/IConfig.h" #include "logging.h" -#include "nnfw/std/memory.h" +#include "cpp14/memory.h" #include "graph/operation/PermuteNode.h" #include "graph/operand/Shape4DConvert.h" #include "compiler/BackendResolver.h" diff --git a/runtimes/neurun/test/graph/operand/UseDef.cc b/runtimes/neurun/test/graph/operand/UseDef.cc index 1e7f42b..b001278 100644 --- a/runtimes/neurun/test/graph/operand/UseDef.cc +++ b/runtimes/neurun/test/graph/operand/UseDef.cc @@ -18,7 +18,7 @@ #include "graph/Graph.h" #include "graph/verifier/Verifier.h" -#include "nnfw/std/memory.h" +#include "cpp14/memory.h" #include "../MockNode.h" #include diff --git a/runtimes/neurun/test/graph/operation/SetIO.cc b/runtimes/neurun/test/graph/operation/SetIO.cc index 5373461..5868a42 100644 --- a/runtimes/neurun/test/graph/operation/SetIO.cc +++ b/runtimes/neurun/test/graph/operation/SetIO.cc @@ -17,7 +17,7 @@ #include #include "graph/Graph.h" -#include "nnfw/std/memory.h" +#include "cpp14/memory.h" #include "graph/operation/Conv2DNode.h" #include "graph/operation/ConcatNode.h" #include "graph/operand/Index.h" diff --git a/runtimes/neurun/test/graph/verifier/Verifier.cc b/runtimes/neurun/test/graph/verifier/Verifier.cc index 27f03bf..df34c12 100644 --- a/runtimes/neurun/test/graph/verifier/Verifier.cc +++ b/runtimes/neurun/test/graph/verifier/Verifier.cc @@ -19,7 +19,7 @@ #include "graph/operation/Node.h" #include "graph/Graph.h" #include "graph/verifier/Verifier.h" -#include "nnfw/std/memory.h" +#include "cpp14/memory.h" #include "graph/operand/Object.h" #include "../MockNode.h" diff --git a/runtimes/pure_arm_compute/CMakeLists.txt b/runtimes/pure_arm_compute/CMakeLists.txt index d85c3ec..df5fa72 100644 --- a/runtimes/pure_arm_compute/CMakeLists.txt +++ b/runtimes/pure_arm_compute/CMakeLists.txt @@ -17,6 +17,7 @@ endif() target_link_libraries(nnapi_pure_arm_compute arm_compute) target_link_libraries(nnapi_pure_arm_compute arm_compute_ex) target_link_libraries(nnapi_pure_arm_compute static_nnfw_util) +target_link_libraries(nnapi_pure_arm_compute nnfw_lib_cpp14) if("${TARGET_OS}" STREQUAL "android") target_link_libraries(nnapi_pure_arm_compute log) diff --git a/runtimes/pure_arm_compute/src/compilation.cc b/runtimes/pure_arm_compute/src/compilation.cc index 63088bb..7e15d7d 100644 --- a/runtimes/pure_arm_compute/src/compilation.cc +++ b/runtimes/pure_arm_compute/src/compilation.cc @@ -112,7 +112,7 @@ #include "util/feature/IndexIterator.h" #include "util/tensor/IndexIterator.h" -#include +#include #include "compilation.h" #include "model.h" diff --git a/runtimes/pure_arm_compute/src/memory.cc b/runtimes/pure_arm_compute/src/memory.cc index 2a9294f..283ff55 100644 --- a/runtimes/pure_arm_compute/src/memory.cc +++ b/runtimes/pure_arm_compute/src/memory.cc @@ -18,7 +18,7 @@ #include #include -#include "nnfw/std/memory.h" +#include "cpp14/memory.h" #include "memory.h" int ANeuralNetworksMemory_createFromFd(size_t size, int protect, int fd, size_t offset, -- 2.7.4