From a211beb825a8e908f5ff09df3ad2711b9ac951dc 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 14:47:14 +0900 Subject: [PATCH] Move include/util (#3872) * Move include/util Move include/util to libs/util/include/util Update cmake for include Signed-off-by: Hyeongseok Oh * Add .FORMATDENY file Format for header will be fixed later --- cmake/option/option_linux.cmake | 2 +- libs/util/include/.FORMATDENY | 0 {include => libs/util/include}/util/EnvVar.h | 0 {include => libs/util/include}/util/benchmark.h | 0 {include => libs/util/include}/util/environment.h | 0 {include => libs/util/include}/util/feature/Index.h | 0 {include => libs/util/include}/util/feature/IndexIterator.h | 0 {include => libs/util/include}/util/feature/Object.h | 0 {include => libs/util/include}/util/feature/Reader.h | 0 {include => libs/util/include}/util/feature/Shape.h | 0 {include => libs/util/include}/util/feature/TextFormatter.h | 0 {include => libs/util/include}/util/fp32.h | 0 {include => libs/util/include}/util/kernel/IndexIterator.h | 0 {include => libs/util/include}/util/kernel/RandomObject.h | 0 {include => libs/util/include}/util/kernel/Reader.h | 0 {include => libs/util/include}/util/kernel/Shape.h | 0 {include => libs/util/include}/util/matrix/IndexIterator.h | 0 {include => libs/util/include}/util/matrix/Reader.h | 0 {include => libs/util/include}/util/matrix/Shape.h | 0 {include => libs/util/include}/util/profiling/profile_buffer.h | 0 {include => libs/util/include}/util/profiling/profiler.h | 0 {include => libs/util/include}/util/profiling/profiling.h | 0 {include => libs/util/include}/util/profiling/time.h | 0 {include => libs/util/include}/util/tensor/Comparator.h | 0 {include => libs/util/include}/util/tensor/Diff.h | 0 {include => libs/util/include}/util/tensor/Index.h | 0 {include => libs/util/include}/util/tensor/IndexEnumerator.h | 0 {include => libs/util/include}/util/tensor/IndexFormatter.h | 0 {include => libs/util/include}/util/tensor/IndexIterator.h | 0 {include => libs/util/include}/util/tensor/NonIncreasingStride.h | 0 {include => libs/util/include}/util/tensor/Object.h | 0 {include => libs/util/include}/util/tensor/Reader.h | 0 {include => libs/util/include}/util/tensor/Shape.h | 0 {include => libs/util/include}/util/tensor/Zipper.h | 0 {include => libs/util/include}/util/vector.h | 0 {include => libs/util/include}/util/vector/Object.h | 0 {include => libs/util/include}/util/vector/Reader.h | 0 37 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 libs/util/include/.FORMATDENY rename {include => libs/util/include}/util/EnvVar.h (100%) rename {include => libs/util/include}/util/benchmark.h (100%) rename {include => libs/util/include}/util/environment.h (100%) rename {include => libs/util/include}/util/feature/Index.h (100%) rename {include => libs/util/include}/util/feature/IndexIterator.h (100%) rename {include => libs/util/include}/util/feature/Object.h (100%) rename {include => libs/util/include}/util/feature/Reader.h (100%) rename {include => libs/util/include}/util/feature/Shape.h (100%) rename {include => libs/util/include}/util/feature/TextFormatter.h (100%) rename {include => libs/util/include}/util/fp32.h (100%) rename {include => libs/util/include}/util/kernel/IndexIterator.h (100%) rename {include => libs/util/include}/util/kernel/RandomObject.h (100%) rename {include => libs/util/include}/util/kernel/Reader.h (100%) rename {include => libs/util/include}/util/kernel/Shape.h (100%) rename {include => libs/util/include}/util/matrix/IndexIterator.h (100%) rename {include => libs/util/include}/util/matrix/Reader.h (100%) rename {include => libs/util/include}/util/matrix/Shape.h (100%) rename {include => libs/util/include}/util/profiling/profile_buffer.h (100%) rename {include => libs/util/include}/util/profiling/profiler.h (100%) rename {include => libs/util/include}/util/profiling/profiling.h (100%) rename {include => libs/util/include}/util/profiling/time.h (100%) rename {include => libs/util/include}/util/tensor/Comparator.h (100%) rename {include => libs/util/include}/util/tensor/Diff.h (100%) rename {include => libs/util/include}/util/tensor/Index.h (100%) rename {include => libs/util/include}/util/tensor/IndexEnumerator.h (100%) rename {include => libs/util/include}/util/tensor/IndexFormatter.h (100%) rename {include => libs/util/include}/util/tensor/IndexIterator.h (100%) rename {include => libs/util/include}/util/tensor/NonIncreasingStride.h (100%) rename {include => libs/util/include}/util/tensor/Object.h (100%) rename {include => libs/util/include}/util/tensor/Reader.h (100%) rename {include => libs/util/include}/util/tensor/Shape.h (100%) rename {include => libs/util/include}/util/tensor/Zipper.h (100%) rename {include => libs/util/include}/util/vector.h (100%) rename {include => libs/util/include}/util/vector/Object.h (100%) rename {include => libs/util/include}/util/vector/Reader.h (100%) diff --git a/cmake/option/option_linux.cmake b/cmake/option/option_linux.cmake index 8cae4e9..8d2eba7 100644 --- a/cmake/option/option_linux.cmake +++ b/cmake/option/option_linux.cmake @@ -24,7 +24,7 @@ endif() set(LIB_PTHREAD pthread) # nnfw common path -set(NNFW_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include) +set(NNFW_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/libs/util/include) set(NNFW_EXTERNALS_DIR ${CMAKE_SOURCE_DIR}/externals) # External sources to build tflite diff --git a/libs/util/include/.FORMATDENY b/libs/util/include/.FORMATDENY new file mode 100644 index 0000000..e69de29 diff --git a/include/util/EnvVar.h b/libs/util/include/util/EnvVar.h similarity index 100% rename from include/util/EnvVar.h rename to libs/util/include/util/EnvVar.h diff --git a/include/util/benchmark.h b/libs/util/include/util/benchmark.h similarity index 100% rename from include/util/benchmark.h rename to libs/util/include/util/benchmark.h diff --git a/include/util/environment.h b/libs/util/include/util/environment.h similarity index 100% rename from include/util/environment.h rename to libs/util/include/util/environment.h diff --git a/include/util/feature/Index.h b/libs/util/include/util/feature/Index.h similarity index 100% rename from include/util/feature/Index.h rename to libs/util/include/util/feature/Index.h diff --git a/include/util/feature/IndexIterator.h b/libs/util/include/util/feature/IndexIterator.h similarity index 100% rename from include/util/feature/IndexIterator.h rename to libs/util/include/util/feature/IndexIterator.h diff --git a/include/util/feature/Object.h b/libs/util/include/util/feature/Object.h similarity index 100% rename from include/util/feature/Object.h rename to libs/util/include/util/feature/Object.h diff --git a/include/util/feature/Reader.h b/libs/util/include/util/feature/Reader.h similarity index 100% rename from include/util/feature/Reader.h rename to libs/util/include/util/feature/Reader.h diff --git a/include/util/feature/Shape.h b/libs/util/include/util/feature/Shape.h similarity index 100% rename from include/util/feature/Shape.h rename to libs/util/include/util/feature/Shape.h diff --git a/include/util/feature/TextFormatter.h b/libs/util/include/util/feature/TextFormatter.h similarity index 100% rename from include/util/feature/TextFormatter.h rename to libs/util/include/util/feature/TextFormatter.h diff --git a/include/util/fp32.h b/libs/util/include/util/fp32.h similarity index 100% rename from include/util/fp32.h rename to libs/util/include/util/fp32.h diff --git a/include/util/kernel/IndexIterator.h b/libs/util/include/util/kernel/IndexIterator.h similarity index 100% rename from include/util/kernel/IndexIterator.h rename to libs/util/include/util/kernel/IndexIterator.h diff --git a/include/util/kernel/RandomObject.h b/libs/util/include/util/kernel/RandomObject.h similarity index 100% rename from include/util/kernel/RandomObject.h rename to libs/util/include/util/kernel/RandomObject.h diff --git a/include/util/kernel/Reader.h b/libs/util/include/util/kernel/Reader.h similarity index 100% rename from include/util/kernel/Reader.h rename to libs/util/include/util/kernel/Reader.h diff --git a/include/util/kernel/Shape.h b/libs/util/include/util/kernel/Shape.h similarity index 100% rename from include/util/kernel/Shape.h rename to libs/util/include/util/kernel/Shape.h diff --git a/include/util/matrix/IndexIterator.h b/libs/util/include/util/matrix/IndexIterator.h similarity index 100% rename from include/util/matrix/IndexIterator.h rename to libs/util/include/util/matrix/IndexIterator.h diff --git a/include/util/matrix/Reader.h b/libs/util/include/util/matrix/Reader.h similarity index 100% rename from include/util/matrix/Reader.h rename to libs/util/include/util/matrix/Reader.h diff --git a/include/util/matrix/Shape.h b/libs/util/include/util/matrix/Shape.h similarity index 100% rename from include/util/matrix/Shape.h rename to libs/util/include/util/matrix/Shape.h diff --git a/include/util/profiling/profile_buffer.h b/libs/util/include/util/profiling/profile_buffer.h similarity index 100% rename from include/util/profiling/profile_buffer.h rename to libs/util/include/util/profiling/profile_buffer.h diff --git a/include/util/profiling/profiler.h b/libs/util/include/util/profiling/profiler.h similarity index 100% rename from include/util/profiling/profiler.h rename to libs/util/include/util/profiling/profiler.h diff --git a/include/util/profiling/profiling.h b/libs/util/include/util/profiling/profiling.h similarity index 100% rename from include/util/profiling/profiling.h rename to libs/util/include/util/profiling/profiling.h diff --git a/include/util/profiling/time.h b/libs/util/include/util/profiling/time.h similarity index 100% rename from include/util/profiling/time.h rename to libs/util/include/util/profiling/time.h diff --git a/include/util/tensor/Comparator.h b/libs/util/include/util/tensor/Comparator.h similarity index 100% rename from include/util/tensor/Comparator.h rename to libs/util/include/util/tensor/Comparator.h diff --git a/include/util/tensor/Diff.h b/libs/util/include/util/tensor/Diff.h similarity index 100% rename from include/util/tensor/Diff.h rename to libs/util/include/util/tensor/Diff.h diff --git a/include/util/tensor/Index.h b/libs/util/include/util/tensor/Index.h similarity index 100% rename from include/util/tensor/Index.h rename to libs/util/include/util/tensor/Index.h diff --git a/include/util/tensor/IndexEnumerator.h b/libs/util/include/util/tensor/IndexEnumerator.h similarity index 100% rename from include/util/tensor/IndexEnumerator.h rename to libs/util/include/util/tensor/IndexEnumerator.h diff --git a/include/util/tensor/IndexFormatter.h b/libs/util/include/util/tensor/IndexFormatter.h similarity index 100% rename from include/util/tensor/IndexFormatter.h rename to libs/util/include/util/tensor/IndexFormatter.h diff --git a/include/util/tensor/IndexIterator.h b/libs/util/include/util/tensor/IndexIterator.h similarity index 100% rename from include/util/tensor/IndexIterator.h rename to libs/util/include/util/tensor/IndexIterator.h diff --git a/include/util/tensor/NonIncreasingStride.h b/libs/util/include/util/tensor/NonIncreasingStride.h similarity index 100% rename from include/util/tensor/NonIncreasingStride.h rename to libs/util/include/util/tensor/NonIncreasingStride.h diff --git a/include/util/tensor/Object.h b/libs/util/include/util/tensor/Object.h similarity index 100% rename from include/util/tensor/Object.h rename to libs/util/include/util/tensor/Object.h diff --git a/include/util/tensor/Reader.h b/libs/util/include/util/tensor/Reader.h similarity index 100% rename from include/util/tensor/Reader.h rename to libs/util/include/util/tensor/Reader.h diff --git a/include/util/tensor/Shape.h b/libs/util/include/util/tensor/Shape.h similarity index 100% rename from include/util/tensor/Shape.h rename to libs/util/include/util/tensor/Shape.h diff --git a/include/util/tensor/Zipper.h b/libs/util/include/util/tensor/Zipper.h similarity index 100% rename from include/util/tensor/Zipper.h rename to libs/util/include/util/tensor/Zipper.h diff --git a/include/util/vector.h b/libs/util/include/util/vector.h similarity index 100% rename from include/util/vector.h rename to libs/util/include/util/vector.h diff --git a/include/util/vector/Object.h b/libs/util/include/util/vector/Object.h similarity index 100% rename from include/util/vector/Object.h rename to libs/util/include/util/vector/Object.h diff --git a/include/util/vector/Reader.h b/libs/util/include/util/vector/Reader.h similarity index 100% rename from include/util/vector/Reader.h rename to libs/util/include/util/vector/Reader.h -- 2.7.4