From 98186204b29c58953fec9dc66711f296e180c7cc 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: Wed, 5 Dec 2018 15:24:07 +0900 Subject: [PATCH] Move include/support (#3876) Move include/support to libs/support/include/support Update cmake for include Add .FORMATDENY to avoid format checking Signed-off-by: Hyeongseok Oh --- libs/support/include/.FORMATDENY | 0 {include => libs/support/include}/support/nnapi/Utils.h | 0 {include => libs/support/include}/support/nnapi/feature/Reader.h | 0 {include => libs/support/include}/support/nnapi/feature/Utils.h | 0 {include => libs/support/include}/support/tflite/Assert.h | 0 {include => libs/support/include}/support/tflite/Diff.h | 0 {include => libs/support/include}/support/tflite/FeatureView.h | 0 {include => libs/support/include}/support/tflite/InputIndex.h | 0 {include => libs/support/include}/support/tflite/InterpreterSession.h | 0 {include => libs/support/include}/support/tflite/NNAPISession.h | 0 {include => libs/support/include}/support/tflite/OutputIndex.h | 0 {include => libs/support/include}/support/tflite/Quantization.h | 0 {include => libs/support/include}/support/tflite/Session.h | 0 {include => libs/support/include}/support/tflite/TensorLogger.h | 0 {include => libs/support/include}/support/tflite/TensorShapeUtils.h | 0 {include => libs/support/include}/support/tflite/TensorUtils.h | 0 {include => libs/support/include}/support/tflite/TensorView.h | 0 {include => libs/support/include}/support/tflite/interp/Builder.h | 0 .../support/include}/support/tflite/interp/FlatBufferBuilder.h | 0 .../support/include}/support/tflite/interp/FunctionBuilder.h | 0 {include => libs/support/include}/support/tflite/kernels/Abs.h | 0 {include => libs/support/include}/support/tflite/kernels/CustomOps.h | 0 .../support/include}/support/tflite/kernels/SquaredDifference.h | 0 .../support/include}/support/tflite/kernels/TensorFlowMax.h | 0 .../support/include}/support/tflite/kernels/TensorFlowSum.h | 0 {include => libs/support/include}/support/tflite/kernels/register.h | 0 {include => libs/support/include}/support/tflite/nnapi_delegate.h | 0 libs/support/nnapi/CMakeLists.txt | 2 +- libs/support/tflite/CMakeLists.txt | 2 +- 29 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 libs/support/include/.FORMATDENY rename {include => libs/support/include}/support/nnapi/Utils.h (100%) rename {include => libs/support/include}/support/nnapi/feature/Reader.h (100%) rename {include => libs/support/include}/support/nnapi/feature/Utils.h (100%) rename {include => libs/support/include}/support/tflite/Assert.h (100%) rename {include => libs/support/include}/support/tflite/Diff.h (100%) rename {include => libs/support/include}/support/tflite/FeatureView.h (100%) rename {include => libs/support/include}/support/tflite/InputIndex.h (100%) rename {include => libs/support/include}/support/tflite/InterpreterSession.h (100%) rename {include => libs/support/include}/support/tflite/NNAPISession.h (100%) rename {include => libs/support/include}/support/tflite/OutputIndex.h (100%) rename {include => libs/support/include}/support/tflite/Quantization.h (100%) rename {include => libs/support/include}/support/tflite/Session.h (100%) rename {include => libs/support/include}/support/tflite/TensorLogger.h (100%) rename {include => libs/support/include}/support/tflite/TensorShapeUtils.h (100%) rename {include => libs/support/include}/support/tflite/TensorUtils.h (100%) rename {include => libs/support/include}/support/tflite/TensorView.h (100%) rename {include => libs/support/include}/support/tflite/interp/Builder.h (100%) rename {include => libs/support/include}/support/tflite/interp/FlatBufferBuilder.h (100%) rename {include => libs/support/include}/support/tflite/interp/FunctionBuilder.h (100%) rename {include => libs/support/include}/support/tflite/kernels/Abs.h (100%) rename {include => libs/support/include}/support/tflite/kernels/CustomOps.h (100%) rename {include => libs/support/include}/support/tflite/kernels/SquaredDifference.h (100%) rename {include => libs/support/include}/support/tflite/kernels/TensorFlowMax.h (100%) rename {include => libs/support/include}/support/tflite/kernels/TensorFlowSum.h (100%) rename {include => libs/support/include}/support/tflite/kernels/register.h (100%) rename {include => libs/support/include}/support/tflite/nnapi_delegate.h (100%) diff --git a/libs/support/include/.FORMATDENY b/libs/support/include/.FORMATDENY new file mode 100644 index 0000000..e69de29 diff --git a/include/support/nnapi/Utils.h b/libs/support/include/support/nnapi/Utils.h similarity index 100% rename from include/support/nnapi/Utils.h rename to libs/support/include/support/nnapi/Utils.h diff --git a/include/support/nnapi/feature/Reader.h b/libs/support/include/support/nnapi/feature/Reader.h similarity index 100% rename from include/support/nnapi/feature/Reader.h rename to libs/support/include/support/nnapi/feature/Reader.h diff --git a/include/support/nnapi/feature/Utils.h b/libs/support/include/support/nnapi/feature/Utils.h similarity index 100% rename from include/support/nnapi/feature/Utils.h rename to libs/support/include/support/nnapi/feature/Utils.h diff --git a/include/support/tflite/Assert.h b/libs/support/include/support/tflite/Assert.h similarity index 100% rename from include/support/tflite/Assert.h rename to libs/support/include/support/tflite/Assert.h diff --git a/include/support/tflite/Diff.h b/libs/support/include/support/tflite/Diff.h similarity index 100% rename from include/support/tflite/Diff.h rename to libs/support/include/support/tflite/Diff.h diff --git a/include/support/tflite/FeatureView.h b/libs/support/include/support/tflite/FeatureView.h similarity index 100% rename from include/support/tflite/FeatureView.h rename to libs/support/include/support/tflite/FeatureView.h diff --git a/include/support/tflite/InputIndex.h b/libs/support/include/support/tflite/InputIndex.h similarity index 100% rename from include/support/tflite/InputIndex.h rename to libs/support/include/support/tflite/InputIndex.h diff --git a/include/support/tflite/InterpreterSession.h b/libs/support/include/support/tflite/InterpreterSession.h similarity index 100% rename from include/support/tflite/InterpreterSession.h rename to libs/support/include/support/tflite/InterpreterSession.h diff --git a/include/support/tflite/NNAPISession.h b/libs/support/include/support/tflite/NNAPISession.h similarity index 100% rename from include/support/tflite/NNAPISession.h rename to libs/support/include/support/tflite/NNAPISession.h diff --git a/include/support/tflite/OutputIndex.h b/libs/support/include/support/tflite/OutputIndex.h similarity index 100% rename from include/support/tflite/OutputIndex.h rename to libs/support/include/support/tflite/OutputIndex.h diff --git a/include/support/tflite/Quantization.h b/libs/support/include/support/tflite/Quantization.h similarity index 100% rename from include/support/tflite/Quantization.h rename to libs/support/include/support/tflite/Quantization.h diff --git a/include/support/tflite/Session.h b/libs/support/include/support/tflite/Session.h similarity index 100% rename from include/support/tflite/Session.h rename to libs/support/include/support/tflite/Session.h diff --git a/include/support/tflite/TensorLogger.h b/libs/support/include/support/tflite/TensorLogger.h similarity index 100% rename from include/support/tflite/TensorLogger.h rename to libs/support/include/support/tflite/TensorLogger.h diff --git a/include/support/tflite/TensorShapeUtils.h b/libs/support/include/support/tflite/TensorShapeUtils.h similarity index 100% rename from include/support/tflite/TensorShapeUtils.h rename to libs/support/include/support/tflite/TensorShapeUtils.h diff --git a/include/support/tflite/TensorUtils.h b/libs/support/include/support/tflite/TensorUtils.h similarity index 100% rename from include/support/tflite/TensorUtils.h rename to libs/support/include/support/tflite/TensorUtils.h diff --git a/include/support/tflite/TensorView.h b/libs/support/include/support/tflite/TensorView.h similarity index 100% rename from include/support/tflite/TensorView.h rename to libs/support/include/support/tflite/TensorView.h diff --git a/include/support/tflite/interp/Builder.h b/libs/support/include/support/tflite/interp/Builder.h similarity index 100% rename from include/support/tflite/interp/Builder.h rename to libs/support/include/support/tflite/interp/Builder.h diff --git a/include/support/tflite/interp/FlatBufferBuilder.h b/libs/support/include/support/tflite/interp/FlatBufferBuilder.h similarity index 100% rename from include/support/tflite/interp/FlatBufferBuilder.h rename to libs/support/include/support/tflite/interp/FlatBufferBuilder.h diff --git a/include/support/tflite/interp/FunctionBuilder.h b/libs/support/include/support/tflite/interp/FunctionBuilder.h similarity index 100% rename from include/support/tflite/interp/FunctionBuilder.h rename to libs/support/include/support/tflite/interp/FunctionBuilder.h diff --git a/include/support/tflite/kernels/Abs.h b/libs/support/include/support/tflite/kernels/Abs.h similarity index 100% rename from include/support/tflite/kernels/Abs.h rename to libs/support/include/support/tflite/kernels/Abs.h diff --git a/include/support/tflite/kernels/CustomOps.h b/libs/support/include/support/tflite/kernels/CustomOps.h similarity index 100% rename from include/support/tflite/kernels/CustomOps.h rename to libs/support/include/support/tflite/kernels/CustomOps.h diff --git a/include/support/tflite/kernels/SquaredDifference.h b/libs/support/include/support/tflite/kernels/SquaredDifference.h similarity index 100% rename from include/support/tflite/kernels/SquaredDifference.h rename to libs/support/include/support/tflite/kernels/SquaredDifference.h diff --git a/include/support/tflite/kernels/TensorFlowMax.h b/libs/support/include/support/tflite/kernels/TensorFlowMax.h similarity index 100% rename from include/support/tflite/kernels/TensorFlowMax.h rename to libs/support/include/support/tflite/kernels/TensorFlowMax.h diff --git a/include/support/tflite/kernels/TensorFlowSum.h b/libs/support/include/support/tflite/kernels/TensorFlowSum.h similarity index 100% rename from include/support/tflite/kernels/TensorFlowSum.h rename to libs/support/include/support/tflite/kernels/TensorFlowSum.h diff --git a/include/support/tflite/kernels/register.h b/libs/support/include/support/tflite/kernels/register.h similarity index 100% rename from include/support/tflite/kernels/register.h rename to libs/support/include/support/tflite/kernels/register.h diff --git a/include/support/tflite/nnapi_delegate.h b/libs/support/include/support/tflite/nnapi_delegate.h similarity index 100% rename from include/support/tflite/nnapi_delegate.h rename to libs/support/include/support/tflite/nnapi_delegate.h diff --git a/libs/support/nnapi/CMakeLists.txt b/libs/support/nnapi/CMakeLists.txt index 193bcbd..aa6fd8c 100644 --- a/libs/support/nnapi/CMakeLists.txt +++ b/libs/support/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) +target_include_directories(nnfw_support_nnapi PUBLIC ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/libs/support/include) target_link_libraries(nnfw_support_nnapi static_nnfw_util) diff --git a/libs/support/tflite/CMakeLists.txt b/libs/support/tflite/CMakeLists.txt index 667b3bc..c253481 100644 --- a/libs/support/tflite/CMakeLists.txt +++ b/libs/support/tflite/CMakeLists.txt @@ -4,7 +4,7 @@ list(REMOVE_ITEM SOURCES ${TESTS}) add_library(nnfw_support_tflite STATIC ${SOURCES}) set_target_properties(nnfw_support_tflite PROPERTIES POSITION_INDEPENDENT_CODE ON) -target_include_directories(nnfw_support_tflite PUBLIC ${CMAKE_SOURCE_DIR}/include) +target_include_directories(nnfw_support_tflite PUBLIC ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/libs/support/include) target_link_libraries(nnfw_support_tflite tensorflow-lite ${LIB_PTHREAD} dl) target_link_libraries(nnfw_support_tflite static_nnfw_util) -- 2.7.4