Move libs/util/include/util to include/util (#1255)

To be consistent with other header files, this patch moves
`libs/util/include/util` to `include/util` and accordingly modifies
`libs/util/CMakeLists.txt`.

Signed-off-by: Sangmin Seo <sangmin7.seo@samsung.com>

diff --git a/libs/util/include/util/benchmark.h b/include/util/benchmark.h
similarity index 100%
rename from libs/util/include/util/benchmark.h
rename to include/util/benchmark.h

diff --git a/libs/util/include/util/environment.h b/include/util/environment.h
similarity index 100%
rename from libs/util/include/util/environment.h
rename to include/util/environment.h

diff --git a/libs/util/include/util/feature/Index.h b/include/util/feature/Index.h
similarity index 100%
rename from libs/util/include/util/feature/Index.h
rename to include/util/feature/Index.h

diff --git a/libs/util/include/util/feature/IndexIterator.h b/include/util/feature/IndexIterator.h
similarity index 100%
rename from libs/util/include/util/feature/IndexIterator.h
rename to include/util/feature/IndexIterator.h

diff --git a/libs/util/include/util/feature/Object.h b/include/util/feature/Object.h
similarity index 100%
rename from libs/util/include/util/feature/Object.h
rename to include/util/feature/Object.h

diff --git a/libs/util/include/util/feature/Reader.h b/include/util/feature/Reader.h
similarity index 100%
rename from libs/util/include/util/feature/Reader.h
rename to include/util/feature/Reader.h

diff --git a/libs/util/include/util/feature/Shape.h b/include/util/feature/Shape.h
similarity index 100%
rename from libs/util/include/util/feature/Shape.h
rename to include/util/feature/Shape.h

diff --git a/libs/util/include/util/feature/TextFormatter.h b/include/util/feature/TextFormatter.h
similarity index 100%
rename from libs/util/include/util/feature/TextFormatter.h
rename to include/util/feature/TextFormatter.h

diff --git a/libs/util/include/util/fp32.h b/include/util/fp32.h
similarity index 100%
rename from libs/util/include/util/fp32.h
rename to include/util/fp32.h

diff --git a/libs/util/include/util/kernel/IndexIterator.h b/include/util/kernel/IndexIterator.h
similarity index 100%
rename from libs/util/include/util/kernel/IndexIterator.h
rename to include/util/kernel/IndexIterator.h

diff --git a/libs/util/include/util/kernel/RandomObject.h b/include/util/kernel/RandomObject.h
similarity index 100%
rename from libs/util/include/util/kernel/RandomObject.h
rename to include/util/kernel/RandomObject.h

diff --git a/libs/util/include/util/kernel/Reader.h b/include/util/kernel/Reader.h
similarity index 100%
rename from libs/util/include/util/kernel/Reader.h
rename to include/util/kernel/Reader.h

diff --git a/libs/util/include/util/kernel/Shape.h b/include/util/kernel/Shape.h
similarity index 100%
rename from libs/util/include/util/kernel/Shape.h
rename to include/util/kernel/Shape.h

diff --git a/libs/util/include/util/tensor/Index.h b/include/util/tensor/Index.h
similarity index 100%
rename from libs/util/include/util/tensor/Index.h
rename to include/util/tensor/Index.h

diff --git a/libs/util/include/util/tensor/IndexFormatter.h b/include/util/tensor/IndexFormatter.h
similarity index 100%
rename from libs/util/include/util/tensor/IndexFormatter.h
rename to include/util/tensor/IndexFormatter.h

diff --git a/libs/util/include/util/tensor/IndexIterator.h b/include/util/tensor/IndexIterator.h
similarity index 100%
rename from libs/util/include/util/tensor/IndexIterator.h
rename to include/util/tensor/IndexIterator.h

diff --git a/libs/util/include/util/tensor/NonIncreasingStride.h b/include/util/tensor/NonIncreasingStride.h
similarity index 100%
rename from libs/util/include/util/tensor/NonIncreasingStride.h
rename to include/util/tensor/NonIncreasingStride.h

diff --git a/libs/util/include/util/tensor/Object.h b/include/util/tensor/Object.h
similarity index 100%
rename from libs/util/include/util/tensor/Object.h
rename to include/util/tensor/Object.h

diff --git a/libs/util/include/util/tensor/Reader.h b/include/util/tensor/Reader.h
similarity index 100%
rename from libs/util/include/util/tensor/Reader.h
rename to include/util/tensor/Reader.h

diff --git a/libs/util/include/util/tensor/Shape.h b/include/util/tensor/Shape.h
similarity index 100%
rename from libs/util/include/util/tensor/Shape.h
rename to include/util/tensor/Shape.h

diff --git a/libs/util/include/util/tensor/Zipper.h b/include/util/tensor/Zipper.h
similarity index 100%
rename from libs/util/include/util/tensor/Zipper.h
rename to include/util/tensor/Zipper.h

diff --git a/libs/util/include/util/vector.h b/include/util/vector.h
similarity index 100%
rename from libs/util/include/util/vector.h
rename to include/util/vector.h

diff --git a/libs/util/include/util/vector/Object.h b/include/util/vector/Object.h
similarity index 100%
rename from libs/util/include/util/vector/Object.h
rename to include/util/vector/Object.h

diff --git a/libs/util/include/util/vector/Reader.h b/include/util/vector/Reader.h
similarity index 100%
rename from libs/util/include/util/vector/Reader.h
rename to include/util/vector/Reader.h

diff --git a/libs/util/CMakeLists.txt b/libs/util/CMakeLists.txt
index 565aaf7..efd9829 100644 (file)
--- a/libs/util/CMakeLists.txt
+++ b/libs/util/CMakeLists.txt
@@ -4,8 +4,6 @@ list(APPEND NNFW_UTILITY_SRCS src/tensor/Shape.cpp)
 list(APPEND NNFW_UTILITY_SRCS src/tensor/NonIncreasingStride.cpp)
 list(APPEND NNFW_UTILITY_SRCS src/tensor/IndexFormatter.cpp)
 
-set(NNFW_INCLUDE_DIR include)
-
 add_library(nnfw_util SHARED ${NNFW_UTILITY_SRCS})
 target_include_directories(nnfw_util PUBLIC ${NNFW_INCLUDE_DIR})