Move mv_inference into mv_machine_learning

Moved mv_inference directory in mv_machine_learning directory.

Mediavision will support not only inference API also learning API.
So it makes a mv_machine_learning directory on top of Mediavision,
and moves existing mv_inference into mv_machine_learning directory.

This is a first step for adding learning API support for Mediavision.

Change-Id: I2d8597064141b2392bfdad0854e08dadd8d98258
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dcfeb03..cbf0dd9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ set(MV_FACE_LIB_NAME "mv_face" CACHE STRING
        "Name of the library will be built for barcode generating module (without extension).")
 set(MV_SURVEILLANCE_LIB_NAME "mv_surveillance" CACHE STRING
        "Name of the library will be built for surveillance module (without extension).")
-set(MV_INFERENCE_LIB_NAME "mv_inference" CACHE STRING
+set(MV_MACHINE_LEARNING_LIB_NAME "mv_machine_learning" CACHE STRING
        "Name of the library will be built for inference module (without extension).")
 
 
@@ -79,9 +79,9 @@ endif()
 
 if(MEDIA_VISION_INFERENCE_LICENSE_PORT)
     add_definitions(-DMEDIA_VISION_INFERENCE_LICENSE_PORT)
-    SET(INC_INFERENCE "${PROJECT_SOURCE_DIR}/mv_inference/inference_lic/include")
+    SET(INC_INFERENCE "${PROJECT_SOURCE_DIR}/mv_machine_learning/mv_inference/inference_lic/include")
 else()
-    SET(INC_INFERENCE "${PROJECT_SOURCE_DIR}/mv_inference/inference/include")
+    SET(INC_INFERENCE "${PROJECT_SOURCE_DIR}/mv_machine_learning/mv_inference/inference/include")
 endif()
 
 INCLUDE_DIRECTORIES(${INC_DIR}
@@ -146,7 +146,7 @@ ADD_SUBDIRECTORY(mv_barcode)
 ADD_SUBDIRECTORY(mv_image)
 ADD_SUBDIRECTORY(mv_face)
 ADD_SUBDIRECTORY(mv_surveillance)
-ADD_SUBDIRECTORY(mv_inference)
+ADD_SUBDIRECTORY(mv_machine_learning)
 
 INSTALL(
         DIRECTORY ${INC_DIR}/ DESTINATION include/media
@@ -158,7 +158,7 @@ INSTALL(
 SET(PC_NAME ${fw_name})
 SET(PC_REQUIRED "${fw_name}-barcode ${fw_name}-face ${fw_name}-image ${fw_name}-surveillance ${fw_name}-inference")
 SET(PC_LDFLAGS "-l${MV_COMMON_LIB_NAME} -l${MV_BARCODE_DETECTOR_LIB_NAME} -l${MV_BARCODE_GENERATOR_LIB_NAME} \
--l${MV_IMAGE_LIB_NAME} -l${MV_FACE_LIB_NAME} -l${MV_SURVEILLANCE_LIB_NAME} -l${MV_INFERENCE_LIB_NAME}")
+-l${MV_IMAGE_LIB_NAME} -l${MV_FACE_LIB_NAME} -l${MV_SURVEILLANCE_LIB_NAME} -l${MV_MACHINE_LEARNING_LIB_NAME}")
 SET(PC_CFLAGS -I\${includedir}/media)
 
 CONFIGURE_FILE(
@@ -218,7 +218,7 @@ CONFIGURE_FILE(
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-surveillance.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 SET(PC_NAME ${fw_name}-inference)
-SET(PC_LDFLAGS "-l${MV_INFERENCE_LIB_NAME} -l${MV_COMMON_LIB_NAME}")
+SET(PC_LDFLAGS "-l${MV_MACHINE_LEARNING_LIB_NAME} -l${MV_COMMON_LIB_NAME}")
 CONFIGURE_FILE(
     ${fw_name}.pc.in
     ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-inference.pc

diff --git a/mv_machine_learning/CMakeLists.txt b/mv_machine_learning/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a941dd4
--- /dev/null
+++ b/mv_machine_learning/CMakeLists.txt
@@ -0,0 +1,4 @@
+project(mv_machine_learning)
+cmake_minimum_required(VERSION 2.6)
+
+ADD_SUBDIRECTORY(mv_inference)

diff --git a/mv_inference/CMakeLists.txt b/mv_machine_learning/mv_inference/CMakeLists.txt
similarity index 100%
rename from mv_inference/CMakeLists.txt
rename to mv_machine_learning/mv_inference/CMakeLists.txt

diff --git a/mv_inference/inference/CMakeLists.txt b/mv_machine_learning/mv_inference/inference/CMakeLists.txt
similarity index 98%
rename from mv_inference/inference/CMakeLists.txt
rename to mv_machine_learning/mv_inference/inference/CMakeLists.txt
index 05de57c..f8685d6 100644 (file)
--- a/mv_inference/inference/CMakeLists.txt
+++ b/mv_machine_learning/mv_inference/inference/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(${MV_INFERENCE_LIB_NAME})
+project(mv_inference)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 SET_PROPERTY(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG _DEBUG)

diff --git a/mv_inference/inference/include/Bvh.h b/mv_machine_learning/mv_inference/inference/include/Bvh.h
similarity index 100%
rename from mv_inference/inference/include/Bvh.h
rename to mv_machine_learning/mv_inference/inference/include/Bvh.h

diff --git a/mv_inference/inference/include/BvhParser.h b/mv_machine_learning/mv_inference/inference/include/BvhParser.h
similarity index 100%
rename from mv_inference/inference/include/BvhParser.h
rename to mv_machine_learning/mv_inference/inference/include/BvhParser.h

diff --git a/mv_inference/inference/include/BvhUtils.h b/mv_machine_learning/mv_inference/inference/include/BvhUtils.h
similarity index 100%
rename from mv_inference/inference/include/BvhUtils.h
rename to mv_machine_learning/mv_inference/inference/include/BvhUtils.h

diff --git a/mv_inference/inference/include/Inference.h b/mv_machine_learning/mv_inference/inference/include/Inference.h
similarity index 100%
rename from mv_inference/inference/include/Inference.h
rename to mv_machine_learning/mv_inference/inference/include/Inference.h

diff --git a/mv_inference/inference/include/InferenceIni.h b/mv_machine_learning/mv_inference/inference/include/InferenceIni.h
similarity index 100%
rename from mv_inference/inference/include/InferenceIni.h
rename to mv_machine_learning/mv_inference/inference/include/InferenceIni.h

diff --git a/mv_inference/inference/include/InputMetadata.h b/mv_machine_learning/mv_inference/inference/include/InputMetadata.h
similarity index 100%
rename from mv_inference/inference/include/InputMetadata.h
rename to mv_machine_learning/mv_inference/inference/include/InputMetadata.h

diff --git a/mv_inference/inference/include/Joint.h b/mv_machine_learning/mv_inference/inference/include/Joint.h
similarity index 100%
rename from mv_inference/inference/include/Joint.h
rename to mv_machine_learning/mv_inference/inference/include/Joint.h

diff --git a/mv_inference/inference/include/Metadata.h b/mv_machine_learning/mv_inference/inference/include/Metadata.h
similarity index 100%
rename from mv_inference/inference/include/Metadata.h
rename to mv_machine_learning/mv_inference/inference/include/Metadata.h

diff --git a/mv_inference/inference/include/ObjectDecoder.h b/mv_machine_learning/mv_inference/inference/include/ObjectDecoder.h
similarity index 100%
rename from mv_inference/inference/include/ObjectDecoder.h
rename to mv_machine_learning/mv_inference/inference/include/ObjectDecoder.h

diff --git a/mv_inference/inference/include/OutputMetadata.h b/mv_machine_learning/mv_inference/inference/include/OutputMetadata.h
similarity index 100%
rename from mv_inference/inference/include/OutputMetadata.h
rename to mv_machine_learning/mv_inference/inference/include/OutputMetadata.h

diff --git a/mv_inference/inference/include/PostProcess.h b/mv_machine_learning/mv_inference/inference/include/PostProcess.h
similarity index 100%
rename from mv_inference/inference/include/PostProcess.h
rename to mv_machine_learning/mv_inference/inference/include/PostProcess.h

diff --git a/mv_inference/inference/include/Posture.h b/mv_machine_learning/mv_inference/inference/include/Posture.h
similarity index 100%
rename from mv_inference/inference/include/Posture.h
rename to mv_machine_learning/mv_inference/inference/include/Posture.h

diff --git a/mv_inference/inference/include/PreProcess.h b/mv_machine_learning/mv_inference/inference/include/PreProcess.h
similarity index 100%
rename from mv_inference/inference/include/PreProcess.h
rename to mv_machine_learning/mv_inference/inference/include/PreProcess.h

diff --git a/mv_inference/inference/include/TensorBuffer.h b/mv_machine_learning/mv_inference/inference/include/TensorBuffer.h
similarity index 100%
rename from mv_inference/inference/include/TensorBuffer.h
rename to mv_machine_learning/mv_inference/inference/include/TensorBuffer.h

diff --git a/mv_inference/inference/include/mv_inference_open.h b/mv_machine_learning/mv_inference/inference/include/mv_inference_open.h
similarity index 100%
rename from mv_inference/inference/include/mv_inference_open.h
rename to mv_machine_learning/mv_inference/inference/include/mv_inference_open.h

diff --git a/mv_inference/inference/src/Bvh.cpp b/mv_machine_learning/mv_inference/inference/src/Bvh.cpp
similarity index 100%
rename from mv_inference/inference/src/Bvh.cpp
rename to mv_machine_learning/mv_inference/inference/src/Bvh.cpp

diff --git a/mv_inference/inference/src/BvhParser.cpp b/mv_machine_learning/mv_inference/inference/src/BvhParser.cpp
similarity index 100%
rename from mv_inference/inference/src/BvhParser.cpp
rename to mv_machine_learning/mv_inference/inference/src/BvhParser.cpp

diff --git a/mv_inference/inference/src/BvhUtils.cpp b/mv_machine_learning/mv_inference/inference/src/BvhUtils.cpp
similarity index 100%
rename from mv_inference/inference/src/BvhUtils.cpp
rename to mv_machine_learning/mv_inference/inference/src/BvhUtils.cpp

diff --git a/mv_inference/inference/src/Inference.cpp b/mv_machine_learning/mv_inference/inference/src/Inference.cpp
similarity index 100%
rename from mv_inference/inference/src/Inference.cpp
rename to mv_machine_learning/mv_inference/inference/src/Inference.cpp

diff --git a/mv_inference/inference/src/InferenceIni.cpp b/mv_machine_learning/mv_inference/inference/src/InferenceIni.cpp
similarity index 100%
rename from mv_inference/inference/src/InferenceIni.cpp
rename to mv_machine_learning/mv_inference/inference/src/InferenceIni.cpp

diff --git a/mv_inference/inference/src/InputMetadata.cpp b/mv_machine_learning/mv_inference/inference/src/InputMetadata.cpp
similarity index 100%
rename from mv_inference/inference/src/InputMetadata.cpp
rename to mv_machine_learning/mv_inference/inference/src/InputMetadata.cpp

diff --git a/mv_inference/inference/src/Metadata.cpp b/mv_machine_learning/mv_inference/inference/src/Metadata.cpp
similarity index 100%
rename from mv_inference/inference/src/Metadata.cpp
rename to mv_machine_learning/mv_inference/inference/src/Metadata.cpp

diff --git a/mv_inference/inference/src/ObjectDecoder.cpp b/mv_machine_learning/mv_inference/inference/src/ObjectDecoder.cpp
similarity index 100%
rename from mv_inference/inference/src/ObjectDecoder.cpp
rename to mv_machine_learning/mv_inference/inference/src/ObjectDecoder.cpp

diff --git a/mv_inference/inference/src/OutputMetadata.cpp b/mv_machine_learning/mv_inference/inference/src/OutputMetadata.cpp
similarity index 100%
rename from mv_inference/inference/src/OutputMetadata.cpp
rename to mv_machine_learning/mv_inference/inference/src/OutputMetadata.cpp

diff --git a/mv_inference/inference/src/PostProcess.cpp b/mv_machine_learning/mv_inference/inference/src/PostProcess.cpp
similarity index 100%
rename from mv_inference/inference/src/PostProcess.cpp
rename to mv_machine_learning/mv_inference/inference/src/PostProcess.cpp

diff --git a/mv_inference/inference/src/Posture.cpp b/mv_machine_learning/mv_inference/inference/src/Posture.cpp
similarity index 100%
rename from mv_inference/inference/src/Posture.cpp
rename to mv_machine_learning/mv_inference/inference/src/Posture.cpp

diff --git a/mv_inference/inference/src/PreProcess.cpp b/mv_machine_learning/mv_inference/inference/src/PreProcess.cpp
similarity index 100%
rename from mv_inference/inference/src/PreProcess.cpp
rename to mv_machine_learning/mv_inference/inference/src/PreProcess.cpp

diff --git a/mv_inference/inference/src/TensorBuffer.cpp b/mv_machine_learning/mv_inference/inference/src/TensorBuffer.cpp
similarity index 100%
rename from mv_inference/inference/src/TensorBuffer.cpp
rename to mv_machine_learning/mv_inference/inference/src/TensorBuffer.cpp

diff --git a/mv_inference/inference/src/mv_inference.c b/mv_machine_learning/mv_inference/inference/src/mv_inference.c
similarity index 100%
rename from mv_inference/inference/src/mv_inference.c
rename to mv_machine_learning/mv_inference/inference/src/mv_inference.c

diff --git a/mv_inference/inference/src/mv_inference_open.cpp b/mv_machine_learning/mv_inference/inference/src/mv_inference_open.cpp
similarity index 100%
rename from mv_inference/inference/src/mv_inference_open.cpp
rename to mv_machine_learning/mv_inference/inference/src/mv_inference_open.cpp

diff --git a/test/testsuites/CMakeLists.txt b/test/testsuites/CMakeLists.txt
index 389e611..8cf1dbe 100644 (file)
--- a/test/testsuites/CMakeLists.txt
+++ b/test/testsuites/CMakeLists.txt
@@ -10,4 +10,4 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/barcode)
 add_subdirectory(${PROJECT_SOURCE_DIR}/face)
 add_subdirectory(${PROJECT_SOURCE_DIR}/image)
 add_subdirectory(${PROJECT_SOURCE_DIR}/surveillance)
-add_subdirectory(${PROJECT_SOURCE_DIR}/inference)
+add_subdirectory(${PROJECT_SOURCE_DIR}/machine_learning)

diff --git a/test/testsuites/machine_learning/CMakeLists.txt b/test/testsuites/machine_learning/CMakeLists.txt
new file mode 100644 (file)
index 0000000..57785be
--- /dev/null
+++ b/test/testsuites/machine_learning/CMakeLists.txt
@@ -0,0 +1,4 @@
+project(machine_learning)
+cmake_minimum_required(VERSION 2.6)
+
+add_subdirectory(${PROJECT_SOURCE_DIR}/inference)

diff --git a/test/testsuites/inference/CMakeLists.txt b/test/testsuites/machine_learning/inference/CMakeLists.txt
similarity index 94%
rename from test/testsuites/inference/CMakeLists.txt
rename to test/testsuites/machine_learning/inference/CMakeLists.txt
index dcd1434..c72e260 100644 (file)
--- a/test/testsuites/inference/CMakeLists.txt
+++ b/test/testsuites/machine_learning/inference/CMakeLists.txt
@@ -23,7 +23,7 @@ add_executable(${PROJECT_NAME}
                ${MV_INFER_TEST_SUITE_SRC_LIST}
                ${MV_CAPI_MEDIA_VISION_INC_LIST})
 
-target_link_libraries(${PROJECT_NAME} ${MV_INFERENCE_LIB_NAME}
+target_link_libraries(${PROJECT_NAME} mv_inference
                                       mv_image_helper
                                       mv_video_helper
                                       mv_testsuite_common)

diff --git a/test/testsuites/inference/inference_test_suite.c b/test/testsuites/machine_learning/inference/inference_test_suite.c
similarity index 100%
rename from test/testsuites/inference/inference_test_suite.c
rename to test/testsuites/machine_learning/inference/inference_test_suite.c