summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author오형석/동작제어Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com>2018-12-05 15:24:07 +0900
committerGitHub Enterprise <noreply-CODE@samsung.com>2018-12-05 15:24:07 +0900
commit98186204b29c58953fec9dc66711f296e180c7cc (patch)
tree9784b31d2b70d351bd1cb622d47fa984c33d4419
parentf2a3dc9e85262d6c9dbc616f03ac8dc2c65f961f (diff)
downloadnnfw-98186204b29c58953fec9dc66711f296e180c7cc.tar.gz
nnfw-98186204b29c58953fec9dc66711f296e180c7cc.tar.bz2
nnfw-98186204b29c58953fec9dc66711f296e180c7cc.zip
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 <hseok82.oh@samsung.com>
-rw-r--r--libs/support/include/.FORMATDENY0
-rw-r--r--libs/support/include/support/nnapi/Utils.h (renamed from include/support/nnapi/Utils.h)0
-rw-r--r--libs/support/include/support/nnapi/feature/Reader.h (renamed from include/support/nnapi/feature/Reader.h)0
-rw-r--r--libs/support/include/support/nnapi/feature/Utils.h (renamed from include/support/nnapi/feature/Utils.h)0
-rw-r--r--libs/support/include/support/tflite/Assert.h (renamed from include/support/tflite/Assert.h)0
-rw-r--r--libs/support/include/support/tflite/Diff.h (renamed from include/support/tflite/Diff.h)0
-rw-r--r--libs/support/include/support/tflite/FeatureView.h (renamed from include/support/tflite/FeatureView.h)0
-rw-r--r--libs/support/include/support/tflite/InputIndex.h (renamed from include/support/tflite/InputIndex.h)0
-rw-r--r--libs/support/include/support/tflite/InterpreterSession.h (renamed from include/support/tflite/InterpreterSession.h)0
-rw-r--r--libs/support/include/support/tflite/NNAPISession.h (renamed from include/support/tflite/NNAPISession.h)0
-rw-r--r--libs/support/include/support/tflite/OutputIndex.h (renamed from include/support/tflite/OutputIndex.h)0
-rw-r--r--libs/support/include/support/tflite/Quantization.h (renamed from include/support/tflite/Quantization.h)0
-rw-r--r--libs/support/include/support/tflite/Session.h (renamed from include/support/tflite/Session.h)0
-rw-r--r--libs/support/include/support/tflite/TensorLogger.h (renamed from include/support/tflite/TensorLogger.h)0
-rw-r--r--libs/support/include/support/tflite/TensorShapeUtils.h (renamed from include/support/tflite/TensorShapeUtils.h)0
-rw-r--r--libs/support/include/support/tflite/TensorUtils.h (renamed from include/support/tflite/TensorUtils.h)0
-rw-r--r--libs/support/include/support/tflite/TensorView.h (renamed from include/support/tflite/TensorView.h)0
-rw-r--r--libs/support/include/support/tflite/interp/Builder.h (renamed from include/support/tflite/interp/Builder.h)0
-rw-r--r--libs/support/include/support/tflite/interp/FlatBufferBuilder.h (renamed from include/support/tflite/interp/FlatBufferBuilder.h)0
-rw-r--r--libs/support/include/support/tflite/interp/FunctionBuilder.h (renamed from include/support/tflite/interp/FunctionBuilder.h)0
-rw-r--r--libs/support/include/support/tflite/kernels/Abs.h (renamed from include/support/tflite/kernels/Abs.h)0
-rw-r--r--libs/support/include/support/tflite/kernels/CustomOps.h (renamed from include/support/tflite/kernels/CustomOps.h)0
-rw-r--r--libs/support/include/support/tflite/kernels/SquaredDifference.h (renamed from include/support/tflite/kernels/SquaredDifference.h)0
-rw-r--r--libs/support/include/support/tflite/kernels/TensorFlowMax.h (renamed from include/support/tflite/kernels/TensorFlowMax.h)0
-rw-r--r--libs/support/include/support/tflite/kernels/TensorFlowSum.h (renamed from include/support/tflite/kernels/TensorFlowSum.h)0
-rw-r--r--libs/support/include/support/tflite/kernels/register.h (renamed from include/support/tflite/kernels/register.h)0
-rw-r--r--libs/support/include/support/tflite/nnapi_delegate.h (renamed from include/support/tflite/nnapi_delegate.h)0
-rw-r--r--libs/support/nnapi/CMakeLists.txt2
-rw-r--r--libs/support/tflite/CMakeLists.txt2
29 files changed, 2 insertions, 2 deletions
diff --git a/libs/support/include/.FORMATDENY b/libs/support/include/.FORMATDENY
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/libs/support/include/.FORMATDENY
diff --git a/include/support/nnapi/Utils.h b/libs/support/include/support/nnapi/Utils.h
index 78a0e75ea..78a0e75ea 100644
--- a/include/support/nnapi/Utils.h
+++ b/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
index 3ad9b1700..3ad9b1700 100644
--- a/include/support/nnapi/feature/Reader.h
+++ b/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
index eac508331..eac508331 100644
--- a/include/support/nnapi/feature/Utils.h
+++ b/libs/support/include/support/nnapi/feature/Utils.h
diff --git a/include/support/tflite/Assert.h b/libs/support/include/support/tflite/Assert.h
index 77da5e6c6..77da5e6c6 100644
--- a/include/support/tflite/Assert.h
+++ b/libs/support/include/support/tflite/Assert.h
diff --git a/include/support/tflite/Diff.h b/libs/support/include/support/tflite/Diff.h
index 6a43a575d..6a43a575d 100644
--- a/include/support/tflite/Diff.h
+++ b/libs/support/include/support/tflite/Diff.h
diff --git a/include/support/tflite/FeatureView.h b/libs/support/include/support/tflite/FeatureView.h
index 7f260ed66..7f260ed66 100644
--- a/include/support/tflite/FeatureView.h
+++ b/libs/support/include/support/tflite/FeatureView.h
diff --git a/include/support/tflite/InputIndex.h b/libs/support/include/support/tflite/InputIndex.h
index 3c668858f..3c668858f 100644
--- a/include/support/tflite/InputIndex.h
+++ b/libs/support/include/support/tflite/InputIndex.h
diff --git a/include/support/tflite/InterpreterSession.h b/libs/support/include/support/tflite/InterpreterSession.h
index 63c2a12c2..63c2a12c2 100644
--- a/include/support/tflite/InterpreterSession.h
+++ b/libs/support/include/support/tflite/InterpreterSession.h
diff --git a/include/support/tflite/NNAPISession.h b/libs/support/include/support/tflite/NNAPISession.h
index 704662276..704662276 100644
--- a/include/support/tflite/NNAPISession.h
+++ b/libs/support/include/support/tflite/NNAPISession.h
diff --git a/include/support/tflite/OutputIndex.h b/libs/support/include/support/tflite/OutputIndex.h
index d43841693..d43841693 100644
--- a/include/support/tflite/OutputIndex.h
+++ b/libs/support/include/support/tflite/OutputIndex.h
diff --git a/include/support/tflite/Quantization.h b/libs/support/include/support/tflite/Quantization.h
index fb1b675b9..fb1b675b9 100644
--- a/include/support/tflite/Quantization.h
+++ b/libs/support/include/support/tflite/Quantization.h
diff --git a/include/support/tflite/Session.h b/libs/support/include/support/tflite/Session.h
index 038520889..038520889 100644
--- a/include/support/tflite/Session.h
+++ b/libs/support/include/support/tflite/Session.h
diff --git a/include/support/tflite/TensorLogger.h b/libs/support/include/support/tflite/TensorLogger.h
index f10f32af1..f10f32af1 100644
--- a/include/support/tflite/TensorLogger.h
+++ b/libs/support/include/support/tflite/TensorLogger.h
diff --git a/include/support/tflite/TensorShapeUtils.h b/libs/support/include/support/tflite/TensorShapeUtils.h
index 99b90e9a8..99b90e9a8 100644
--- a/include/support/tflite/TensorShapeUtils.h
+++ b/libs/support/include/support/tflite/TensorShapeUtils.h
diff --git a/include/support/tflite/TensorUtils.h b/libs/support/include/support/tflite/TensorUtils.h
index 86cbccef2..86cbccef2 100644
--- a/include/support/tflite/TensorUtils.h
+++ b/libs/support/include/support/tflite/TensorUtils.h
diff --git a/include/support/tflite/TensorView.h b/libs/support/include/support/tflite/TensorView.h
index d5573a280..d5573a280 100644
--- a/include/support/tflite/TensorView.h
+++ b/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
index 8bfceb67d..8bfceb67d 100644
--- a/include/support/tflite/interp/Builder.h
+++ b/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
index f7e7b65cd..f7e7b65cd 100644
--- a/include/support/tflite/interp/FlatBufferBuilder.h
+++ b/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
index 3329a7713..3329a7713 100644
--- a/include/support/tflite/interp/FunctionBuilder.h
+++ b/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
index e2a639a7d..e2a639a7d 100644
--- a/include/support/tflite/kernels/Abs.h
+++ b/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
index 131dd237a..131dd237a 100644
--- a/include/support/tflite/kernels/CustomOps.h
+++ b/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
index f0a97df8d..f0a97df8d 100644
--- a/include/support/tflite/kernels/SquaredDifference.h
+++ b/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
index bd4db772c..bd4db772c 100644
--- a/include/support/tflite/kernels/TensorFlowMax.h
+++ b/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
index 88a5f2ab9..88a5f2ab9 100644
--- a/include/support/tflite/kernels/TensorFlowSum.h
+++ b/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
index 43a4c1a23..43a4c1a23 100644
--- a/include/support/tflite/kernels/register.h
+++ b/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
index b396d77f2..b396d77f2 100644
--- a/include/support/tflite/nnapi_delegate.h
+++ b/libs/support/include/support/tflite/nnapi_delegate.h
diff --git a/libs/support/nnapi/CMakeLists.txt b/libs/support/nnapi/CMakeLists.txt
index 193bcbd4e..aa6fd8cee 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 667b3bc11..c2534812b 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)