Move cltuner generator location to /tools

Change-Id: Ic921f2a8455ba6825db7b71a3a0e869a7a8c2897
Signed-off-by: Hyunsoo Park <hance.park@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30eb6ae..072f3e8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,7 @@ CONFIGURE_FILE(
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name_common}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 ADD_SUBDIRECTORY(${PROJECT_SOURCE_DIR}/test)
+ADD_SUBDIRECTORY(${PROJECT_SOURCE_DIR}/tools)
 
 IF(UNIX)
 

diff --git a/packaging/inference-engine-interface.spec b/packaging/inference-engine-interface.spec
index 13eda93..1eeb9f8 100644 (file)
--- a/packaging/inference-engine-interface.spec
+++ b/packaging/inference-engine-interface.spec
@@ -74,7 +74,7 @@ install -m 755 test/bin/inference_engine_profiler %{buildroot}%{_bindir}
 install -m 755 test/bin/inference_engine_tc %{buildroot}%{_bindir}
 install -m 755 start_profiler.sh %{buildroot}%{_bindir}
 install -m 666 test/res/*.bin %{buildroot}/opt/usr/images
-install -m 755 test/bin/inference_engine_cltuner %{buildroot}%{_bindir}
+install -m 755 tools/bin/inference_engine_cltuner %{buildroot}%{_bindir}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig

diff --git a/test/src/CMakeLists.txt b/test/src/CMakeLists.txt
index 60fbe63..6a5f8b2 100644 (file)
--- a/test/src/CMakeLists.txt
+++ b/test/src/CMakeLists.txt
@@ -2,18 +2,12 @@ project(inference_engine_test)
 
 set(INFERENCE_ENGINE_TEST_CASE inference_engine_tc)
 set(INFERENCE_ENGINE_PROFILER inference_engine_profiler)
-set(INFERENCE_ENGINE_CLTUNER inference_engine_cltuner)
 
 set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG _DEBUG)
 
 find_package(GTest REQUIRED)
 set(GTEST_LIBRARY gtest)
 
-pkg_check_modules(${INFERENCE_ENGINE_CLTUNER} REQUIRED glib-2.0)
-FOREACH(flag ${${INFERENCE_ENGINE_CLTUNER}_CFLAGS})
-    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
 if(NOT SKIP_WARNINGS)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -Wall -Wextra -Werror")
 endif()
@@ -49,18 +43,4 @@ target_link_libraries(${INFERENCE_ENGINE_TEST_CASE} ${GTEST_LIBRARY}
                                       ${GTEST_MAIN_LIBRARY}
                                       ${INFERENCE_ENGINE_INTERFACE_LIB_NAME}
                                       dl
-                                      )
-
-add_executable(${INFERENCE_ENGINE_CLTUNER}
-               ${INFER_GTEST_INC_LIST}
-               ${PROJECT_SOURCE_DIR}/inference_engine_cltuner.cpp
-               ${PROJECT_SOURCE_DIR}/inference_engine_test_common.cpp
-               )
-
-target_link_libraries(${INFERENCE_ENGINE_CLTUNER} ${GTEST_LIBRARY}
-                                      ${GTEST_MAIN_LIBRARY}
-                                      ${INFERENCE_ENGINE_INTERFACE_LIB_NAME}
-                                      ${${INFERENCE_ENGINE_CLTUNER}_LDFLAGS}
-                                      glib-2.0
-                                      dl
                                       )
\ No newline at end of file

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
new file mode 100644 (file)
index 0000000..251690e
--- /dev/null
+++ b/tools/CMakeLists.txt
@@ -0,0 +1,43 @@
+project(inference_engine_test)
+
+set(INFERENCE_ENGINE_CLTUNER inference_engine_cltuner)
+
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG _DEBUG)
+
+
+find_package(GTest REQUIRED)
+set(GTEST_LIBRARY gtest)
+
+pkg_check_modules(${INFERENCE_ENGINE_CLTUNER} REQUIRED glib-2.0)
+FOREACH(flag ${${INFERENCE_ENGINE_CLTUNER}_CFLAGS})
+    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+if(NOT SKIP_WARNINGS)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -Wall -Wextra -Werror")
+endif()
+SET(INFERENCE_ENGINE_INTERFACE_LIB_NAME "inference-engine-interface-common")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tools/bin/)
+
+include_directories(${PROJECT_SOURCE_DIR})
+include_directories(${CMAKE_BINARY_DIR}/test/src)
+include_directories(${CMAKE_BINARY_DIR}/include)
+include_directories(/usr/include/gtest)
+include_directories(${GLIB_INCLUDE_DIRS})
+MESSAGE(STATUS ${CMAKE_BINARY_DIR} "is cmake_binary_dir")
+
+file(GLOB INFER_GTEST_INC_LIST "${PROJECT_SOURCE_DIR}/*.h")
+
+add_executable(${INFERENCE_ENGINE_CLTUNER}
+               ${INFER_GTEST_INC_LIST}
+               ${PROJECT_SOURCE_DIR}/inference_engine_cltuner.cpp
+               ${CMAKE_BINARY_DIR}/test/src/inference_engine_test_common.cpp
+               )
+
+target_link_libraries(${INFERENCE_ENGINE_CLTUNER} ${GTEST_LIBRARY}
+                                      ${GTEST_MAIN_LIBRARY}
+                                      ${INFERENCE_ENGINE_INTERFACE_LIB_NAME}
+                                      ${${INFERENCE_ENGINE_CLTUNER}_LDFLAGS}
+                                      glib-2.0
+                                      dl
+                                      )
\ No newline at end of file

diff --git a/test/src/inference_engine_cltuner.cpp b/tools/inference_engine_cltuner.cpp
similarity index 100%
rename from test/src/inference_engine_cltuner.cpp
rename to tools/inference_engine_cltuner.cpp