diff options
author | Inki Dae <inki.dae@samsung.com> | 2024-01-10 15:36:35 +0900 |
---|---|---|
committer | Inki Dae <inki.dae@samsung.com> | 2024-01-17 13:19:59 +0900 |
commit | eb2d65dd6e4cee21a97c69d9fbacec0eda17692d (patch) | |
tree | 2bdf55642da372c5ae84df9eaf20f11b49943500 | |
parent | 7db97ca0b3d957b2444fa8e6ba685184c3c8af19 (diff) | |
download | mediavision-eb2d65dd6e4cee21a97c69d9fbacec0eda17692d.tar.gz mediavision-eb2d65dd6e4cee21a97c69d9fbacec0eda17692d.tar.bz2 mediavision-eb2d65dd6e4cee21a97c69d9fbacec0eda17692d.zip |
mv_machine_learning: rename file names
[Issue type] code clean
Rename file names of mv_machine_learning according to Tizen coding style
document.[1]
Below are rules used in this patch,
- Class module refered by external modules uses "NanespaceClassname.*"
- Class module used internally uses "Classname.*"
. If "Classname" is duplicated with other task group then sub directory
name can be added as a prefix.
- Non class file referred by external modules uses "namespace_filename.*"
- Non class file used internally uses "filename.*"
. If "filename" is duplicated with other task group then sub directory
name can be added as a prefix.
[1] https://wiki.tizen.org/Native_Platform_Coding_Idiom_and_Style_Guide
Change-Id: I0fe3a95a1b5b88b294e2d00ad1fe489143d6cd7d
Signed-off-by: Inki Dae <inki.dae@samsung.com>
-rw-r--r-- | mv_machine_learning/common/CMakeLists.txt | 8 | ||||
-rw-r--r-- | mv_machine_learning/common/include/AsyncManager.h (renamed from mv_machine_learning/common/include/async_manager.h) | 2 | ||||
-rw-r--r-- | mv_machine_learning/common/include/Context.h (renamed from mv_machine_learning/common/include/context.h) | 2 | ||||
-rw-r--r-- | mv_machine_learning/common/include/ITask.h (renamed from mv_machine_learning/common/include/itask.h) | 2 | ||||
-rw-r--r-- | mv_machine_learning/common/include/MvMlConfig.h (renamed from mv_machine_learning/common/include/machine_learning_config.h) | 10 | ||||
-rw-r--r-- | mv_machine_learning/common/include/MvMlException.h (renamed from mv_machine_learning/common/include/machine_learning_exception.h) | 6 | ||||
-rw-r--r-- | mv_machine_learning/common/include/common.h (renamed from mv_machine_learning/common/include/mv_machine_learning_common.h) | 4 | ||||
-rw-r--r-- | mv_machine_learning/common/include/keys.h (renamed from mv_machine_learning/common/include/machine_learning_key.h) | 6 | ||||
-rw-r--r-- | mv_machine_learning/common/include/mv_ml_types.h (renamed from mv_machine_learning/common/include/MachineLearningType.h) | 4 | ||||
-rw-r--r-- | mv_machine_learning/common/include/native_capi.h (renamed from mv_machine_learning/common/include/MachineLearningNative.h) | 11 | ||||
-rw-r--r-- | mv_machine_learning/common/meta/include/MvMlPreprocess.h (renamed from mv_machine_learning/common/meta/include/machine_learning_preprocess.h) | 8 | ||||
-rw-r--r-- | mv_machine_learning/common/meta/include/meta_common.h (renamed from mv_machine_learning/common/meta/include/common.h) | 2 | ||||
-rw-r--r-- | mv_machine_learning/common/meta/src/MetaParser.cpp | 4 | ||||
-rw-r--r-- | mv_machine_learning/common/meta/src/MvMlPreprocess.cpp (renamed from mv_machine_learning/common/meta/src/machine_learning_preprocess.cpp) | 4 | ||||
-rw-r--r-- | mv_machine_learning/common/meta/src/PostprocessParser.cpp | 4 | ||||
-rw-r--r-- | mv_machine_learning/common/src/MvMlConfig.cpp (renamed from mv_machine_learning/common/src/machine_learning_config.cpp) | 40 | ||||
-rw-r--r-- | mv_machine_learning/common/src/native_capi.cpp (renamed from mv_machine_learning/common/src/MachineLearningNative.cpp) | 4 | ||||
-rw-r--r-- | mv_machine_learning/face_recognition/include/FaceRecognition.h (renamed from mv_machine_learning/face_recognition/include/face_recognition.h) | 10 | ||||
-rw-r--r-- | mv_machine_learning/face_recognition/include/FaceRecognitionAdapter.h (renamed from mv_machine_learning/face_recognition/include/face_recognition_adapter.h) | 4 | ||||
-rw-r--r-- | mv_machine_learning/face_recognition/include/FaceRecognitionDSM.h (renamed from mv_machine_learning/face_recognition/include/face_recognition_dsm.h) | 4 | ||||
-rw-r--r-- | mv_machine_learning/face_recognition/include/FaceRecognitionFVM.h (renamed from mv_machine_learning/face_recognition/include/face_recognition_fvm.h) | 2 | ||||
-rw-r--r-- | mv_machine_learning/face_recognition/include/Facenet.h (renamed from mv_machine_learning/face_recognition/include/facenet.h) | 6 | ||||
-rw-r--r-- | mv_machine_learning/face_recognition/include/FacenetAdapter.h (renamed from mv_machine_learning/face_recognition/include/facenet_adapter.h) | 6 | ||||
-rw-r--r-- | mv_machine_learning/face_recognition/include/FacenetParser.h (renamed from mv_machine_learning/face_recognition/include/facenet_parser.h) | 0 | ||||
-rw-r--r-- | mv_machine_learning/face_recognition/include/SimpleShot.h (renamed from mv_machine_learning/face_recognition/include/simple_shot.h) | 2 | ||||
-rw-r--r-- | mv_machine_learning/face_recognition/src/FaceRecognition.cpp (renamed from mv_machine_learning/face_recognition/src/face_recognition.cpp) | 8 | ||||
-rw-r--r-- | mv_machine_learning/face_recognition/src/FaceRecognitionAdapter.cpp (renamed from mv_machine_learning/face_recognition/src/face_recognition_adapter.cpp) | 4 | ||||
-rw-r--r-- | mv_machine_learning/face_recognition/src/FaceRecognitionDSM.cpp (renamed from mv_machine_learning/face_recognition/src/face_recognition_dsm.cpp) | 4 | ||||
-rw-r--r-- | mv_machine_learning/face_recognition/src/FaceRecognitionFVM.cpp (renamed from mv_machine_learning/face_recognition/src/face_recognition_fvm.cpp) | 4 | ||||
-rw-r--r-- | mv_machine_learning/face_recognition/src/Facenet.cpp (renamed from mv_machine_learning/face_recognition/src/facenet.cpp) | 4 | ||||
-rw-r--r-- | mv_machine_learning/face_recognition/src/FacenetAdapter.cpp (renamed from mv_machine_learning/face_recognition/src/facenet_adapter.cpp) | 4 | ||||
-rw-r--r-- | mv_machine_learning/face_recognition/src/FacenetParser.cpp (renamed from mv_machine_learning/face_recognition/src/facenet_parser.cpp) | 4 | ||||
-rw-r--r-- | mv_machine_learning/face_recognition/src/mv_face_recognition.cpp | 10 | ||||
-rw-r--r-- | mv_machine_learning/face_recognition/src/simple_shot.cpp | 8 | ||||
-rw-r--r-- | mv_machine_learning/image_classification/include/IImageClassification.h (renamed from mv_machine_learning/image_classification/include/iimage_classification.h) | 0 | ||||
-rw-r--r-- | mv_machine_learning/image_classification/include/ImageClassification.h (renamed from mv_machine_learning/image_classification/include/image_classification.h) | 12 | ||||
-rw-r--r-- | mv_machine_learning/image_classification/include/ImageClassificationAdapter.h (renamed from mv_machine_learning/image_classification/include/image_classification_adapter.h) | 10 | ||||
-rw-r--r-- | mv_machine_learning/image_classification/include/ImageClassificationDefault.h (renamed from mv_machine_learning/image_classification/include/image_classification_default.h) | 4 | ||||
-rw-r--r-- | mv_machine_learning/image_classification/include/image_classification_type.h | 2 | ||||
-rw-r--r-- | mv_machine_learning/image_classification/src/ImageClassification.cpp (renamed from mv_machine_learning/image_classification/src/image_classification.cpp) | 9 | ||||
-rw-r--r-- | mv_machine_learning/image_classification/src/ImageClassificationAdapter.cpp (renamed from mv_machine_learning/image_classification/src/image_classification_adapter.cpp) | 6 | ||||
-rw-r--r-- | mv_machine_learning/image_classification/src/ImageClassificationDefault.cpp (renamed from mv_machine_learning/image_classification/src/image_classification_default.cpp) | 6 | ||||
-rw-r--r-- | mv_machine_learning/image_classification/src/ImageClassificationParser.cpp | 2 | ||||
-rw-r--r-- | mv_machine_learning/image_classification/src/mv_image_classification.cpp | 10 | ||||
-rw-r--r-- | mv_machine_learning/image_segmentation/CMakeLists.txt | 2 | ||||
-rw-r--r-- | mv_machine_learning/image_segmentation/include/IImageSegmentation.h (renamed from mv_machine_learning/image_segmentation/include/iimage_segmentation.h) | 0 | ||||
-rw-r--r-- | mv_machine_learning/image_segmentation/include/ImageSegmentation.h (renamed from mv_machine_learning/image_segmentation/include/image_segmentation.h) | 14 | ||||
-rw-r--r-- | mv_machine_learning/image_segmentation/include/ImageSegmentationAdapter.h (renamed from mv_machine_learning/image_segmentation/include/selfie_segmentation_adapter.h) | 8 | ||||
-rw-r--r-- | mv_machine_learning/image_segmentation/include/ImageSegmentationExternal.h (renamed from mv_machine_learning/image_segmentation/include/image_segmentation_external.h) | 2 | ||||
-rw-r--r-- | mv_machine_learning/image_segmentation/include/ImageSegmentationParser.h (renamed from mv_machine_learning/image_segmentation/include/image_segmentation_parser.h) | 0 | ||||
-rw-r--r-- | mv_machine_learning/image_segmentation/include/image_segmentation_type.h | 2 | ||||
-rw-r--r-- | mv_machine_learning/image_segmentation/src/ImageSegmentation.cpp (renamed from mv_machine_learning/image_segmentation/src/image_segmentation.cpp) | 8 | ||||
-rw-r--r-- | mv_machine_learning/image_segmentation/src/ImageSegmentationAdapter.cpp (renamed from mv_machine_learning/image_segmentation/src/selfie_segmentation_adapter.cpp) | 8 | ||||
-rw-r--r-- | mv_machine_learning/image_segmentation/src/ImageSegmentationExternal.cpp (renamed from mv_machine_learning/image_segmentation/src/image_segmentation_external.cpp) | 4 | ||||
-rw-r--r-- | mv_machine_learning/image_segmentation/src/ImageSegmentationParser.cpp (renamed from mv_machine_learning/image_segmentation/src/image_segmentation_parser.cpp) | 4 | ||||
-rw-r--r-- | mv_machine_learning/image_segmentation/src/mv_selfie_segmentation.cpp | 10 | ||||
-rw-r--r-- | mv_machine_learning/landmark_detection/include/FacialLandmarkAdapter.h (renamed from mv_machine_learning/landmark_detection/include/facial_landmark_adapter.h) | 10 | ||||
-rw-r--r-- | mv_machine_learning/landmark_detection/include/FldTweakCnn.h (renamed from mv_machine_learning/landmark_detection/include/fld_tweak_cnn.h) | 4 | ||||
-rw-r--r-- | mv_machine_learning/landmark_detection/include/ILandmarkDetection.h (renamed from mv_machine_learning/landmark_detection/include/ilandmark_detection.h) | 0 | ||||
-rw-r--r-- | mv_machine_learning/landmark_detection/include/LandmarkDetection.h (renamed from mv_machine_learning/landmark_detection/include/landmark_detection.h) | 12 | ||||
-rw-r--r-- | mv_machine_learning/landmark_detection/include/PldCpm.h (renamed from mv_machine_learning/landmark_detection/include/pld_cpm.h) | 4 | ||||
-rw-r--r-- | mv_machine_learning/landmark_detection/include/PoseLandmarkAdapter.h (renamed from mv_machine_learning/landmark_detection/include/pose_landmark_adapter.h) | 10 | ||||
-rw-r--r-- | mv_machine_learning/landmark_detection/include/landmark_detection_type.h | 2 | ||||
-rw-r--r-- | mv_machine_learning/landmark_detection/src/FacialLandmarkAdapter.cpp (renamed from mv_machine_learning/landmark_detection/src/facial_landmark_adapter.cpp) | 6 | ||||
-rw-r--r-- | mv_machine_learning/landmark_detection/src/FldTweakCnn.cpp (renamed from mv_machine_learning/landmark_detection/src/fld_tweak_cnn.cpp) | 6 | ||||
-rw-r--r-- | mv_machine_learning/landmark_detection/src/LandmarkDetection.cpp (renamed from mv_machine_learning/landmark_detection/src/landmark_detection.cpp) | 8 | ||||
-rw-r--r-- | mv_machine_learning/landmark_detection/src/LandmarkDetectionParser.cpp | 2 | ||||
-rw-r--r-- | mv_machine_learning/landmark_detection/src/PldCpm.cpp (renamed from mv_machine_learning/landmark_detection/src/pld_cpm.cpp) | 6 | ||||
-rw-r--r-- | mv_machine_learning/landmark_detection/src/PoseLandmarkAdapter.cpp (renamed from mv_machine_learning/landmark_detection/src/pose_landmark_adapter.cpp) | 6 | ||||
-rw-r--r-- | mv_machine_learning/landmark_detection/src/mv_facial_landmark.cpp | 10 | ||||
-rw-r--r-- | mv_machine_learning/landmark_detection/src/mv_pose_landmark.cpp | 10 | ||||
-rw-r--r-- | mv_machine_learning/object_detection/CMakeLists.txt | 2 | ||||
-rw-r--r-- | mv_machine_learning/object_detection/include/FaceDetectionAdapter.h (renamed from mv_machine_learning/object_detection/include/face_detection_adapter.h) | 8 | ||||
-rw-r--r-- | mv_machine_learning/object_detection/include/IObjectDetection.h (renamed from mv_machine_learning/object_detection/include/iobject_detection.h) | 0 | ||||
-rw-r--r-- | mv_machine_learning/object_detection/include/MobilenetV1Ssd.h (renamed from mv_machine_learning/object_detection/include/mobilenet_v1_ssd.h) | 4 | ||||
-rw-r--r-- | mv_machine_learning/object_detection/include/MobilenetV2Ssd.h (renamed from mv_machine_learning/object_detection/include/mobilenet_v2_ssd.h) | 4 | ||||
-rw-r--r-- | mv_machine_learning/object_detection/include/ObjectDetection.h (renamed from mv_machine_learning/object_detection/include/object_detection.h) | 12 | ||||
-rw-r--r-- | mv_machine_learning/object_detection/include/ObjectDetectionAdapter.h (renamed from mv_machine_learning/object_detection/include/object_detection_adapter.h) | 10 | ||||
-rw-r--r-- | mv_machine_learning/object_detection/include/ObjectDetectionExternal.h (renamed from mv_machine_learning/object_detection/include/object_detection_external.h) | 2 | ||||
-rw-r--r-- | mv_machine_learning/object_detection/include/object_detection_type.h | 2 | ||||
-rw-r--r-- | mv_machine_learning/object_detection/src/FaceDetectionAdapter.cpp (renamed from mv_machine_learning/object_detection/src/face_detection_adapter.cpp) | 8 | ||||
-rw-r--r-- | mv_machine_learning/object_detection/src/MobilenetV1Ssd.cpp (renamed from mv_machine_learning/object_detection/src/mobilenet_v1_ssd.cpp) | 6 | ||||
-rw-r--r-- | mv_machine_learning/object_detection/src/MobilenetV2AnchorParser.cpp | 4 | ||||
-rw-r--r-- | mv_machine_learning/object_detection/src/MobilenetV2Ssd.cpp (renamed from mv_machine_learning/object_detection/src/mobilenet_v2_ssd.cpp) | 6 | ||||
-rw-r--r-- | mv_machine_learning/object_detection/src/ObjectDetection.cpp (renamed from mv_machine_learning/object_detection/src/object_detection.cpp) | 8 | ||||
-rw-r--r-- | mv_machine_learning/object_detection/src/ObjectDetectionAdapter.cpp (renamed from mv_machine_learning/object_detection/src/object_detection_adapter.cpp) | 8 | ||||
-rw-r--r-- | mv_machine_learning/object_detection/src/ObjectDetectionExternal.cpp (renamed from mv_machine_learning/object_detection/src/object_detection_external.cpp) | 4 | ||||
-rw-r--r-- | mv_machine_learning/object_detection/src/ObjectDetectionParser.cpp | 2 | ||||
-rw-r--r-- | mv_machine_learning/object_detection/src/mv_face_detection.cpp | 10 | ||||
-rw-r--r-- | mv_machine_learning/object_detection/src/mv_object_detection.cpp | 10 | ||||
-rw-r--r-- | mv_machine_learning/object_detection_3d/include/IObjectDetection3d.h (renamed from mv_machine_learning/object_detection_3d/include/iobject_detection_3d.h) | 0 | ||||
-rw-r--r-- | mv_machine_learning/object_detection_3d/include/ObjectDetection3d.h (renamed from mv_machine_learning/object_detection_3d/include/object_detection_3d.h) | 10 | ||||
-rw-r--r-- | mv_machine_learning/object_detection_3d/include/ObjectDetection3dAdapter.h (renamed from mv_machine_learning/object_detection_3d/include/object_detection_3d_adapter.h) | 10 | ||||
-rw-r--r-- | mv_machine_learning/object_detection_3d/include/Objectron.h (renamed from mv_machine_learning/object_detection_3d/include/objectron.h) | 6 | ||||
-rw-r--r-- | mv_machine_learning/object_detection_3d/include/object_detection_3d_type.h | 2 | ||||
-rw-r--r-- | mv_machine_learning/object_detection_3d/src/ObjectDetection3d.cpp (renamed from mv_machine_learning/object_detection_3d/src/object_detection_3d.cpp) | 9 | ||||
-rw-r--r-- | mv_machine_learning/object_detection_3d/src/ObjectDetection3dAdapter.cpp (renamed from mv_machine_learning/object_detection_3d/src/object_detection_3d_adapter.cpp) | 6 | ||||
-rw-r--r-- | mv_machine_learning/object_detection_3d/src/ObjectDetection3dParser.cpp | 2 | ||||
-rw-r--r-- | mv_machine_learning/object_detection_3d/src/Objectron.cpp (renamed from mv_machine_learning/object_detection_3d/src/objectron.cpp) | 6 | ||||
-rw-r--r-- | mv_machine_learning/object_detection_3d/src/mv_object_detection_3d.cpp | 10 | ||||
-rw-r--r-- | mv_machine_learning/training/include/DataSetManager.h (renamed from mv_machine_learning/training/include/data_set_manager.h) | 2 | ||||
-rw-r--r-- | mv_machine_learning/training/include/FeatureVectorManager.h (renamed from mv_machine_learning/training/include/feature_vector_manager.h) | 0 | ||||
-rw-r--r-- | mv_machine_learning/training/include/LabelManager.h (renamed from mv_machine_learning/training/include/label_manager.h) | 0 | ||||
-rw-r--r-- | mv_machine_learning/training/include/TrainingModel.h (renamed from mv_machine_learning/training/include/training_model.h) | 4 | ||||
-rw-r--r-- | mv_machine_learning/training/src/DataSetManager.cpp (renamed from mv_machine_learning/training/src/data_set_manager.cpp) | 2 | ||||
-rw-r--r-- | mv_machine_learning/training/src/FeatureVectorManager.cpp (renamed from mv_machine_learning/training/src/feature_vector_manager.cpp) | 4 | ||||
-rw-r--r-- | mv_machine_learning/training/src/LabelManager.cpp (renamed from mv_machine_learning/training/src/label_manager.cpp) | 4 | ||||
-rw-r--r-- | mv_machine_learning/training/src/TrainingModel.cpp (renamed from mv_machine_learning/training/src/training_model.cpp) | 4 | ||||
-rw-r--r-- | packaging/capi-media-vision.spec | 12 |
109 files changed, 312 insertions, 315 deletions
diff --git a/mv_machine_learning/common/CMakeLists.txt b/mv_machine_learning/common/CMakeLists.txt index c1927455..ba81c4e9 100644 --- a/mv_machine_learning/common/CMakeLists.txt +++ b/mv_machine_learning/common/CMakeLists.txt @@ -10,9 +10,9 @@ target_include_directories(${PROJECT_NAME} PRIVATE include meta/include ../../in target_include_directories(${PROJECT_NAME} PUBLIC ${${PROJECT_NAME}_DEP_INCLUDE_DIRS}) install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) install( - FILES ${PROJECT_SOURCE_DIR}/include/machine_learning_exception.h - ${PROJECT_SOURCE_DIR}/include/machine_learning_config.h - ${PROJECT_SOURCE_DIR}/include/MachineLearningType.h - ${PROJECT_SOURCE_DIR}/meta/include/machine_learning_preprocess.h + FILES ${PROJECT_SOURCE_DIR}/include/MvMlException.h + ${PROJECT_SOURCE_DIR}/include/MvMlConfig.h + ${PROJECT_SOURCE_DIR}/include/mv_ml_types.h + ${PROJECT_SOURCE_DIR}/meta/include/MvMlPreprocess.h DESTINATION include/media )
\ No newline at end of file diff --git a/mv_machine_learning/common/include/async_manager.h b/mv_machine_learning/common/include/AsyncManager.h index 0ae85c34..4e02752f 100644 --- a/mv_machine_learning/common/include/async_manager.h +++ b/mv_machine_learning/common/include/AsyncManager.h @@ -28,7 +28,7 @@ #include <mv_common.h> #include <mv_inference_type.h> -#include "machine_learning_exception.h" +#include "MvMlException.h" #ifdef LOG_TAG #undef LOG_TAG diff --git a/mv_machine_learning/common/include/context.h b/mv_machine_learning/common/include/Context.h index f2b7b3d4..ea6c654f 100644 --- a/mv_machine_learning/common/include/context.h +++ b/mv_machine_learning/common/include/Context.h @@ -18,7 +18,7 @@ #define __CONTEXT_H__ #include <map> -#include "itask.h" +#include "ITask.h" namespace mediavision { diff --git a/mv_machine_learning/common/include/itask.h b/mv_machine_learning/common/include/ITask.h index a55865c1..ee68dd29 100644 --- a/mv_machine_learning/common/include/itask.h +++ b/mv_machine_learning/common/include/ITask.h @@ -17,7 +17,7 @@ #ifndef __ITASK_H__ #define __ITASK_H__ -#include "MachineLearningType.h" +#include "mv_ml_types.h" #include <string> namespace mediavision diff --git a/mv_machine_learning/common/include/machine_learning_config.h b/mv_machine_learning/common/include/MvMlConfig.h index edf0b791..c8e038a9 100644 --- a/mv_machine_learning/common/include/machine_learning_config.h +++ b/mv_machine_learning/common/include/MvMlConfig.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __MACHINE_LEARNING_CONFIG_H__ -#define __MACHINE_LEARNING_CONFIG_H__ +#ifndef __MV_ML_CONFIG_H__ +#define __MV_ML_CONFIG_H__ #include <mv_common.h> #include "mv_private.h" @@ -27,7 +27,7 @@ namespace mediavision { namespace machine_learning { -class MachineLearningConfig +class Config { private: std::unique_ptr<MetaParser> _parser; @@ -43,8 +43,8 @@ private: double _confidence_threshold {}; public: - MachineLearningConfig(); - virtual ~MachineLearningConfig() = default; + Config(); + virtual ~Config() = default; void setUserModel(const std::string &model_file, const std::string &meta_file, const std::string &label_file); void parseConfigFile(const std::string &configFilePath); diff --git a/mv_machine_learning/common/include/machine_learning_exception.h b/mv_machine_learning/common/include/MvMlException.h index 6bb857be..6ebc0e82 100644 --- a/mv_machine_learning/common/include/machine_learning_exception.h +++ b/mv_machine_learning/common/include/MvMlException.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __MACHINE_LEARNING_EXCEPTION_H__ -#define __MACHINE_LEARNING_EXCEPTION_H__ +#ifndef __MV_ML_EXCEPTION_H__ +#define __MV_ML_EXCEPTION_H__ #include <exception> #include <string> @@ -86,4 +86,4 @@ public: }; // MachineLearning }; // Mediavision -#endif // __MACHINE_LEARNING_EXCEPTION_H__ +#endif // __MV_ML_EXCEPTION_H__ diff --git a/mv_machine_learning/common/include/mv_machine_learning_common.h b/mv_machine_learning/common/include/common.h index 1491af9f..0cebba25 100644 --- a/mv_machine_learning/common/include/mv_machine_learning_common.h +++ b/mv_machine_learning/common/include/common.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __MV_MACHINE_LEARNING_COMMON_H__ -#define __MV_MACHINE_LEARNING_COMMON_H__ +#ifndef __COMMON_H__ +#define __COMMON_H__ #include <string> #include <vector> diff --git a/mv_machine_learning/common/include/machine_learning_key.h b/mv_machine_learning/common/include/keys.h index 9283258f..730958f8 100644 --- a/mv_machine_learning/common/include/machine_learning_key.h +++ b/mv_machine_learning/common/include/keys.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __MACHINE_LEARNING_KEY_H__ -#define __MACHINE_LEARNING_KEY_H__ +#ifndef __KEYS_H__ +#define __KEYS_H__ /** * @brief Defines #MV_MODEL_DEFAULT_PATH @@ -98,4 +98,4 @@ */ #define MV_USE_PLUGIN "USE_PLUGIN" -#endif /* __MACHINE_LEARNING_KEY_H__ */ +#endif /* __KEYS_H__ */ diff --git a/mv_machine_learning/common/include/MachineLearningType.h b/mv_machine_learning/common/include/mv_ml_types.h index d9c8aea1..d8aabc07 100644 --- a/mv_machine_learning/common/include/MachineLearningType.h +++ b/mv_machine_learning/common/include/mv_ml_types.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __MACHINE_LEARNING_TYPE_H__ -#define __MACHINE_LEARNING_TYPE_H__ +#ifndef __MV_ML_TYPE_H__ +#define __MV_ML_TYPE_H__ #include <mv_common.h> #include <mv_inference_type.h> diff --git a/mv_machine_learning/common/include/MachineLearningNative.h b/mv_machine_learning/common/include/native_capi.h index 9086a838..8c710366 100644 --- a/mv_machine_learning/common/include/MachineLearningNative.h +++ b/mv_machine_learning/common/include/native_capi.h @@ -14,17 +14,16 @@ * limitations under the License. */ -#ifndef __MACHINE_LEARNING_NATIVE_H__ -#define __MACHINE_LEARNING_NATIVE_H__ +#ifndef __NATIVE_CAPI_H__ +#define __NATIVE_CAPI_H__ #include <memory> #include <string> -#include "context.h" -#include "itask.h" +#include "Context.h" +#include "ITask.h" #include "mv_private.h" - -#include "MachineLearningType.h" +#include "mv_ml_types.h" namespace mediavision { diff --git a/mv_machine_learning/common/meta/include/machine_learning_preprocess.h b/mv_machine_learning/common/meta/include/MvMlPreprocess.h index e5309478..abbd0410 100644 --- a/mv_machine_learning/common/meta/include/machine_learning_preprocess.h +++ b/mv_machine_learning/common/meta/include/MvMlPreprocess.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __MACHINE_LEARNING_PREPROCESS_H__ -#define __MACHINE_LEARNING_PREPROCESS_H__ +#ifndef __MV_ML_PREPROCESS_H__ +#define __MV_ML_PREPROCESS_H__ #include <string> #include <map> @@ -31,7 +31,7 @@ #include <opencv2/imgproc.hpp> /** - * @file machine_learning_preprocess.h + * @file MvMlPreprocess.h * @brief This file contains the Preprocess class definition which * provides Preprocess before running inference. */ @@ -90,4 +90,4 @@ private: } /* machine_learning */ } /* mediavision */ -#endif /* __MACHINE_LEARNING_PREPROCESS_H__ */ +#endif /* __MV_ML_PREPROCESS_H__ */ diff --git a/mv_machine_learning/common/meta/include/common.h b/mv_machine_learning/common/meta/include/meta_common.h index cb7d34d0..24caaf33 100644 --- a/mv_machine_learning/common/meta/include/common.h +++ b/mv_machine_learning/common/meta/include/meta_common.h @@ -23,7 +23,7 @@ #include <json-glib/json-glib.h> #include <inference_engine_type.h> #include <dlog.h> -#include "machine_learning_exception.h" +#include "MvMlException.h" #include "mv_inference_type.h" #include "types.h" diff --git a/mv_machine_learning/common/meta/src/MetaParser.cpp b/mv_machine_learning/common/meta/src/MetaParser.cpp index 5b66500f..56aebae6 100644 --- a/mv_machine_learning/common/meta/src/MetaParser.cpp +++ b/mv_machine_learning/common/meta/src/MetaParser.cpp @@ -18,9 +18,9 @@ #include <fstream> #include <algorithm> -#include "machine_learning_exception.h" +#include "MvMlException.h" #include "MetaParser.h" -#include "common.h" +#include "meta_common.h" using namespace std; using namespace mediavision::machine_learning::exception; diff --git a/mv_machine_learning/common/meta/src/machine_learning_preprocess.cpp b/mv_machine_learning/common/meta/src/MvMlPreprocess.cpp index f729ec55..0aa57c0e 100644 --- a/mv_machine_learning/common/meta/src/machine_learning_preprocess.cpp +++ b/mv_machine_learning/common/meta/src/MvMlPreprocess.cpp @@ -20,8 +20,8 @@ #include <queue> #include <algorithm> #include "mv_private.h" -#include "machine_learning_preprocess.h" -#include "machine_learning_exception.h" +#include "MvMlPreprocess.h" +#include "MvMlException.h" constexpr int colorConvertTable[][12] = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, diff --git a/mv_machine_learning/common/meta/src/PostprocessParser.cpp b/mv_machine_learning/common/meta/src/PostprocessParser.cpp index fb4effac..cacc2f61 100644 --- a/mv_machine_learning/common/meta/src/PostprocessParser.cpp +++ b/mv_machine_learning/common/meta/src/PostprocessParser.cpp @@ -18,9 +18,9 @@ #include <string> #include <queue> #include <algorithm> -#include "machine_learning_exception.h" +#include "MvMlException.h" #include "PostprocessParser.h" -#include "common.h" +#include "meta_common.h" using namespace std; using namespace mediavision::machine_learning::exception; diff --git a/mv_machine_learning/common/src/machine_learning_config.cpp b/mv_machine_learning/common/src/MvMlConfig.cpp index bc7ff99b..e44a3d38 100644 --- a/mv_machine_learning/common/src/machine_learning_config.cpp +++ b/mv_machine_learning/common/src/MvMlConfig.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "machine_learning_exception.h" -#include "machine_learning_config.h" -#include "machine_learning_key.h" +#include "MvMlException.h" +#include "MvMlConfig.h" +#include "keys.h" using namespace std; using namespace MediaVision::Common; @@ -27,70 +27,70 @@ namespace mediavision { namespace machine_learning { -MachineLearningConfig::MachineLearningConfig() +Config::Config() {} -void MachineLearningConfig::setBackendType(int backend_type) +void Config::setBackendType(int backend_type) { _backendType = backend_type; } -void MachineLearningConfig::setTargetDeviceType(int device_type) +void Config::setTargetDeviceType(int device_type) { _targetDeviceType = device_type; } -const std::string &MachineLearningConfig::getDefaultModelName() const +const std::string &Config::getDefaultModelName() const { return _defaultModelName; } -const std::string &MachineLearningConfig::getModelFilePath() const +const std::string &Config::getModelFilePath() const { return _modelFilePath; } -const std::string &MachineLearningConfig::getLabelFilePath() const +const std::string &Config::getLabelFilePath() const { return _modelLabelFilePath; } -const std::string &MachineLearningConfig::getPluginFileName() const +const std::string &Config::getPluginFileName() const { return _pluginFileName; } -MetaMap &MachineLearningConfig::getInputMetaMap() const +MetaMap &Config::getInputMetaMap() const { return _parser->getInputMetaMap(); } -MetaMap &MachineLearningConfig::getOutputMetaMap() const +MetaMap &Config::getOutputMetaMap() const { return _parser->getOutputMetaMap(); } -double MachineLearningConfig::getConfidenceThreshold() const +double Config::getConfidenceThreshold() const { return _confidence_threshold; } -int MachineLearningConfig::getBackendType() const +int Config::getBackendType() const { return _backendType; } -int MachineLearningConfig::getTargetDeviceType() const +int Config::getTargetDeviceType() const { return _targetDeviceType; } -bool MachineLearningConfig::isPluginUsed() const +bool Config::isPluginUsed() const { return _usePlugin; } -void MachineLearningConfig::setUserModel(const string &model_file, const string &meta_file, const string &label_file) +void Config::setUserModel(const string &model_file, const string &meta_file, const string &label_file) { if (!model_file.empty()) _modelFilePath = _modelDefaultPath + model_file; @@ -105,7 +105,7 @@ static bool IsJsonFile(const string &fileName) return (!fileName.substr(fileName.find_last_of(".") + 1).compare("json")); } -void MachineLearningConfig::parseConfigFile(const std::string &configFilePath) +void Config::parseConfigFile(const std::string &configFilePath) { auto config = make_unique<EngineConfig>(MV_CONFIG_PATH + configFilePath); @@ -159,7 +159,7 @@ void MachineLearningConfig::parseConfigFile(const std::string &configFilePath) LOGW("threshold value doesn't exist."); } -void MachineLearningConfig::parsePluginConfigFile(const std::string &pluginConfigFilePath) +void Config::parsePluginConfigFile(const std::string &pluginConfigFilePath) { auto config = make_unique<EngineConfig>(MV_CONFIG_PATH + pluginConfigFilePath); @@ -176,7 +176,7 @@ void MachineLearningConfig::parsePluginConfigFile(const std::string &pluginConfi throw InvalidOperation("Fail to get use_plugin value"); } -void MachineLearningConfig::loadMetaFile(unique_ptr<MetaParser> parser) +void Config::loadMetaFile(unique_ptr<MetaParser> parser) { _parser = move(parser); _parser->load(_modelMetaFilePath); diff --git a/mv_machine_learning/common/src/MachineLearningNative.cpp b/mv_machine_learning/common/src/native_capi.cpp index d361edb4..daa3b6d5 100644 --- a/mv_machine_learning/common/src/MachineLearningNative.cpp +++ b/mv_machine_learning/common/src/native_capi.cpp @@ -16,8 +16,8 @@ #include "mv_private.h" -#include "MachineLearningNative.h" -#include "machine_learning_exception.h" +#include "native_capi.h" +#include "MvMlException.h" using namespace std; using namespace mediavision::common; diff --git a/mv_machine_learning/face_recognition/include/face_recognition.h b/mv_machine_learning/face_recognition/include/FaceRecognition.h index 8f5e15ad..5f2bdfad 100644 --- a/mv_machine_learning/face_recognition/include/face_recognition.h +++ b/mv_machine_learning/face_recognition/include/FaceRecognition.h @@ -24,12 +24,12 @@ #include "training_engine_error.h" #include "training_engine_common_impl.h" #include "inference_engine_common_impl.h" -#include "MachineLearningType.h" +#include "mv_ml_types.h" #include "Inference.h" -#include "label_manager.h" -#include "feature_vector_manager.h" -#include "data_set_manager.h" -#include "simple_shot.h" +#include "LabelManager.h" +#include "FeatureVectorManager.h" +#include "DataSetManager.h" +#include "SimpleShot.h" namespace mediavision { diff --git a/mv_machine_learning/face_recognition/include/face_recognition_adapter.h b/mv_machine_learning/face_recognition/include/FaceRecognitionAdapter.h index 3487d72d..f45a5657 100644 --- a/mv_machine_learning/face_recognition/include/face_recognition_adapter.h +++ b/mv_machine_learning/face_recognition/include/FaceRecognitionAdapter.h @@ -20,8 +20,8 @@ #include <dlog.h> #include "EngineConfig.h" -#include "itask.h" -#include "face_recognition.h" +#include "ITask.h" +#include "FaceRecognition.h" namespace mediavision { diff --git a/mv_machine_learning/face_recognition/include/face_recognition_dsm.h b/mv_machine_learning/face_recognition/include/FaceRecognitionDSM.h index 11517061..196b9654 100644 --- a/mv_machine_learning/face_recognition/include/face_recognition_dsm.h +++ b/mv_machine_learning/face_recognition/include/FaceRecognitionDSM.h @@ -19,8 +19,8 @@ #include <string> -#include "feature_vector_manager.h" -#include "data_set_manager.h" +#include "FeatureVectorManager.h" +#include "DataSetManager.h" class FaceRecognitionDSM : public DataSetManager { diff --git a/mv_machine_learning/face_recognition/include/face_recognition_fvm.h b/mv_machine_learning/face_recognition/include/FaceRecognitionFVM.h index 1b4cfdc0..ff14faa1 100644 --- a/mv_machine_learning/face_recognition/include/face_recognition_fvm.h +++ b/mv_machine_learning/face_recognition/include/FaceRecognitionFVM.h @@ -20,7 +20,7 @@ #include <string.h> #include <vector> -#include "feature_vector_manager.h" +#include "FeatureVectorManager.h" #include "file_util.h" class FaceRecognitionFVM : public FeatureVectorManager diff --git a/mv_machine_learning/face_recognition/include/facenet.h b/mv_machine_learning/face_recognition/include/Facenet.h index d5780cad..a154f51b 100644 --- a/mv_machine_learning/face_recognition/include/facenet.h +++ b/mv_machine_learning/face_recognition/include/Facenet.h @@ -23,10 +23,10 @@ #include "EngineConfig.h" #include "inference_engine_common_impl.h" #include "Inference.h" -#include "facenet_parser.h" +#include "FacenetParser.h" #include "face_recognition_type.h" -#include "machine_learning_preprocess.h" -#include "MachineLearningType.h" +#include "MvMlPreprocess.h" +#include "mv_ml_types.h" namespace mediavision { diff --git a/mv_machine_learning/face_recognition/include/facenet_adapter.h b/mv_machine_learning/face_recognition/include/FacenetAdapter.h index cfb81ee7..b2ef5140 100644 --- a/mv_machine_learning/face_recognition/include/facenet_adapter.h +++ b/mv_machine_learning/face_recognition/include/FacenetAdapter.h @@ -20,9 +20,9 @@ #include <dlog.h> #include "EngineConfig.h" -#include "itask.h" -#include "MachineLearningType.h" -#include "facenet.h" +#include "ITask.h" +#include "mv_ml_types.h" +#include "Facenet.h" namespace mediavision { diff --git a/mv_machine_learning/face_recognition/include/facenet_parser.h b/mv_machine_learning/face_recognition/include/FacenetParser.h index 09a2c434..09a2c434 100644 --- a/mv_machine_learning/face_recognition/include/facenet_parser.h +++ b/mv_machine_learning/face_recognition/include/FacenetParser.h diff --git a/mv_machine_learning/face_recognition/include/simple_shot.h b/mv_machine_learning/face_recognition/include/SimpleShot.h index 804a3e2c..48ef349a 100644 --- a/mv_machine_learning/face_recognition/include/simple_shot.h +++ b/mv_machine_learning/face_recognition/include/SimpleShot.h @@ -18,7 +18,7 @@ #define __SIMPLE_SHOT_H__ #include <mv_inference_type.h> -#include "training_model.h" +#include "TrainingModel.h" class SimpleShot : public TrainingModel { diff --git a/mv_machine_learning/face_recognition/src/face_recognition.cpp b/mv_machine_learning/face_recognition/src/FaceRecognition.cpp index 27a89d52..2af63a2f 100644 --- a/mv_machine_learning/face_recognition/src/face_recognition.cpp +++ b/mv_machine_learning/face_recognition/src/FaceRecognition.cpp @@ -27,11 +27,11 @@ #include <mv_common.h> #include <mv_private.h> -#include "machine_learning_exception.h" +#include "MvMlException.h" #include "TensorBuffer.h" -#include "face_recognition.h" -#include "face_recognition_fvm.h" -#include "face_recognition_dsm.h" +#include "FaceRecognition.h" +#include "FaceRecognitionFVM.h" +#include "FaceRecognitionDSM.h" #include "file_util.h" using namespace std; diff --git a/mv_machine_learning/face_recognition/src/face_recognition_adapter.cpp b/mv_machine_learning/face_recognition/src/FaceRecognitionAdapter.cpp index e3821e4d..3e0ae4d2 100644 --- a/mv_machine_learning/face_recognition/src/face_recognition_adapter.cpp +++ b/mv_machine_learning/face_recognition/src/FaceRecognitionAdapter.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "machine_learning_exception.h" -#include "face_recognition_adapter.h" +#include "MvMlException.h" +#include "FaceRecognitionAdapter.h" #include "face_recognition_type.h" #include <app_common.h> diff --git a/mv_machine_learning/face_recognition/src/face_recognition_dsm.cpp b/mv_machine_learning/face_recognition/src/FaceRecognitionDSM.cpp index 79de9d35..91170a6f 100644 --- a/mv_machine_learning/face_recognition/src/face_recognition_dsm.cpp +++ b/mv_machine_learning/face_recognition/src/FaceRecognitionDSM.cpp @@ -18,8 +18,8 @@ #include <mv_private.h> #include <algorithm> -#include "machine_learning_exception.h" -#include "face_recognition_dsm.h" +#include "MvMlException.h" +#include "FaceRecognitionDSM.h" #define MAX_FEATURE_VECTOR_CNT 5 #define MAX_FEATURE_SIZE 1024 diff --git a/mv_machine_learning/face_recognition/src/face_recognition_fvm.cpp b/mv_machine_learning/face_recognition/src/FaceRecognitionFVM.cpp index 87c7548f..e93326ff 100644 --- a/mv_machine_learning/face_recognition/src/face_recognition_fvm.cpp +++ b/mv_machine_learning/face_recognition/src/FaceRecognitionFVM.cpp @@ -17,8 +17,8 @@ #include <fstream> #include <unistd.h> -#include "machine_learning_exception.h" -#include "face_recognition_fvm.h" +#include "MvMlException.h" +#include "FaceRecognitionFVM.h" using namespace std; using namespace mediavision::machine_learning::exception; diff --git a/mv_machine_learning/face_recognition/src/facenet.cpp b/mv_machine_learning/face_recognition/src/Facenet.cpp index ed85b72e..752a4729 100644 --- a/mv_machine_learning/face_recognition/src/facenet.cpp +++ b/mv_machine_learning/face_recognition/src/Facenet.cpp @@ -19,8 +19,8 @@ #include <memory> #include <algorithm> -#include "machine_learning_exception.h" -#include "facenet.h" +#include "MvMlException.h" +#include "Facenet.h" #include "face_recognition_type.h" using namespace std; diff --git a/mv_machine_learning/face_recognition/src/facenet_adapter.cpp b/mv_machine_learning/face_recognition/src/FacenetAdapter.cpp index 21b4b0da..842b6651 100644 --- a/mv_machine_learning/face_recognition/src/facenet_adapter.cpp +++ b/mv_machine_learning/face_recognition/src/FacenetAdapter.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "machine_learning_exception.h" -#include "facenet_adapter.h" +#include "MvMlException.h" +#include "FacenetAdapter.h" using namespace std; using namespace MediaVision::Common; diff --git a/mv_machine_learning/face_recognition/src/facenet_parser.cpp b/mv_machine_learning/face_recognition/src/FacenetParser.cpp index 2ce236f9..6789e4d3 100644 --- a/mv_machine_learning/face_recognition/src/facenet_parser.cpp +++ b/mv_machine_learning/face_recognition/src/FacenetParser.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "machine_learning_exception.h" -#include "facenet_parser.h" +#include "MvMlException.h" +#include "FacenetParser.h" using namespace std; using namespace mediavision::machine_learning::exception; diff --git a/mv_machine_learning/face_recognition/src/mv_face_recognition.cpp b/mv_machine_learning/face_recognition/src/mv_face_recognition.cpp index ee257ddb..b9f2e4ea 100644 --- a/mv_machine_learning/face_recognition/src/mv_face_recognition.cpp +++ b/mv_machine_learning/face_recognition/src/mv_face_recognition.cpp @@ -21,11 +21,11 @@ #include "mv_private.h" #include "mv_feature_key.h" -#include "context.h" -#include "machine_learning_exception.h" -#include "face_recognition_adapter.h" -#include "facenet_adapter.h" -#include "MachineLearningNative.h" +#include "Context.h" +#include "MvMlException.h" +#include "FaceRecognitionAdapter.h" +#include "FacenetAdapter.h" +#include "native_capi.h" #include "mv_face_recognition.h" #include "mv_face_recognition_internal.h" diff --git a/mv_machine_learning/face_recognition/src/simple_shot.cpp b/mv_machine_learning/face_recognition/src/simple_shot.cpp index eb6c0a0e..d508ac5c 100644 --- a/mv_machine_learning/face_recognition/src/simple_shot.cpp +++ b/mv_machine_learning/face_recognition/src/simple_shot.cpp @@ -23,10 +23,10 @@ #include <sys/stat.h> -#include "machine_learning_exception.h" -#include "simple_shot.h" -#include "data_set_manager.h" -#include "feature_vector_manager.h" +#include "MvMlException.h" +#include "SimpleShot.h" +#include "DataSetManager.h" +#include "FeatureVectorManager.h" #include "file_util.h" using namespace std; diff --git a/mv_machine_learning/image_classification/include/iimage_classification.h b/mv_machine_learning/image_classification/include/IImageClassification.h index ed3412ab..ed3412ab 100644 --- a/mv_machine_learning/image_classification/include/iimage_classification.h +++ b/mv_machine_learning/image_classification/include/IImageClassification.h diff --git a/mv_machine_learning/image_classification/include/image_classification.h b/mv_machine_learning/image_classification/include/ImageClassification.h index 7e0229d4..7e4dfca7 100644 --- a/mv_machine_learning/image_classification/include/image_classification.h +++ b/mv_machine_learning/image_classification/include/ImageClassification.h @@ -26,11 +26,11 @@ #include "Inference.h" #include "image_classification_type.h" #include "MetaParser.h" -#include "machine_learning_config.h" +#include "MvMlConfig.h" #include "ImageClassificationParser.h" -#include "machine_learning_preprocess.h" -#include "async_manager.h" -#include "iimage_classification.h" +#include "MvMlPreprocess.h" +#include "AsyncManager.h" +#include "IImageClassification.h" namespace mediavision { @@ -50,7 +50,7 @@ private: protected: std::unique_ptr<mediavision::inference::Inference> _inference; - std::shared_ptr<MachineLearningConfig> _config; + std::shared_ptr<Config> _config; Preprocess _preprocess; std::vector<std::string> _labels; std::vector<std::string> _valid_backends; @@ -62,7 +62,7 @@ protected: virtual ImageClassificationResult &result() = 0; public: - explicit ImageClassification(std::shared_ptr<MachineLearningConfig> config); + explicit ImageClassification(std::shared_ptr<Config> config); virtual ~ImageClassification() = default; void preDestroy(); diff --git a/mv_machine_learning/image_classification/include/image_classification_adapter.h b/mv_machine_learning/image_classification/include/ImageClassificationAdapter.h index 9011f463..23deb883 100644 --- a/mv_machine_learning/image_classification/include/image_classification_adapter.h +++ b/mv_machine_learning/image_classification/include/ImageClassificationAdapter.h @@ -20,10 +20,10 @@ #include <dlog.h> #include "EngineConfig.h" -#include "itask.h" -#include "machine_learning_config.h" -#include "image_classification_default.h" -#include "iimage_classification.h" +#include "ITask.h" +#include "MvMlConfig.h" +#include "ImageClassificationDefault.h" +#include "IImageClassification.h" namespace mediavision { @@ -33,7 +33,7 @@ class ImageClassificationAdapter : public mediavision::common::ITask { private: std::unique_ptr<IImageClassification> _image_classification; - std::shared_ptr<MachineLearningConfig> _config; + std::shared_ptr<Config> _config; const std::string _config_file_name = "image_classification.json"; void create(); diff --git a/mv_machine_learning/image_classification/include/image_classification_default.h b/mv_machine_learning/image_classification/include/ImageClassificationDefault.h index d409276b..04f27a9a 100644 --- a/mv_machine_learning/image_classification/include/image_classification_default.h +++ b/mv_machine_learning/image_classification/include/ImageClassificationDefault.h @@ -21,7 +21,7 @@ #include <mv_common.h> #include "mv_private.h" -#include "image_classification.h" +#include "ImageClassification.h" #include <mv_inference_type.h> #include "EngineConfig.h" @@ -38,7 +38,7 @@ private: ImageClassificationResult _result; public: - ImageClassificationDefault(std::shared_ptr<MachineLearningConfig> config); + ImageClassificationDefault(std::shared_ptr<Config> config); ~ImageClassificationDefault(); ImageClassificationResult &result() override; diff --git a/mv_machine_learning/image_classification/include/image_classification_type.h b/mv_machine_learning/image_classification/include/image_classification_type.h index 9b9b9f7d..92277d4a 100644 --- a/mv_machine_learning/image_classification/include/image_classification_type.h +++ b/mv_machine_learning/image_classification/include/image_classification_type.h @@ -21,7 +21,7 @@ #include <mv_common.h> #include <mv_inference_type.h> -#include "MachineLearningType.h" +#include "mv_ml_types.h" namespace mediavision { diff --git a/mv_machine_learning/image_classification/src/image_classification.cpp b/mv_machine_learning/image_classification/src/ImageClassification.cpp index d4bf3949..0a553302 100644 --- a/mv_machine_learning/image_classification/src/image_classification.cpp +++ b/mv_machine_learning/image_classification/src/ImageClassification.cpp @@ -20,10 +20,10 @@ #include <memory> #include <algorithm> -#include "machine_learning_exception.h" -#include "mv_machine_learning_common.h" +#include "MvMlException.h" +#include "common.h" #include "mv_image_classification_config.h" -#include "image_classification.h" +#include "ImageClassification.h" using namespace std; using namespace mediavision::inference; @@ -35,8 +35,7 @@ namespace mediavision { namespace machine_learning { -template<typename T> -ImageClassification<T>::ImageClassification(std::shared_ptr<MachineLearningConfig> config) : _config(config) +template<typename T> ImageClassification<T>::ImageClassification(std::shared_ptr<Config> config) : _config(config) { _inference = make_unique<Inference>(); } diff --git a/mv_machine_learning/image_classification/src/image_classification_adapter.cpp b/mv_machine_learning/image_classification/src/ImageClassificationAdapter.cpp index c47d1d01..b4b78b7e 100644 --- a/mv_machine_learning/image_classification/src/image_classification_adapter.cpp +++ b/mv_machine_learning/image_classification/src/ImageClassificationAdapter.cpp @@ -16,9 +16,9 @@ #include <string> -#include "machine_learning_exception.h" +#include "MvMlException.h" #include "mv_image_classification_config.h" -#include "image_classification_adapter.h" +#include "ImageClassificationAdapter.h" using namespace std; using namespace MediaVision::Common; @@ -31,7 +31,7 @@ namespace machine_learning { ImageClassificationAdapter::ImageClassificationAdapter() { - _config = make_shared<MachineLearningConfig>(); + _config = make_shared<Config>(); _config->parseConfigFile(_config_file_name); create(); diff --git a/mv_machine_learning/image_classification/src/image_classification_default.cpp b/mv_machine_learning/image_classification/src/ImageClassificationDefault.cpp index 59e8f332..01f8a34a 100644 --- a/mv_machine_learning/image_classification/src/image_classification_default.cpp +++ b/mv_machine_learning/image_classification/src/ImageClassificationDefault.cpp @@ -18,8 +18,8 @@ #include <map> #include <algorithm> -#include "machine_learning_exception.h" -#include "image_classification_default.h" +#include "MvMlException.h" +#include "ImageClassificationDefault.h" #include "Postprocess.h" using namespace std; @@ -31,7 +31,7 @@ namespace mediavision namespace machine_learning { template<typename T> -ImageClassificationDefault<T>::ImageClassificationDefault(shared_ptr<MachineLearningConfig> config) +ImageClassificationDefault<T>::ImageClassificationDefault(shared_ptr<Config> config) : ImageClassification<T>(config), _result() {} diff --git a/mv_machine_learning/image_classification/src/ImageClassificationParser.cpp b/mv_machine_learning/image_classification/src/ImageClassificationParser.cpp index 72f681f8..965ff5cc 100644 --- a/mv_machine_learning/image_classification/src/ImageClassificationParser.cpp +++ b/mv_machine_learning/image_classification/src/ImageClassificationParser.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "machine_learning_exception.h" +#include "MvMlException.h" #include "ImageClassificationParser.h" using namespace std; diff --git a/mv_machine_learning/image_classification/src/mv_image_classification.cpp b/mv_machine_learning/image_classification/src/mv_image_classification.cpp index 208624ef..89296e42 100644 --- a/mv_machine_learning/image_classification/src/mv_image_classification.cpp +++ b/mv_machine_learning/image_classification/src/mv_image_classification.cpp @@ -16,13 +16,13 @@ #include "mv_private.h" #include "mv_feature_key.h" -#include "itask.h" +#include "ITask.h" #include "mv_image_classification_internal.h" -#include "image_classification_adapter.h" -#include "machine_learning_exception.h" -#include "MachineLearningNative.h" +#include "ImageClassificationAdapter.h" +#include "MvMlException.h" +#include "native_capi.h" #include "image_classification_type.h" -#include "context.h" +#include "Context.h" #include <new> #include <unistd.h> diff --git a/mv_machine_learning/image_segmentation/CMakeLists.txt b/mv_machine_learning/image_segmentation/CMakeLists.txt index 1e3d9587..5d29c85b 100644 --- a/mv_machine_learning/image_segmentation/CMakeLists.txt +++ b/mv_machine_learning/image_segmentation/CMakeLists.txt @@ -23,6 +23,6 @@ install( install( DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include/media FILES_MATCHING - PATTERN "iimage_segmentation.h" + PATTERN "IImageSegmentation.h" PATTERN "image_segmentation_type.h" )
\ No newline at end of file diff --git a/mv_machine_learning/image_segmentation/include/iimage_segmentation.h b/mv_machine_learning/image_segmentation/include/IImageSegmentation.h index 3305d364..3305d364 100644 --- a/mv_machine_learning/image_segmentation/include/iimage_segmentation.h +++ b/mv_machine_learning/image_segmentation/include/IImageSegmentation.h diff --git a/mv_machine_learning/image_segmentation/include/image_segmentation.h b/mv_machine_learning/image_segmentation/include/ImageSegmentation.h index 81a4cdba..c16fa0d2 100644 --- a/mv_machine_learning/image_segmentation/include/image_segmentation.h +++ b/mv_machine_learning/image_segmentation/include/ImageSegmentation.h @@ -31,11 +31,11 @@ #include "Inference.h" #include "image_segmentation_type.h" #include "MetaParser.h" -#include "machine_learning_config.h" -#include "image_segmentation_parser.h" -#include "machine_learning_preprocess.h" -#include "iimage_segmentation.h" -#include "async_manager.h" +#include "MvMlConfig.h" +#include "ImageSegmentationParser.h" +#include "MvMlPreprocess.h" +#include "IImageSegmentation.h" +#include "AsyncManager.h" namespace mediavision { @@ -55,7 +55,7 @@ private: protected: std::unique_ptr<mediavision::inference::Inference> _inference; - std::shared_ptr<MachineLearningConfig> _config; + std::shared_ptr<Config> _config; std::vector<std::string> _labels; std::vector<std::string> _valid_backends; std::vector<std::string> _valid_devices; @@ -67,7 +67,7 @@ protected: virtual ImageSegmentationResult &result() = 0; public: - explicit ImageSegmentation(std::shared_ptr<MachineLearningConfig> config); + explicit ImageSegmentation(std::shared_ptr<Config> config); virtual ~ImageSegmentation() = default; void preDestroy() override; diff --git a/mv_machine_learning/image_segmentation/include/selfie_segmentation_adapter.h b/mv_machine_learning/image_segmentation/include/ImageSegmentationAdapter.h index 82ed323a..93758e03 100644 --- a/mv_machine_learning/image_segmentation/include/selfie_segmentation_adapter.h +++ b/mv_machine_learning/image_segmentation/include/ImageSegmentationAdapter.h @@ -20,9 +20,9 @@ #include <dlog.h> #include "EngineConfig.h" -#include "itask.h" -#include "image_segmentation.h" -#include "iimage_segmentation.h" +#include "ITask.h" +#include "ImageSegmentation.h" +#include "IImageSegmentation.h" namespace mediavision { @@ -32,7 +32,7 @@ class ImageSegmentationAdapter : public mediavision::common::ITask { private: std::unique_ptr<IImageSegmentation> _selfie_segmentation; - std::shared_ptr<MachineLearningConfig> _config; + std::shared_ptr<Config> _config; const std::string _config_file_name = "selfie_segmentation.json"; const std::string _plugin_config_file_name = "selfie_segmentation_plugin.json"; diff --git a/mv_machine_learning/image_segmentation/include/image_segmentation_external.h b/mv_machine_learning/image_segmentation/include/ImageSegmentationExternal.h index c6634800..e662e488 100644 --- a/mv_machine_learning/image_segmentation/include/image_segmentation_external.h +++ b/mv_machine_learning/image_segmentation/include/ImageSegmentationExternal.h @@ -24,7 +24,7 @@ #include <opencv2/imgproc.hpp> #include "image_segmentation_type.h" -#include "iimage_segmentation.h" +#include "IImageSegmentation.h" namespace mediavision { diff --git a/mv_machine_learning/image_segmentation/include/image_segmentation_parser.h b/mv_machine_learning/image_segmentation/include/ImageSegmentationParser.h index c6c9cdec..c6c9cdec 100644 --- a/mv_machine_learning/image_segmentation/include/image_segmentation_parser.h +++ b/mv_machine_learning/image_segmentation/include/ImageSegmentationParser.h diff --git a/mv_machine_learning/image_segmentation/include/image_segmentation_type.h b/mv_machine_learning/image_segmentation/include/image_segmentation_type.h index e6a459c5..0b9f6882 100644 --- a/mv_machine_learning/image_segmentation/include/image_segmentation_type.h +++ b/mv_machine_learning/image_segmentation/include/image_segmentation_type.h @@ -21,7 +21,7 @@ #include <mv_common.h> #include <mv_inference_type.h> -#include "MachineLearningType.h" +#include "mv_ml_types.h" namespace mediavision { diff --git a/mv_machine_learning/image_segmentation/src/image_segmentation.cpp b/mv_machine_learning/image_segmentation/src/ImageSegmentation.cpp index 30d065cb..096bc116 100644 --- a/mv_machine_learning/image_segmentation/src/image_segmentation.cpp +++ b/mv_machine_learning/image_segmentation/src/ImageSegmentation.cpp @@ -19,10 +19,10 @@ #include <map> #include <memory> -#include "machine_learning_exception.h" -#include "mv_machine_learning_common.h" +#include "MvMlException.h" +#include "common.h" #include "mv_image_segmentation_config.h" -#include "image_segmentation.h" +#include "ImageSegmentation.h" using namespace std; using namespace mediavision::inference; @@ -34,7 +34,7 @@ namespace mediavision { namespace machine_learning { -template<typename T> ImageSegmentation<T>::ImageSegmentation(shared_ptr<MachineLearningConfig> config) : _config(config) +template<typename T> ImageSegmentation<T>::ImageSegmentation(shared_ptr<Config> config) : _config(config) { _inference = make_unique<Inference>(); } diff --git a/mv_machine_learning/image_segmentation/src/selfie_segmentation_adapter.cpp b/mv_machine_learning/image_segmentation/src/ImageSegmentationAdapter.cpp index d43b75b6..493cc06b 100644 --- a/mv_machine_learning/image_segmentation/src/selfie_segmentation_adapter.cpp +++ b/mv_machine_learning/image_segmentation/src/ImageSegmentationAdapter.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "machine_learning_exception.h" -#include "selfie_segmentation_adapter.h" -#include "image_segmentation_external.h" +#include "MvMlException.h" +#include "ImageSegmentationAdapter.h" +#include "ImageSegmentationExternal.h" #include "mv_image_segmentation_config.h" using namespace std; @@ -30,7 +30,7 @@ namespace machine_learning { ImageSegmentationAdapter::ImageSegmentationAdapter() { - _config = make_shared<MachineLearningConfig>(); + _config = make_shared<Config>(); // If the model type needs external plugin then bypass to load the meta file and just create the external plugin. // In this case, external plugin will use its own meta file approach regardless of Mediavision's one. diff --git a/mv_machine_learning/image_segmentation/src/image_segmentation_external.cpp b/mv_machine_learning/image_segmentation/src/ImageSegmentationExternal.cpp index bf3083ed..267f3ed7 100644 --- a/mv_machine_learning/image_segmentation/src/image_segmentation_external.cpp +++ b/mv_machine_learning/image_segmentation/src/ImageSegmentationExternal.cpp @@ -19,8 +19,8 @@ #include "mv_private.h" -#include "machine_learning_exception.h" -#include "image_segmentation_external.h" +#include "MvMlException.h" +#include "ImageSegmentationExternal.h" using namespace std; using namespace mediavision::machine_learning::exception; diff --git a/mv_machine_learning/image_segmentation/src/image_segmentation_parser.cpp b/mv_machine_learning/image_segmentation/src/ImageSegmentationParser.cpp index f3ea0b63..a3e56cac 100644 --- a/mv_machine_learning/image_segmentation/src/image_segmentation_parser.cpp +++ b/mv_machine_learning/image_segmentation/src/ImageSegmentationParser.cpp @@ -15,8 +15,8 @@ */ #include <memory> -#include "machine_learning_exception.h" -#include "image_segmentation_parser.h" +#include "MvMlException.h" +#include "ImageSegmentationParser.h" #include "image_segmentation_type.h" using namespace std; diff --git a/mv_machine_learning/image_segmentation/src/mv_selfie_segmentation.cpp b/mv_machine_learning/image_segmentation/src/mv_selfie_segmentation.cpp index 5c3c25b7..7bd67549 100644 --- a/mv_machine_learning/image_segmentation/src/mv_selfie_segmentation.cpp +++ b/mv_machine_learning/image_segmentation/src/mv_selfie_segmentation.cpp @@ -16,14 +16,14 @@ #include "mv_private.h" #include "mv_feature_key.h" -#include "itask.h" +#include "ITask.h" #include "mv_selfie_segmentation_type.h" #include "mv_selfie_segmentation_internal.h" -#include "selfie_segmentation_adapter.h" -#include "machine_learning_exception.h" -#include "MachineLearningNative.h" +#include "ImageSegmentationAdapter.h" +#include "MvMlException.h" +#include "native_capi.h" #include "image_segmentation_type.h" -#include "context.h" +#include "Context.h" #include <new> #include <unistd.h> diff --git a/mv_machine_learning/landmark_detection/include/facial_landmark_adapter.h b/mv_machine_learning/landmark_detection/include/FacialLandmarkAdapter.h index 73027194..5ec7ee12 100644 --- a/mv_machine_learning/landmark_detection/include/facial_landmark_adapter.h +++ b/mv_machine_learning/landmark_detection/include/FacialLandmarkAdapter.h @@ -20,10 +20,10 @@ #include <dlog.h> #include "EngineConfig.h" -#include "itask.h" -#include "machine_learning_config.h" -#include "fld_tweak_cnn.h" -#include "ilandmark_detection.h" +#include "ITask.h" +#include "MvMlConfig.h" +#include "FldTweakCnn.h" +#include "ILandmarkDetection.h" namespace mediavision { @@ -33,7 +33,7 @@ class FacialLandmarkAdapter : public mediavision::common::ITask { private: std::unique_ptr<ILandmarkDetection> _landmark_detection; - std::shared_ptr<MachineLearningConfig> _config; + std::shared_ptr<Config> _config; const std::string _config_file_name = "facial_landmark.json"; void create(const std::string &model_name); diff --git a/mv_machine_learning/landmark_detection/include/fld_tweak_cnn.h b/mv_machine_learning/landmark_detection/include/FldTweakCnn.h index 08d4b673..b6e13bbd 100644 --- a/mv_machine_learning/landmark_detection/include/fld_tweak_cnn.h +++ b/mv_machine_learning/landmark_detection/include/FldTweakCnn.h @@ -22,7 +22,7 @@ #include <mv_common.h> #include "mv_private.h" -#include "landmark_detection.h" +#include "LandmarkDetection.h" #include <mv_inference_type.h> namespace mediavision @@ -39,7 +39,7 @@ private: LandmarkDetectionResult _result; public: - FldTweakCnn(LandmarkDetectionTaskType task_type, std::shared_ptr<MachineLearningConfig> config); + FldTweakCnn(LandmarkDetectionTaskType task_type, std::shared_ptr<Config> config); ~FldTweakCnn(); LandmarkDetectionResult &result() override; diff --git a/mv_machine_learning/landmark_detection/include/ilandmark_detection.h b/mv_machine_learning/landmark_detection/include/ILandmarkDetection.h index 0d709adb..0d709adb 100644 --- a/mv_machine_learning/landmark_detection/include/ilandmark_detection.h +++ b/mv_machine_learning/landmark_detection/include/ILandmarkDetection.h diff --git a/mv_machine_learning/landmark_detection/include/landmark_detection.h b/mv_machine_learning/landmark_detection/include/LandmarkDetection.h index 075c6ba0..01d45f08 100644 --- a/mv_machine_learning/landmark_detection/include/landmark_detection.h +++ b/mv_machine_learning/landmark_detection/include/LandmarkDetection.h @@ -27,10 +27,10 @@ #include "landmark_detection_type.h" #include "MetaParser.h" #include "LandmarkDetectionParser.h" -#include "machine_learning_config.h" -#include "machine_learning_preprocess.h" -#include "async_manager.h" -#include "ilandmark_detection.h" +#include "MvMlConfig.h" +#include "MvMlPreprocess.h" +#include "AsyncManager.h" +#include "ILandmarkDetection.h" namespace mediavision { @@ -52,7 +52,7 @@ private: protected: std::unique_ptr<mediavision::inference::Inference> _inference; - std::shared_ptr<MachineLearningConfig> _config; + std::shared_ptr<Config> _config; std::vector<std::string> _labels; std::vector<std::string> _valid_backends; std::vector<std::string> _valid_devices; @@ -64,7 +64,7 @@ protected: virtual LandmarkDetectionResult &result() = 0; public: - LandmarkDetection(LandmarkDetectionTaskType task_type, std::shared_ptr<MachineLearningConfig> config); + LandmarkDetection(LandmarkDetectionTaskType task_type, std::shared_ptr<Config> config); virtual ~LandmarkDetection() = default; void preDestroy(); LandmarkDetectionTaskType getTaskType(); diff --git a/mv_machine_learning/landmark_detection/include/pld_cpm.h b/mv_machine_learning/landmark_detection/include/PldCpm.h index 993e9758..3a06e264 100644 --- a/mv_machine_learning/landmark_detection/include/pld_cpm.h +++ b/mv_machine_learning/landmark_detection/include/PldCpm.h @@ -22,7 +22,7 @@ #include <mv_common.h> #include "mv_private.h" -#include "landmark_detection.h" +#include "LandmarkDetection.h" #include <mv_inference_type.h> namespace mediavision @@ -38,7 +38,7 @@ private: LandmarkDetectionResult _result; public: - PldCpm(LandmarkDetectionTaskType task_type, std::shared_ptr<MachineLearningConfig> config); + PldCpm(LandmarkDetectionTaskType task_type, std::shared_ptr<Config> config); ~PldCpm(); LandmarkDetectionResult &result() override; diff --git a/mv_machine_learning/landmark_detection/include/pose_landmark_adapter.h b/mv_machine_learning/landmark_detection/include/PoseLandmarkAdapter.h index 484246aa..d4d1505c 100644 --- a/mv_machine_learning/landmark_detection/include/pose_landmark_adapter.h +++ b/mv_machine_learning/landmark_detection/include/PoseLandmarkAdapter.h @@ -20,10 +20,10 @@ #include <dlog.h> #include "EngineConfig.h" -#include "itask.h" -#include "machine_learning_config.h" -#include "pld_cpm.h" -#include "ilandmark_detection.h" +#include "ITask.h" +#include "MvMlConfig.h" +#include "PldCpm.h" +#include "ILandmarkDetection.h" namespace mediavision { @@ -33,7 +33,7 @@ class PoseLandmarkAdapter : public mediavision::common::ITask { private: std::unique_ptr<ILandmarkDetection> _landmark_detection; - std::shared_ptr<MachineLearningConfig> _config; + std::shared_ptr<Config> _config; const std::string _config_file_name = "pose_landmark.json"; void create(const std::string &model_name); diff --git a/mv_machine_learning/landmark_detection/include/landmark_detection_type.h b/mv_machine_learning/landmark_detection/include/landmark_detection_type.h index f1310296..80a947b0 100644 --- a/mv_machine_learning/landmark_detection/include/landmark_detection_type.h +++ b/mv_machine_learning/landmark_detection/include/landmark_detection_type.h @@ -21,7 +21,7 @@ #include <mv_common.h> #include <mv_inference_type.h> -#include "MachineLearningType.h" +#include "mv_ml_types.h" namespace mediavision { diff --git a/mv_machine_learning/landmark_detection/src/facial_landmark_adapter.cpp b/mv_machine_learning/landmark_detection/src/FacialLandmarkAdapter.cpp index d2777677..a200477b 100644 --- a/mv_machine_learning/landmark_detection/src/facial_landmark_adapter.cpp +++ b/mv_machine_learning/landmark_detection/src/FacialLandmarkAdapter.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "machine_learning_exception.h" -#include "facial_landmark_adapter.h" +#include "MvMlException.h" +#include "FacialLandmarkAdapter.h" #include "mv_landmark_detection_config.h" using namespace std; @@ -29,7 +29,7 @@ namespace machine_learning { FacialLandmarkAdapter::FacialLandmarkAdapter() { - _config = make_shared<MachineLearningConfig>(); + _config = make_shared<Config>(); _config->parseConfigFile(_config_file_name); create(_config->getDefaultModelName()); diff --git a/mv_machine_learning/landmark_detection/src/fld_tweak_cnn.cpp b/mv_machine_learning/landmark_detection/src/FldTweakCnn.cpp index 3e2f609b..512b3be9 100644 --- a/mv_machine_learning/landmark_detection/src/fld_tweak_cnn.cpp +++ b/mv_machine_learning/landmark_detection/src/FldTweakCnn.cpp @@ -18,8 +18,8 @@ #include <map> #include <algorithm> -#include "machine_learning_exception.h" -#include "fld_tweak_cnn.h" +#include "MvMlException.h" +#include "FldTweakCnn.h" #include "Postprocess.h" using namespace std; @@ -31,7 +31,7 @@ namespace mediavision namespace machine_learning { template<typename T> -FldTweakCnn<T>::FldTweakCnn(LandmarkDetectionTaskType task_type, std::shared_ptr<MachineLearningConfig> config) +FldTweakCnn<T>::FldTweakCnn(LandmarkDetectionTaskType task_type, std::shared_ptr<Config> config) : LandmarkDetection<T>(task_type, config), _result() {} diff --git a/mv_machine_learning/landmark_detection/src/landmark_detection.cpp b/mv_machine_learning/landmark_detection/src/LandmarkDetection.cpp index a813635b..d4f179e3 100644 --- a/mv_machine_learning/landmark_detection/src/landmark_detection.cpp +++ b/mv_machine_learning/landmark_detection/src/LandmarkDetection.cpp @@ -20,9 +20,9 @@ #include <memory> #include <algorithm> -#include "machine_learning_exception.h" -#include "mv_machine_learning_common.h" -#include "landmark_detection.h" +#include "MvMlException.h" +#include "common.h" +#include "LandmarkDetection.h" using namespace std; using namespace mediavision::inference; @@ -35,7 +35,7 @@ namespace mediavision namespace machine_learning { template<typename T> -LandmarkDetection<T>::LandmarkDetection(LandmarkDetectionTaskType task_type, shared_ptr<MachineLearningConfig> config) +LandmarkDetection<T>::LandmarkDetection(LandmarkDetectionTaskType task_type, shared_ptr<Config> config) : _task_type(task_type), _config(config) { _inference = make_unique<Inference>(); diff --git a/mv_machine_learning/landmark_detection/src/LandmarkDetectionParser.cpp b/mv_machine_learning/landmark_detection/src/LandmarkDetectionParser.cpp index 2321ffa8..d47c6eee 100644 --- a/mv_machine_learning/landmark_detection/src/LandmarkDetectionParser.cpp +++ b/mv_machine_learning/landmark_detection/src/LandmarkDetectionParser.cpp @@ -15,7 +15,7 @@ */ #include <memory> -#include "machine_learning_exception.h" +#include "MvMlException.h" #include "LandmarkDetectionParser.h" #include "landmark_detection_type.h" diff --git a/mv_machine_learning/landmark_detection/src/pld_cpm.cpp b/mv_machine_learning/landmark_detection/src/PldCpm.cpp index 47adddaa..b8714903 100644 --- a/mv_machine_learning/landmark_detection/src/pld_cpm.cpp +++ b/mv_machine_learning/landmark_detection/src/PldCpm.cpp @@ -18,9 +18,9 @@ #include <map> #include <algorithm> -#include "machine_learning_exception.h" +#include "MvMlException.h" #include "mv_landmark_detection_config.h" -#include "pld_cpm.h" +#include "PldCpm.h" #include "Postprocess.h" using namespace std; @@ -32,7 +32,7 @@ namespace mediavision namespace machine_learning { template<typename T> -PldCpm<T>::PldCpm(LandmarkDetectionTaskType task_type, std::shared_ptr<MachineLearningConfig> config) +PldCpm<T>::PldCpm(LandmarkDetectionTaskType task_type, std::shared_ptr<Config> config) : LandmarkDetection<T>(task_type, config), _result() {} diff --git a/mv_machine_learning/landmark_detection/src/pose_landmark_adapter.cpp b/mv_machine_learning/landmark_detection/src/PoseLandmarkAdapter.cpp index d7d99223..54cfd573 100644 --- a/mv_machine_learning/landmark_detection/src/pose_landmark_adapter.cpp +++ b/mv_machine_learning/landmark_detection/src/PoseLandmarkAdapter.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "machine_learning_exception.h" -#include "pose_landmark_adapter.h" +#include "MvMlException.h" +#include "PoseLandmarkAdapter.h" #include "mv_landmark_detection_config.h" using namespace std; @@ -29,7 +29,7 @@ namespace machine_learning { PoseLandmarkAdapter::PoseLandmarkAdapter() { - _config = make_shared<MachineLearningConfig>(); + _config = make_shared<Config>(); _config->parseConfigFile(_config_file_name); create(_config->getDefaultModelName()); diff --git a/mv_machine_learning/landmark_detection/src/mv_facial_landmark.cpp b/mv_machine_learning/landmark_detection/src/mv_facial_landmark.cpp index 40d2ae4b..f98d2a60 100644 --- a/mv_machine_learning/landmark_detection/src/mv_facial_landmark.cpp +++ b/mv_machine_learning/landmark_detection/src/mv_facial_landmark.cpp @@ -16,13 +16,13 @@ #include "mv_private.h" #include "mv_feature_key.h" -#include "itask.h" +#include "ITask.h" #include "mv_facial_landmark_internal.h" -#include "facial_landmark_adapter.h" -#include "machine_learning_exception.h" -#include "MachineLearningNative.h" +#include "FacialLandmarkAdapter.h" +#include "MvMlException.h" +#include "native_capi.h" #include "landmark_detection_type.h" -#include "context.h" +#include "Context.h" #include <new> #include <unistd.h> diff --git a/mv_machine_learning/landmark_detection/src/mv_pose_landmark.cpp b/mv_machine_learning/landmark_detection/src/mv_pose_landmark.cpp index 09dc5edd..8abf04c4 100644 --- a/mv_machine_learning/landmark_detection/src/mv_pose_landmark.cpp +++ b/mv_machine_learning/landmark_detection/src/mv_pose_landmark.cpp @@ -16,13 +16,13 @@ #include "mv_private.h" #include "mv_feature_key.h" -#include "itask.h" +#include "ITask.h" #include "mv_pose_landmark_internal.h" -#include "pose_landmark_adapter.h" -#include "machine_learning_exception.h" -#include "MachineLearningNative.h" +#include "PoseLandmarkAdapter.h" +#include "MvMlException.h" +#include "native_capi.h" #include "landmark_detection_type.h" -#include "context.h" +#include "Context.h" #include <new> #include <unistd.h> diff --git a/mv_machine_learning/object_detection/CMakeLists.txt b/mv_machine_learning/object_detection/CMakeLists.txt index 96a95a25..121791ca 100644 --- a/mv_machine_learning/object_detection/CMakeLists.txt +++ b/mv_machine_learning/object_detection/CMakeLists.txt @@ -25,6 +25,6 @@ install( install( DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include/media FILES_MATCHING - PATTERN "iobject_detection.h" + PATTERN "IObjectDetection.h" PATTERN "object_detection_type.h" ) diff --git a/mv_machine_learning/object_detection/include/face_detection_adapter.h b/mv_machine_learning/object_detection/include/FaceDetectionAdapter.h index ae4cb68a..2ebb7a88 100644 --- a/mv_machine_learning/object_detection/include/face_detection_adapter.h +++ b/mv_machine_learning/object_detection/include/FaceDetectionAdapter.h @@ -20,9 +20,9 @@ #include <dlog.h> #include "EngineConfig.h" -#include "itask.h" -#include "machine_learning_config.h" -#include "mobilenet_v1_ssd.h" +#include "ITask.h" +#include "MvMlConfig.h" +#include "MobilenetV1Ssd.h" namespace mediavision { @@ -32,7 +32,7 @@ class FaceDetectionAdapter : public mediavision::common::ITask { private: std::unique_ptr<IObjectDetection> _object_detection; - std::shared_ptr<MachineLearningConfig> _config; + std::shared_ptr<Config> _config; const std::string _config_file_name = "face_detection.json"; const std::string _plugin_config_file_name = "face_detection_plugin.json"; diff --git a/mv_machine_learning/object_detection/include/iobject_detection.h b/mv_machine_learning/object_detection/include/IObjectDetection.h index 5a64ad1d..5a64ad1d 100644 --- a/mv_machine_learning/object_detection/include/iobject_detection.h +++ b/mv_machine_learning/object_detection/include/IObjectDetection.h diff --git a/mv_machine_learning/object_detection/include/mobilenet_v1_ssd.h b/mv_machine_learning/object_detection/include/MobilenetV1Ssd.h index bb309bf7..e8e9d387 100644 --- a/mv_machine_learning/object_detection/include/mobilenet_v1_ssd.h +++ b/mv_machine_learning/object_detection/include/MobilenetV1Ssd.h @@ -22,7 +22,7 @@ #include <mv_common.h> #include "mv_private.h" -#include "object_detection.h" +#include "ObjectDetection.h" #include <mv_inference_type.h> namespace mediavision @@ -39,7 +39,7 @@ private: ObjectDetectionResult _result; public: - MobilenetV1Ssd(ObjectDetectionTaskType task_type, std::shared_ptr<MachineLearningConfig> config); + MobilenetV1Ssd(ObjectDetectionTaskType task_type, std::shared_ptr<Config> config); ~MobilenetV1Ssd(); ObjectDetectionResult &result() override; diff --git a/mv_machine_learning/object_detection/include/mobilenet_v2_ssd.h b/mv_machine_learning/object_detection/include/MobilenetV2Ssd.h index c598c43e..1f6f7891 100644 --- a/mv_machine_learning/object_detection/include/mobilenet_v2_ssd.h +++ b/mv_machine_learning/object_detection/include/MobilenetV2Ssd.h @@ -22,7 +22,7 @@ #include <mv_common.h> #include "mv_private.h" -#include "object_detection.h" +#include "ObjectDetection.h" #include <mv_inference_type.h> namespace mediavision @@ -45,7 +45,7 @@ private: Box decodeBoxWithAnchor(const BoxAnchorParam *boxAnchorParam, Box &box, cv::Rect2f &anchor); public: - MobilenetV2Ssd(ObjectDetectionTaskType task_type, std::shared_ptr<MachineLearningConfig> config); + MobilenetV2Ssd(ObjectDetectionTaskType task_type, std::shared_ptr<Config> config); ~MobilenetV2Ssd(); ObjectDetectionResult &result() override; diff --git a/mv_machine_learning/object_detection/include/object_detection.h b/mv_machine_learning/object_detection/include/ObjectDetection.h index a839ad25..03bce201 100644 --- a/mv_machine_learning/object_detection/include/object_detection.h +++ b/mv_machine_learning/object_detection/include/ObjectDetection.h @@ -32,10 +32,10 @@ #include "object_detection_type.h" #include "MetaParser.h" #include "ObjectDetectionParser.h" -#include "machine_learning_config.h" -#include "machine_learning_preprocess.h" -#include "iobject_detection.h" -#include "async_manager.h" +#include "MvMlConfig.h" +#include "MvMlPreprocess.h" +#include "IObjectDetection.h" +#include "AsyncManager.h" namespace mediavision { @@ -56,7 +56,7 @@ private: protected: std::unique_ptr<mediavision::inference::Inference> _inference; - std::shared_ptr<MachineLearningConfig> _config; + std::shared_ptr<Config> _config; std::vector<std::string> _labels; std::vector<std::string> _valid_backends; std::vector<std::string> _valid_devices; @@ -68,7 +68,7 @@ protected: virtual ObjectDetectionResult &result() = 0; public: - explicit ObjectDetection(ObjectDetectionTaskType task_type, std::shared_ptr<MachineLearningConfig> config); + explicit ObjectDetection(ObjectDetectionTaskType task_type, std::shared_ptr<Config> config); virtual ~ObjectDetection() = default; void preDestroy() override; diff --git a/mv_machine_learning/object_detection/include/object_detection_adapter.h b/mv_machine_learning/object_detection/include/ObjectDetectionAdapter.h index bec6c567..098964e4 100644 --- a/mv_machine_learning/object_detection/include/object_detection_adapter.h +++ b/mv_machine_learning/object_detection/include/ObjectDetectionAdapter.h @@ -20,10 +20,10 @@ #include <dlog.h> #include "EngineConfig.h" -#include "itask.h" -#include "machine_learning_config.h" -#include "mobilenet_v1_ssd.h" -#include "mobilenet_v2_ssd.h" +#include "ITask.h" +#include "MvMlConfig.h" +#include "MobilenetV1Ssd.h" +#include "MobilenetV2Ssd.h" namespace mediavision { @@ -33,7 +33,7 @@ class ObjectDetectionAdapter : public mediavision::common::ITask { private: std::unique_ptr<IObjectDetection> _object_detection; - std::shared_ptr<MachineLearningConfig> _config; + std::shared_ptr<Config> _config; const std::string _config_file_name = "object_detection.json"; const std::string _plugin_config_file_name = "object_detection_plugin.json"; diff --git a/mv_machine_learning/object_detection/include/object_detection_external.h b/mv_machine_learning/object_detection/include/ObjectDetectionExternal.h index ff63117d..e82f0bb7 100644 --- a/mv_machine_learning/object_detection/include/object_detection_external.h +++ b/mv_machine_learning/object_detection/include/ObjectDetectionExternal.h @@ -24,7 +24,7 @@ #include <opencv2/imgproc.hpp> #include "object_detection_type.h" -#include "iobject_detection.h" +#include "IObjectDetection.h" namespace mediavision { diff --git a/mv_machine_learning/object_detection/include/object_detection_type.h b/mv_machine_learning/object_detection/include/object_detection_type.h index 467374b5..b5e3b944 100644 --- a/mv_machine_learning/object_detection/include/object_detection_type.h +++ b/mv_machine_learning/object_detection/include/object_detection_type.h @@ -21,7 +21,7 @@ #include <mv_common.h> #include <mv_inference_type.h> -#include "MachineLearningType.h" +#include "mv_ml_types.h" namespace mediavision { diff --git a/mv_machine_learning/object_detection/src/face_detection_adapter.cpp b/mv_machine_learning/object_detection/src/FaceDetectionAdapter.cpp index 99eaa95b..30188442 100644 --- a/mv_machine_learning/object_detection/src/face_detection_adapter.cpp +++ b/mv_machine_learning/object_detection/src/FaceDetectionAdapter.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "machine_learning_exception.h" -#include "face_detection_adapter.h" -#include "object_detection_external.h" +#include "MvMlException.h" +#include "FaceDetectionAdapter.h" +#include "ObjectDetectionExternal.h" #include "mv_object_detection_config.h" using namespace std; @@ -30,7 +30,7 @@ namespace machine_learning { FaceDetectionAdapter::FaceDetectionAdapter() { - _config = make_shared<MachineLearningConfig>(); + _config = make_shared<Config>(); // If the model type needs external plugin then bypass to load the meta file and just create the external plugin. // In this case, external plugin will use its own meta file approach regardless of Mediavision's one. diff --git a/mv_machine_learning/object_detection/src/mobilenet_v1_ssd.cpp b/mv_machine_learning/object_detection/src/MobilenetV1Ssd.cpp index 5dcbed01..cb3c7ef8 100644 --- a/mv_machine_learning/object_detection/src/mobilenet_v1_ssd.cpp +++ b/mv_machine_learning/object_detection/src/MobilenetV1Ssd.cpp @@ -18,9 +18,9 @@ #include <map> #include <algorithm> -#include "machine_learning_exception.h" +#include "MvMlException.h" #include "mv_object_detection_config.h" -#include "mobilenet_v1_ssd.h" +#include "MobilenetV1Ssd.h" #include "Postprocess.h" using namespace std; @@ -32,7 +32,7 @@ namespace mediavision namespace machine_learning { template<typename T> -MobilenetV1Ssd<T>::MobilenetV1Ssd(ObjectDetectionTaskType task_type, std::shared_ptr<MachineLearningConfig> config) +MobilenetV1Ssd<T>::MobilenetV1Ssd(ObjectDetectionTaskType task_type, std::shared_ptr<Config> config) : ObjectDetection<T>(task_type, config), _result() {} diff --git a/mv_machine_learning/object_detection/src/MobilenetV2AnchorParser.cpp b/mv_machine_learning/object_detection/src/MobilenetV2AnchorParser.cpp index 066fa853..42c3526d 100644 --- a/mv_machine_learning/object_detection/src/MobilenetV2AnchorParser.cpp +++ b/mv_machine_learning/object_detection/src/MobilenetV2AnchorParser.cpp @@ -18,9 +18,9 @@ #include <string> #include <queue> #include <algorithm> -#include "machine_learning_exception.h" +#include "MvMlException.h" #include "MobilenetV2AnchorParser.h" -#include "common.h" +#include "meta_common.h" using namespace std; using namespace mediavision::machine_learning::exception; diff --git a/mv_machine_learning/object_detection/src/mobilenet_v2_ssd.cpp b/mv_machine_learning/object_detection/src/MobilenetV2Ssd.cpp index 41afeb39..47ed03a3 100644 --- a/mv_machine_learning/object_detection/src/mobilenet_v2_ssd.cpp +++ b/mv_machine_learning/object_detection/src/MobilenetV2Ssd.cpp @@ -19,9 +19,9 @@ #include <algorithm> #include <iostream> -#include "machine_learning_exception.h" +#include "MvMlException.h" #include "mv_object_detection_config.h" -#include "mobilenet_v2_ssd.h" +#include "MobilenetV2Ssd.h" #include "Postprocess.h" using namespace std; @@ -33,7 +33,7 @@ namespace mediavision namespace machine_learning { template<typename T> -MobilenetV2Ssd<T>::MobilenetV2Ssd(ObjectDetectionTaskType task_type, std::shared_ptr<MachineLearningConfig> config) +MobilenetV2Ssd<T>::MobilenetV2Ssd(ObjectDetectionTaskType task_type, std::shared_ptr<Config> config) : ObjectDetection<T>(task_type, config), _result() {} diff --git a/mv_machine_learning/object_detection/src/object_detection.cpp b/mv_machine_learning/object_detection/src/ObjectDetection.cpp index 539dd186..ea31f322 100644 --- a/mv_machine_learning/object_detection/src/object_detection.cpp +++ b/mv_machine_learning/object_detection/src/ObjectDetection.cpp @@ -19,10 +19,10 @@ #include <map> #include <memory> -#include "machine_learning_exception.h" -#include "mv_machine_learning_common.h" +#include "MvMlException.h" +#include "common.h" #include "mv_object_detection_config.h" -#include "object_detection.h" +#include "ObjectDetection.h" using namespace std; using namespace mediavision::inference; @@ -35,7 +35,7 @@ namespace mediavision namespace machine_learning { template<typename T> -ObjectDetection<T>::ObjectDetection(ObjectDetectionTaskType task_type, shared_ptr<MachineLearningConfig> config) +ObjectDetection<T>::ObjectDetection(ObjectDetectionTaskType task_type, shared_ptr<Config> config) : _task_type(task_type), _config(config) { _inference = make_unique<Inference>(); diff --git a/mv_machine_learning/object_detection/src/object_detection_adapter.cpp b/mv_machine_learning/object_detection/src/ObjectDetectionAdapter.cpp index cc883026..1b7e4c6e 100644 --- a/mv_machine_learning/object_detection/src/object_detection_adapter.cpp +++ b/mv_machine_learning/object_detection/src/ObjectDetectionAdapter.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "machine_learning_exception.h" -#include "object_detection_adapter.h" -#include "object_detection_external.h" +#include "MvMlException.h" +#include "ObjectDetectionAdapter.h" +#include "ObjectDetectionExternal.h" #include "mv_object_detection_config.h" using namespace std; @@ -30,7 +30,7 @@ namespace machine_learning { ObjectDetectionAdapter::ObjectDetectionAdapter() { - _config = make_shared<MachineLearningConfig>(); + _config = make_shared<Config>(); // If the model type needs external plugin then bypass to load the meta file and just create the external plugin. // In this case, external plugin will use its own meta file approach regardless of Mediavision's one. diff --git a/mv_machine_learning/object_detection/src/object_detection_external.cpp b/mv_machine_learning/object_detection/src/ObjectDetectionExternal.cpp index 1829cb70..2af7c8a0 100644 --- a/mv_machine_learning/object_detection/src/object_detection_external.cpp +++ b/mv_machine_learning/object_detection/src/ObjectDetectionExternal.cpp @@ -19,8 +19,8 @@ #include "mv_private.h" -#include "machine_learning_exception.h" -#include "object_detection_external.h" +#include "MvMlException.h" +#include "ObjectDetectionExternal.h" using namespace std; using namespace mediavision::machine_learning::exception; diff --git a/mv_machine_learning/object_detection/src/ObjectDetectionParser.cpp b/mv_machine_learning/object_detection/src/ObjectDetectionParser.cpp index 45052975..d4400424 100644 --- a/mv_machine_learning/object_detection/src/ObjectDetectionParser.cpp +++ b/mv_machine_learning/object_detection/src/ObjectDetectionParser.cpp @@ -15,7 +15,7 @@ */ #include <memory> -#include "machine_learning_exception.h" +#include "MvMlException.h" #include "ObjectDetectionParser.h" #include "object_detection_type.h" #include "MobilenetV2AnchorParser.h" diff --git a/mv_machine_learning/object_detection/src/mv_face_detection.cpp b/mv_machine_learning/object_detection/src/mv_face_detection.cpp index f5470d1a..b73cbb3d 100644 --- a/mv_machine_learning/object_detection/src/mv_face_detection.cpp +++ b/mv_machine_learning/object_detection/src/mv_face_detection.cpp @@ -16,13 +16,13 @@ #include "mv_private.h" #include "mv_feature_key.h" -#include "itask.h" +#include "ITask.h" #include "mv_face_detection_internal.h" -#include "face_detection_adapter.h" -#include "machine_learning_exception.h" -#include "MachineLearningNative.h" +#include "FaceDetectionAdapter.h" +#include "MvMlException.h" +#include "native_capi.h" #include "object_detection_type.h" -#include "context.h" +#include "Context.h" #include <new> #include <unistd.h> diff --git a/mv_machine_learning/object_detection/src/mv_object_detection.cpp b/mv_machine_learning/object_detection/src/mv_object_detection.cpp index 4fd9b9d4..b492d34c 100644 --- a/mv_machine_learning/object_detection/src/mv_object_detection.cpp +++ b/mv_machine_learning/object_detection/src/mv_object_detection.cpp @@ -16,13 +16,13 @@ #include "mv_private.h" #include "mv_feature_key.h" -#include "itask.h" +#include "ITask.h" #include "mv_object_detection_internal.h" -#include "object_detection_adapter.h" -#include "machine_learning_exception.h" -#include "MachineLearningNative.h" +#include "ObjectDetectionAdapter.h" +#include "MvMlException.h" +#include "native_capi.h" #include "object_detection_type.h" -#include "context.h" +#include "Context.h" #include <new> #include <unistd.h> diff --git a/mv_machine_learning/object_detection_3d/include/iobject_detection_3d.h b/mv_machine_learning/object_detection_3d/include/IObjectDetection3d.h index 1f1fa05f..1f1fa05f 100644 --- a/mv_machine_learning/object_detection_3d/include/iobject_detection_3d.h +++ b/mv_machine_learning/object_detection_3d/include/IObjectDetection3d.h diff --git a/mv_machine_learning/object_detection_3d/include/object_detection_3d.h b/mv_machine_learning/object_detection_3d/include/ObjectDetection3d.h index 9fc7306c..e2b347a5 100644 --- a/mv_machine_learning/object_detection_3d/include/object_detection_3d.h +++ b/mv_machine_learning/object_detection_3d/include/ObjectDetection3d.h @@ -25,11 +25,11 @@ #include "inference_engine_common_impl.h" #include "Inference.h" #include "object_detection_3d_type.h" -#include "iobject_detection_3d.h" +#include "IObjectDetection3d.h" #include "MetaParser.h" -#include "machine_learning_config.h" +#include "MvMlConfig.h" #include "ObjectDetection3dParser.h" -#include "machine_learning_preprocess.h" +#include "MvMlPreprocess.h" namespace mediavision { @@ -46,7 +46,7 @@ private: protected: std::unique_ptr<mediavision::inference::Inference> _inference; - std::shared_ptr<MachineLearningConfig> _config; + std::shared_ptr<Config> _config; std::vector<std::string> _labels; std::vector<std::string> _valid_backends; std::vector<std::string> _valid_devices; @@ -58,7 +58,7 @@ protected: void inference(std::vector<std::vector<T> > &inputVectors); public: - ObjectDetection3d(ObjectDetection3dTaskType task_type, std::shared_ptr<MachineLearningConfig> config); + ObjectDetection3d(ObjectDetection3dTaskType task_type, std::shared_ptr<Config> config); virtual ~ObjectDetection3d() = default; ObjectDetection3dTaskType getTaskType(); diff --git a/mv_machine_learning/object_detection_3d/include/object_detection_3d_adapter.h b/mv_machine_learning/object_detection_3d/include/ObjectDetection3dAdapter.h index b657b082..dbb89b6c 100644 --- a/mv_machine_learning/object_detection_3d/include/object_detection_3d_adapter.h +++ b/mv_machine_learning/object_detection_3d/include/ObjectDetection3dAdapter.h @@ -20,10 +20,10 @@ #include <dlog.h> #include "EngineConfig.h" -#include "itask.h" -#include "machine_learning_config.h" -#include "objectron.h" -#include "iobject_detection_3d.h" +#include "ITask.h" +#include "MvMlConfig.h" +#include "Objectron.h" +#include "IObjectDetection3d.h" namespace mediavision { @@ -33,7 +33,7 @@ class ObjectDetection3dAdapter : public mediavision::common::ITask { private: std::unique_ptr<IObjectDetection3d> _object_detection_3d; - std::shared_ptr<MachineLearningConfig> _config; + std::shared_ptr<Config> _config; const std::string _config_file_name = "object_detection_3d.json"; void create(const std::string &model_name); diff --git a/mv_machine_learning/object_detection_3d/include/objectron.h b/mv_machine_learning/object_detection_3d/include/Objectron.h index ca0cf990..3fa88751 100644 --- a/mv_machine_learning/object_detection_3d/include/objectron.h +++ b/mv_machine_learning/object_detection_3d/include/Objectron.h @@ -20,9 +20,9 @@ #include <memory> #include <mv_common.h> #include "mv_private.h" -#include "machine_learning_config.h" +#include "MvMlConfig.h" -#include "object_detection_3d.h" +#include "ObjectDetection3d.h" #include <mv_inference_type.h> namespace mediavision @@ -39,7 +39,7 @@ private: ObjectDetection3dResult _result; public: - Objectron(ObjectDetection3dTaskType task_type, std::shared_ptr<MachineLearningConfig> config); + Objectron(ObjectDetection3dTaskType task_type, std::shared_ptr<Config> config); ~Objectron(); ObjectDetection3dResult &result() override; diff --git a/mv_machine_learning/object_detection_3d/include/object_detection_3d_type.h b/mv_machine_learning/object_detection_3d/include/object_detection_3d_type.h index bd866018..ecbfd0b8 100644 --- a/mv_machine_learning/object_detection_3d/include/object_detection_3d_type.h +++ b/mv_machine_learning/object_detection_3d/include/object_detection_3d_type.h @@ -19,7 +19,7 @@ #include <mv_common.h> #include <mv_inference_type.h> -#include "MachineLearningType.h" +#include "mv_ml_types.h" namespace mediavision { diff --git a/mv_machine_learning/object_detection_3d/src/object_detection_3d.cpp b/mv_machine_learning/object_detection_3d/src/ObjectDetection3d.cpp index 46ade6df..120f6476 100644 --- a/mv_machine_learning/object_detection_3d/src/object_detection_3d.cpp +++ b/mv_machine_learning/object_detection_3d/src/ObjectDetection3d.cpp @@ -20,9 +20,9 @@ #include <memory> #include <algorithm> -#include "machine_learning_exception.h" -#include "mv_machine_learning_common.h" -#include "object_detection_3d.h" +#include "MvMlException.h" +#include "common.h" +#include "ObjectDetection3d.h" using namespace std; using namespace mediavision::inference; @@ -35,8 +35,7 @@ namespace mediavision namespace machine_learning { template<typename T> -ObjectDetection3d<T>::ObjectDetection3d(ObjectDetection3dTaskType task_type, - std::shared_ptr<MachineLearningConfig> config) +ObjectDetection3d<T>::ObjectDetection3d(ObjectDetection3dTaskType task_type, std::shared_ptr<Config> config) : _task_type(task_type), _config(config) { _inference = make_unique<Inference>(); diff --git a/mv_machine_learning/object_detection_3d/src/object_detection_3d_adapter.cpp b/mv_machine_learning/object_detection_3d/src/ObjectDetection3dAdapter.cpp index 74e6af34..bb2bace2 100644 --- a/mv_machine_learning/object_detection_3d/src/object_detection_3d_adapter.cpp +++ b/mv_machine_learning/object_detection_3d/src/ObjectDetection3dAdapter.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "machine_learning_exception.h" -#include "object_detection_3d_adapter.h" +#include "MvMlException.h" +#include "ObjectDetection3dAdapter.h" using namespace std; using namespace MediaVision::Common; @@ -28,7 +28,7 @@ namespace machine_learning { ObjectDetection3dAdapter::ObjectDetection3dAdapter() { - _config = make_shared<MachineLearningConfig>(); + _config = make_shared<Config>(); _config->parseConfigFile(_config_file_name); create(_config->getDefaultModelName()); diff --git a/mv_machine_learning/object_detection_3d/src/ObjectDetection3dParser.cpp b/mv_machine_learning/object_detection_3d/src/ObjectDetection3dParser.cpp index 373ef5c2..37d2bf9f 100644 --- a/mv_machine_learning/object_detection_3d/src/ObjectDetection3dParser.cpp +++ b/mv_machine_learning/object_detection_3d/src/ObjectDetection3dParser.cpp @@ -15,7 +15,7 @@ */ #include <iostream> -#include "machine_learning_exception.h" +#include "MvMlException.h" #include "ObjectDetection3dParser.h" using namespace std; diff --git a/mv_machine_learning/object_detection_3d/src/objectron.cpp b/mv_machine_learning/object_detection_3d/src/Objectron.cpp index 24528661..cc0bdb1d 100644 --- a/mv_machine_learning/object_detection_3d/src/objectron.cpp +++ b/mv_machine_learning/object_detection_3d/src/Objectron.cpp @@ -18,8 +18,8 @@ #include <map> #include <algorithm> -#include "machine_learning_exception.h" -#include "objectron.h" +#include "MvMlException.h" +#include "Objectron.h" #include "Postprocess.h" using namespace std; @@ -31,7 +31,7 @@ namespace mediavision namespace machine_learning { template<typename T> -Objectron<T>::Objectron(ObjectDetection3dTaskType task_type, std::shared_ptr<MachineLearningConfig> config) +Objectron<T>::Objectron(ObjectDetection3dTaskType task_type, std::shared_ptr<Config> config) : ObjectDetection3d<T>(task_type, config), _result() {} diff --git a/mv_machine_learning/object_detection_3d/src/mv_object_detection_3d.cpp b/mv_machine_learning/object_detection_3d/src/mv_object_detection_3d.cpp index ff238ce6..d43b5c48 100644 --- a/mv_machine_learning/object_detection_3d/src/mv_object_detection_3d.cpp +++ b/mv_machine_learning/object_detection_3d/src/mv_object_detection_3d.cpp @@ -16,13 +16,13 @@ #include "mv_private.h" #include "mv_feature_key.h" -#include "itask.h" +#include "ITask.h" #include "mv_object_detection_3d_internal.h" -#include "object_detection_3d_adapter.h" -#include "machine_learning_exception.h" -#include "MachineLearningNative.h" +#include "ObjectDetection3dAdapter.h" +#include "MvMlException.h" +#include "native_capi.h" #include "object_detection_3d_type.h" -#include "context.h" +#include "Context.h" #include <new> #include <unistd.h> diff --git a/mv_machine_learning/training/include/data_set_manager.h b/mv_machine_learning/training/include/DataSetManager.h index e59d9c5f..b526e7e8 100644 --- a/mv_machine_learning/training/include/data_set_manager.h +++ b/mv_machine_learning/training/include/DataSetManager.h @@ -21,7 +21,7 @@ #include <vector> #include <map> -#include "feature_vector_manager.h" +#include "FeatureVectorManager.h" class DataSetManager { diff --git a/mv_machine_learning/training/include/feature_vector_manager.h b/mv_machine_learning/training/include/FeatureVectorManager.h index 5dce36fb..5dce36fb 100644 --- a/mv_machine_learning/training/include/feature_vector_manager.h +++ b/mv_machine_learning/training/include/FeatureVectorManager.h diff --git a/mv_machine_learning/training/include/label_manager.h b/mv_machine_learning/training/include/LabelManager.h index 325c1ab8..325c1ab8 100644 --- a/mv_machine_learning/training/include/label_manager.h +++ b/mv_machine_learning/training/include/LabelManager.h diff --git a/mv_machine_learning/training/include/training_model.h b/mv_machine_learning/training/include/TrainingModel.h index 97f87aa4..f153fc64 100644 --- a/mv_machine_learning/training/include/training_model.h +++ b/mv_machine_learning/training/include/TrainingModel.h @@ -25,8 +25,8 @@ #include "training_engine_error.h" #include "training_engine_common_impl.h" #include "inference_engine_common_impl.h" -#include "data_set_manager.h" -#include "feature_vector_manager.h" +#include "DataSetManager.h" +#include "FeatureVectorManager.h" struct TrainingEngineBackendInfo { std::vector<std::string> input_layer_names; diff --git a/mv_machine_learning/training/src/data_set_manager.cpp b/mv_machine_learning/training/src/DataSetManager.cpp index ed69fbb5..d7c552bb 100644 --- a/mv_machine_learning/training/src/data_set_manager.cpp +++ b/mv_machine_learning/training/src/DataSetManager.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "data_set_manager.h" +#include "DataSetManager.h" using namespace std; diff --git a/mv_machine_learning/training/src/feature_vector_manager.cpp b/mv_machine_learning/training/src/FeatureVectorManager.cpp index d49964b1..eb243408 100644 --- a/mv_machine_learning/training/src/feature_vector_manager.cpp +++ b/mv_machine_learning/training/src/FeatureVectorManager.cpp @@ -17,8 +17,8 @@ #include <opencv2/opencv.hpp> #include <opencv2/imgproc/imgproc.hpp> -#include "machine_learning_exception.h" -#include "feature_vector_manager.h" +#include "MvMlException.h" +#include "FeatureVectorManager.h" using namespace std; using namespace mediavision::machine_learning::exception; diff --git a/mv_machine_learning/training/src/label_manager.cpp b/mv_machine_learning/training/src/LabelManager.cpp index 0a3e72d9..b0335416 100644 --- a/mv_machine_learning/training/src/label_manager.cpp +++ b/mv_machine_learning/training/src/LabelManager.cpp @@ -17,8 +17,8 @@ #include <dlog.h> #include <mv_private.h> -#include "machine_learning_exception.h" -#include "label_manager.h" +#include "MvMlException.h" +#include "LabelManager.h" using namespace std; using namespace mediavision::machine_learning::exception; diff --git a/mv_machine_learning/training/src/training_model.cpp b/mv_machine_learning/training/src/TrainingModel.cpp index 749714a3..e35adf76 100644 --- a/mv_machine_learning/training/src/training_model.cpp +++ b/mv_machine_learning/training/src/TrainingModel.cpp @@ -26,8 +26,8 @@ #include <dlog.h> #include <mv_private.h> -#include "machine_learning_exception.h" -#include "training_model.h" +#include "MvMlException.h" +#include "TrainingModel.h" using namespace std; using namespace TrainingEngineInterface::Common; diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec index 9f93e883..461e13d7 100644 --- a/packaging/capi-media-vision.spec +++ b/packaging/capi-media-vision.spec @@ -411,10 +411,10 @@ find . -name '*.gcno' -not -path "./test/*" -not -path "./mv_machine_learning/*" %files machine_learning-devel %{_includedir}/media/mv_infer*.h -%{_includedir}/media/machine_learning_exception.h -%{_includedir}/media/machine_learning_config.h -%{_includedir}/media/MachineLearningType.h -%{_includedir}/media/machine_learning_preprocess.h +%{_includedir}/media/MvMlException.h +%{_includedir}/media/MvMlConfig.h +%{_includedir}/media/mv_ml_types.h +%{_includedir}/media/MvMlPreprocess.h %{_libdir}/pkgconfig/*inference.pc %if "%{enable_ml_face_recognition}" == "1" %{_includedir}/media/mv_face_recognition*.h @@ -431,7 +431,7 @@ find . -name '*.gcno' -not -path "./test/*" -not -path "./mv_machine_learning/*" %{_includedir}/media/mv_object_detection_type.h %{_includedir}/media/mv_face_detection_internal.h %{_includedir}/media/mv_face_detection_type.h -%{_includedir}/media/iobject_detection.h +%{_includedir}/media/IObjectDetection.h %{_includedir}/media/object_detection_type.h %{_libdir}/pkgconfig/*object-detection.pc %endif @@ -450,7 +450,7 @@ find . -name '*.gcno' -not -path "./test/*" -not -path "./mv_machine_learning/*" %if "%{enable_ml_image_segmentation}" == "1" %{_includedir}/media/mv_selfie_segmentation_internal.h %{_includedir}/media/mv_selfie_segmentation_type.h -%{_includedir}/media/iimage_segmentation.h +%{_includedir}/media/IImageSegmentation.h %{_includedir}/media/image_segmentation_type.h %{_libdir}/pkgconfig/*image-segmentation.pc %endif |