Merge branch 'tizen_devel' into tizenaccepted/tizen/unified/x/20240308.033352accepted/tizen/unified/toolchain/20240311.065138accepted/tizen/unified/20240306.174221

[Version] 0.35.0

Inki Dae (1):
  mv_machine_learning: initialize backend type correctly

Kwanghoon Son (8):
  Fix compiler warning
  clang-format: Turn on SortUsingDeclarations
  clang-format: Add missing header
  Support ubuntu build
  Cmake: Fix wrong dependency
  Enable mv_machine_learning build
  Apply clang-format sort include
  Add mv_test on non-tizen build

Change-Id: I4ed76520d5d85a0161fa7b5cdab2fd9eb3deef15
Signed-off-by: Kwanghoon Son <k.son@samsung.com>

25 files changed, 93 insertions, 86 deletions

diff --git a/mv_machine_learning/inference/include/BoxInfo.h b/mv_machine_learning/inference/include/BoxInfo.h
index 1414bfb8..b64d2589 100644
--- a/mv_machine_learning/inference/include/BoxInfo.h
+++ b/mv_machine_learning/inference/include/BoxInfo.h
@@ -17,14 +17,14 @@
 #ifndef __BOX_INFO_H__
 #define __BOX_INFO_H__
 
-#include <string>
-#include <vector>
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
+#include <inference_engine_type.h>
 #include <json-glib/json-glib.h>
 #include <mv_inference_type.h>
-#include <inference_engine_type.h>
 
 #include "DecodeInfo.h"
 #include "DimInfo.h"
diff --git a/mv_machine_learning/inference/include/Bvh.h b/mv_machine_learning/inference/include/Bvh.h
index 150671e4..9186c4de 100644
--- a/mv_machine_learning/inference/include/Bvh.h
+++ b/mv_machine_learning/inference/include/Bvh.h
@@ -1,10 +1,10 @@
 #ifndef __MEDIA_VISION_BVH_H__
 #define __MEDIA_VISION_BVH_H__
 
-#include <opencv2/core.hpp>
-#include <opencv2/imgproc.hpp>
 #include "Joint.h"
 #include <memory>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
 #include <vector>
 
 namespace mediavision
diff --git a/mv_machine_learning/inference/include/DecodeInfo.h b/mv_machine_learning/inference/include/DecodeInfo.h
index f3b2afe1..9e4817ee 100644
--- a/mv_machine_learning/inference/include/DecodeInfo.h
+++ b/mv_machine_learning/inference/include/DecodeInfo.h
@@ -17,15 +17,15 @@
 #ifndef __DECODE_INFO_H__
 #define __DECODE_INFO_H__
 
-#include <string>
-#include <vector>
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
+#include "Utils.h"
 #include <MetadataType.h>
 #include <mv_inference_type.h>
 #include <opencv2/core.hpp>
-#include "Utils.h"
 
 namespace mediavision
 {
diff --git a/mv_machine_learning/inference/include/DimInfo.h b/mv_machine_learning/inference/include/DimInfo.h
index 68c3df77..744d9a47 100644
--- a/mv_machine_learning/inference/include/DimInfo.h
+++ b/mv_machine_learning/inference/include/DimInfo.h
@@ -17,8 +17,8 @@
 #ifndef __DIM_INFO_H__
 #define __DIM_INFO_H__
 
-#include <vector>
 #include <dlog.h>
+#include <vector>
 
 namespace mediavision
 {
diff --git a/mv_machine_learning/inference/include/DispVec.h b/mv_machine_learning/inference/include/DispVec.h
index 9860be7a..7147ad47 100644
--- a/mv_machine_learning/inference/include/DispVec.h
+++ b/mv_machine_learning/inference/include/DispVec.h
@@ -17,15 +17,17 @@
 #ifndef __DISP_VEC_H__
 #define __DISP_VEC_H__
 
-#include <string>
-#include <vector>
-#include <map>
-#include <memory>
-
-#include <mv_inference_type.h>
 #include "DimInfo.h"
+#include "MetadataType.h"
 #include "Utils.h"
 
+#include <mv_inference_type.h>
+
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
 namespace mediavision
 {
 namespace inference
diff --git a/mv_machine_learning/inference/include/Edge.h b/mv_machine_learning/inference/include/Edge.h
index 338bee1d..893ce9ca 100644
--- a/mv_machine_learning/inference/include/Edge.h
+++ b/mv_machine_learning/inference/include/Edge.h
@@ -17,10 +17,13 @@
 #ifndef __EDGE_H__
 #define __EDGE_H__
 
-#include <vector>
 #include <mv_inference_type.h>
+#include <mv_private.h>
+
 #include <json-glib/json-glib.h>
 
+#include <vector>
+
 namespace mediavision
 {
 namespace inference
diff --git a/mv_machine_learning/inference/include/Inference.h b/mv_machine_learning/inference/include/Inference.h
index 576a6302..bf4e4723 100644
--- a/mv_machine_learning/inference/include/Inference.h
+++ b/mv_machine_learning/inference/include/Inference.h
@@ -17,23 +17,23 @@
 #ifndef __MEDIA_VISION_INFERENCE_H__
 #define __MEDIA_VISION_INFERENCE_H__
 
-#include <string>
 #include <map>
 #include <memory>
+#include <string>
 
-#include "mv_common.h"
-#include "inference_engine_error.h"
+#include "MetaParser.h"
+#include "Metadata.h"
+#include "PostProcess.h"
+#include "PreProcess.h"
+#include "TensorBuffer.h"
 #include "inference_engine_common_impl.h"
+#include "inference_engine_error.h"
+#include "mv_common.h"
 #include "mv_inference_private.h"
+#include "types.h"
 #include <mv_inference_type.h>
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>
-#include "types.h"
-#include "Metadata.h"
-#include "MetaParser.h"
-#include "PreProcess.h"
-#include "PostProcess.h"
-#include "TensorBuffer.h"
 
 #include "Landmark.h"
 
diff --git a/mv_machine_learning/inference/include/InferenceIni.h b/mv_machine_learning/inference/include/InferenceIni.h
index 6f95a0ac..b1ca63bb 100644
--- a/mv_machine_learning/inference/include/InferenceIni.h
+++ b/mv_machine_learning/inference/include/InferenceIni.h
@@ -17,9 +17,9 @@
 #ifndef __MEDIA_VISION_INFERENCE_INI_H__
 #define __MEDIA_VISION_INFERENCE_INI_H__
 
+#include <mv_inference_type.h>
 #include <string>
 #include <vector>
-#include <mv_inference_type.h>
 
 namespace mediavision
 {
diff --git a/mv_machine_learning/inference/include/InputMetadata.h b/mv_machine_learning/inference/include/InputMetadata.h
index b7f45b58..fc9b3ee1 100644
--- a/mv_machine_learning/inference/include/InputMetadata.h
+++ b/mv_machine_learning/inference/include/InputMetadata.h
@@ -17,9 +17,9 @@
 #ifndef __MEDIA_VISION_INPUTMETADATA_H__
 #define __MEDIA_VISION_INPUTMETADATA_H__
 
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
 
 #include "MetadataType.h"
 #include <inference_engine_type.h>
diff --git a/mv_machine_learning/inference/include/Joint.h b/mv_machine_learning/inference/include/Joint.h
index 6632f979..4c805f74 100644
--- a/mv_machine_learning/inference/include/Joint.h
+++ b/mv_machine_learning/inference/include/Joint.h
@@ -1,8 +1,8 @@
 #ifndef __MEDIA_VISION_JOINT_H__
 #define __MEDIA_VISION_JOINT_H__
 
-#include <opencv2/core.hpp>
 #include <memory>
+#include <opencv2/core.hpp>
 #include <string>
 #include <vector>
 
diff --git a/mv_machine_learning/inference/include/LabelInfo.h b/mv_machine_learning/inference/include/LabelInfo.h
index 81cd66f6..dc4dfab4 100644
--- a/mv_machine_learning/inference/include/LabelInfo.h
+++ b/mv_machine_learning/inference/include/LabelInfo.h
@@ -17,14 +17,14 @@
 #ifndef __LABEL_INFO_H__
 #define __LABEL_INFO_H__
 
-#include <string>
-#include <vector>
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
+#include <inference_engine_type.h>
 #include <json-glib/json-glib.h>
 #include <mv_inference_type.h>
-#include <inference_engine_type.h>
 
 #include "DecodeInfo.h"
 #include "DimInfo.h"
diff --git a/mv_machine_learning/inference/include/Landmark.h b/mv_machine_learning/inference/include/Landmark.h
index a691ef0a..8f2c6d86 100644
--- a/mv_machine_learning/inference/include/Landmark.h
+++ b/mv_machine_learning/inference/include/Landmark.h
@@ -17,16 +17,18 @@
 #ifndef __LANDMARK_H__
 #define __LANDMARK_H__
 
-#include <string>
-#include <vector>
-#include <map>
-
-#include <opencv2/core.hpp>
-#include <json-glib/json-glib.h>
 #include "DimInfo.h"
 #include "DispVec.h"
+#include "Edge.h"
 #include "Utils.h"
 
+#include <json-glib/json-glib.h>
+#include <opencv2/core.hpp>
+
+#include <map>
+#include <string>
+#include <vector>
+
 /**
  * @file Landmark.h
  * @brief This file contains the Landmark class definition which
diff --git a/mv_machine_learning/inference/include/Metadata.h b/mv_machine_learning/inference/include/Metadata.h
index b12fc75e..3d653f57 100644
--- a/mv_machine_learning/inference/include/Metadata.h
+++ b/mv_machine_learning/inference/include/Metadata.h
@@ -17,15 +17,15 @@
 #ifndef __MEDIA_VISION_METADATA_H__
 #define __MEDIA_VISION_METADATA_H__
 
-#include <string>
 #include <map>
+#include <string>
 
-#include "mv_common.h"
-#include "mv_inference_private.h"
-#include <mv_inference_type.h>
 #include "InputMetadata.h"
 #include "OutputMetadata.h"
+#include "mv_common.h"
+#include "mv_inference_private.h"
 #include <json-glib/json-glib.h>
+#include <mv_inference_type.h>
 
 /**
  * @file Metadata.h
diff --git a/mv_machine_learning/inference/include/MetadataType.h b/mv_machine_learning/inference/include/MetadataType.h
index 6b76140f..f5483b49 100644
--- a/mv_machine_learning/inference/include/MetadataType.h
+++ b/mv_machine_learning/inference/include/MetadataType.h
@@ -17,9 +17,9 @@
 #ifndef __MEDIA_VISION_OUTPUTMETADATA_TYPES_H__
 #define __MEDIA_VISION_OUTPUTMETADATA_TYPES_H__
 
+#include <inference_engine_type.h>
 #include <mv_common.h>
 #include <mv_inference_type.h>
-#include <inference_engine_type.h>
 
 /**
  * @file OutputMetadataTypes.h
diff --git a/mv_machine_learning/inference/include/NumberInfo.h b/mv_machine_learning/inference/include/NumberInfo.h
index 7c51799c..6a0451f4 100644
--- a/mv_machine_learning/inference/include/NumberInfo.h
+++ b/mv_machine_learning/inference/include/NumberInfo.h
@@ -17,14 +17,14 @@
 #ifndef __NUMBER_INFO_H__
 #define __NUMBER_INFO_H__
 
-#include <string>
-#include <vector>
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
+#include <inference_engine_type.h>
 #include <json-glib/json-glib.h>
 #include <mv_inference_type.h>
-#include <inference_engine_type.h>
 
 #include "DecodeInfo.h"
 #include "DimInfo.h"
diff --git a/mv_machine_learning/inference/include/ObjectDecoder.h b/mv_machine_learning/inference/include/ObjectDecoder.h
index bbc33a4d..feff65c4 100644
--- a/mv_machine_learning/inference/include/ObjectDecoder.h
+++ b/mv_machine_learning/inference/include/ObjectDecoder.h
@@ -17,15 +17,15 @@
 #ifndef __MEDIA_VISION_OBJECTDECODER_H__
 #define __MEDIA_VISION_OBJECTDECODER_H__
 
-#include <string>
-#include <vector>
-#include <map>
 #include <list>
+#include <map>
 #include <opencv2/core.hpp>
+#include <string>
+#include <vector>
 
-#include "TensorBuffer.h"
 #include "OutputMetadata.h"
 #include "PostProcess.h"
+#include "TensorBuffer.h"
 
 /**
  * @file ObjectDecoder.h
diff --git a/mv_machine_learning/inference/include/OffsetVec.h b/mv_machine_learning/inference/include/OffsetVec.h
index 6b3746e6..b714725e 100644
--- a/mv_machine_learning/inference/include/OffsetVec.h
+++ b/mv_machine_learning/inference/include/OffsetVec.h
@@ -17,13 +17,13 @@
 #ifndef __OFFSET_VEC_H__
 #define __OFFSET_VEC_H__
 
+#include <memory>
 #include <string>
 #include <vector>
-#include <memory>
 
-#include <mv_inference_type.h>
 #include "DimInfo.h"
 #include "Utils.h"
+#include <mv_inference_type.h>
 
 namespace mediavision
 {
diff --git a/mv_machine_learning/inference/include/OutputMetadata.h b/mv_machine_learning/inference/include/OutputMetadata.h
index f04bc23e..9d9ebccc 100644
--- a/mv_machine_learning/inference/include/OutputMetadata.h
+++ b/mv_machine_learning/inference/include/OutputMetadata.h
@@ -17,26 +17,26 @@
 #ifndef __MEDIA_VISION_OUTPUTMETADATA_H__
 #define __MEDIA_VISION_OUTPUTMETADATA_H__
 
-#include <string>
-#include <vector>
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
-#include <mv_inference_type.h>
-#include <inference_engine_type.h>
-#include <json-glib/json-glib.h>
-#include <opencv2/core.hpp>
-#include "MetadataType.h"
+#include "BoxInfo.h"
 #include "DecodeInfo.h"
-#include "Edge.h"
-#include "DispVec.h"
 #include "DimInfo.h"
-#include "OffsetVec.h"
-#include "Landmark.h"
-#include "BoxInfo.h"
+#include "DispVec.h"
+#include "Edge.h"
 #include "LabelInfo.h"
+#include "Landmark.h"
+#include "MetadataType.h"
 #include "NumberInfo.h"
+#include "OffsetVec.h"
 #include "ScoreInfo.h"
+#include <inference_engine_type.h>
+#include <json-glib/json-glib.h>
+#include <mv_inference_type.h>
+#include <opencv2/core.hpp>
 
 /**
  * @file OutputMetadata.h
diff --git a/mv_machine_learning/inference/include/PoseDecoder.h b/mv_machine_learning/inference/include/PoseDecoder.h
index 22e3fc15..dbe12a22 100644
--- a/mv_machine_learning/inference/include/PoseDecoder.h
+++ b/mv_machine_learning/inference/include/PoseDecoder.h
@@ -17,14 +17,14 @@
 #ifndef __MEDIA_VISION_POSEDECODER_H__
 #define __MEDIA_VISION_POSEDECODER_H__
 
+#include <list>
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
-#include <list>
 
-#include "TensorBuffer.h"
-#include "OutputMetadata.h"
 #include "Landmark.h"
+#include "OutputMetadata.h"
+#include "TensorBuffer.h"
 
 /**
  * @file PoseDecoder.h
diff --git a/mv_machine_learning/inference/include/PostProcess.h b/mv_machine_learning/inference/include/PostProcess.h
index 8a097d73..0d00d662 100644
--- a/mv_machine_learning/inference/include/PostProcess.h
+++ b/mv_machine_learning/inference/include/PostProcess.h
@@ -17,12 +17,12 @@
 #ifndef __MEDIA_VISION_POSTPROCESS_H__
 #define __MEDIA_VISION_POSTPROCESS_H__
 
-#include <string>
 #include <map>
 #include <queue>
+#include <string>
 
-#include "mv_common.h"
 #include "OutputMetadata.h"
+#include "mv_common.h"
 
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>
diff --git a/mv_machine_learning/inference/include/Posture.h b/mv_machine_learning/inference/include/Posture.h
index 0359d70c..6dbb4b3b 100644
--- a/mv_machine_learning/inference/include/Posture.h
+++ b/mv_machine_learning/inference/include/Posture.h
@@ -17,13 +17,13 @@
 #ifndef __MEDIA_VISION_POSE_H__
 #define __MEDIA_VISION_POSE_H__
 
-#include <string>
 #include <map>
+#include <string>
 
-#include "mv_common.h"
-#include "Inference.h"
 #include "Bvh.h"
 #include "BvhParser.h"
+#include "Inference.h"
+#include "mv_common.h"
 #include <mv_inference_type.h>
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>
diff --git a/mv_machine_learning/inference/include/PreProcess.h b/mv_machine_learning/inference/include/PreProcess.h
index bdb63768..18c0ef62 100644
--- a/mv_machine_learning/inference/include/PreProcess.h
+++ b/mv_machine_learning/inference/include/PreProcess.h
@@ -15,13 +15,13 @@
  */
 
 #ifndef __MEDIA_VISION_PREPROCESS_H__
-#define __MEDIA_VISION_PREPORCESS_H__
+#define __MEDIA_VISION_PREPROCESS_H__
 
-#include <string>
 #include <map>
+#include <string>
 
-#include "mv_common.h"
 #include "InputMetadata.h"
+#include "mv_common.h"
 
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>
diff --git a/mv_machine_learning/inference/include/ScoreInfo.h b/mv_machine_learning/inference/include/ScoreInfo.h
index 2ebeddc9..2b993bf2 100644
--- a/mv_machine_learning/inference/include/ScoreInfo.h
+++ b/mv_machine_learning/inference/include/ScoreInfo.h
@@ -17,16 +17,16 @@
 #ifndef __SCORE_INFO_H__
 #define __SCORE_INFO_H__
 
-#include <string>
-#include <vector>
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
-#include <mv_inference_type.h>
-#include <mv_private.h>
-#include <MetadataType.h>
 #include "DimInfo.h"
 #include "Utils.h"
+#include <MetadataType.h>
+#include <mv_inference_type.h>
+#include <mv_private.h>
 
 namespace mediavision
 {
diff --git a/mv_machine_learning/inference/include/TensorBuffer.h b/mv_machine_learning/inference/include/TensorBuffer.h
index c4654cd9..36e4271e 100644
--- a/mv_machine_learning/inference/include/TensorBuffer.h
+++ b/mv_machine_learning/inference/include/TensorBuffer.h
@@ -17,13 +17,13 @@
 #ifndef __MEDIA_VISION_TENSORBUFFER_H__
 #define __MEDIA_VISION_TENSORBUFFER_H__
 
-#include <string>
-#include <map>
-#include <variant>
 #include "mv_common.h"
 #include "mv_inference_private.h"
 #include <inference_engine_type.h>
+#include <map>
 #include <mv_inference_type.h>
+#include <string>
+#include <variant>
 
 /**
  * @file TensorBuffer.h
diff --git a/mv_machine_learning/inference/include/Utils.h b/mv_machine_learning/inference/include/Utils.h
index 404924b1..949cace5 100644
--- a/mv_machine_learning/inference/include/Utils.h
+++ b/mv_machine_learning/inference/include/Utils.h
@@ -17,14 +17,14 @@
 #ifndef __UTILS_H__
 #define __UTILS_H__
 
-#include <string>
-#include <vector>
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
+#include <dlog.h>
 #include <json-glib/json-glib.h>
 #include <stdexcept>
-#include <dlog.h>
 
 namespace mediavision
 {