diff options
| author | Kwanghoon Son <k.son@samsung.com> | 2024-03-06 11:21:19 +0900 |
|---|---|---|
| committer | Kwanghoon Son <k.son@samsung.com> | 2024-03-06 11:23:29 +0900 |
| commit | cb868db7956d42b27851dc0fa01abae80cbe9087 (patch) | |
| tree | a395f15352e86d9dd9ef9d6aa6b3f58a15358aa9 | |
| parent | 2a7f0c5068c520565e64e127002b3d7b00363abf (diff) | |
| parent | 05df5d983ee8118612f775ec1a94382df671a807 (diff) | |
| download | mediavision-accepted/tizen_unified_toolchain.tar.gz mediavision-accepted/tizen_unified_toolchain.tar.bz2 mediavision-accepted/tizen_unified_toolchain.zip | |
Merge branch 'tizen_devel' into tizenaccepted/tizen/unified/x/20240308.033352accepted/tizen/unified/toolchain/20240311.065138accepted/tizen/unified/20240306.174221accepted/tizen_unified_toolchain
[Version] 0.35.0
Inki Dae (1):
mv_machine_learning: initialize backend type correctly
Kwanghoon Son (8):
Fix compiler warning
clang-format: Turn on SortUsingDeclarations
clang-format: Add missing header
Support ubuntu build
Cmake: Fix wrong dependency
Enable mv_machine_learning build
Apply clang-format sort include
Add mv_test on non-tizen build
Change-Id: I4ed76520d5d85a0161fa7b5cdab2fd9eb3deef15
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
254 files changed, 760 insertions, 695 deletions
diff --git a/.clang-format b/.clang-format index e8177de1..18f3e380 100644 --- a/.clang-format +++ b/.clang-format @@ -7,9 +7,6 @@ Language: Cpp # Turn off build breakable FixNamespaceComments: false ReflowComments: false -SortIncludes: false # can break build; turning off -SortUsingDeclarations: false # can break build; turning off - # Enterprise guide # M08 diff --git a/CMakeLists.txt b/CMakeLists.txt index f7c5dc07..ca9b397d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,15 +48,29 @@ set(MV_IMAGE_SEGMENTATION_LIB_NAME "mv_image_segmentation" CACHE STRING include(FindPkgConfig) include(GNUInstallDirs) +pkg_check_modules(TIZEN_PKG QUIET capi-system-info) +if(TIZEN_PKG_FOUND) + set(IS_TIZEN ON) +else() + set(IS_TIZEN OFF) + add_compile_definitions("MV_CONFIG_PATH=\"${PROJECT_SOURCE_DIR}/\"") +endif() + add_subdirectory(mv_common) add_subdirectory(mv_machine_learning) -add_subdirectory(mv_barcode) -add_subdirectory(mv_image) -add_subdirectory(mv_face) -add_subdirectory(mv_surveillance) -add_subdirectory(mv_3d) -add_subdirectory(mv_roi_tracker) +if(${IS_TIZEN}) + add_subdirectory(mv_barcode) + add_subdirectory(mv_image) + add_subdirectory(mv_face) + add_subdirectory(mv_surveillance) + add_subdirectory(mv_3d) + add_subdirectory(mv_roi_tracker) +endif() + add_subdirectory(test) +if(NOT ${IS_TIZEN}) + return() +endif() set(TOTAL_REQUIRED "") set(TOTAL_LDFLAGS "") diff --git a/include/mv_3d.h b/include/mv_3d.h index e912ae6c..a643a787 100644 --- a/include/mv_3d.h +++ b/include/mv_3d.h @@ -17,9 +17,9 @@ #ifndef __TIZEN_MEDIAVISION_3D_H__ #define __TIZEN_MEDIAVISION_3D_H__ -#include <stdbool.h> -#include <mv_common.h> #include <mv_3d_type.h> +#include <mv_common.h> +#include <stdbool.h> #ifdef __cplusplus extern "C" { diff --git a/include/mv_3d_private.h b/include/mv_3d_private.h index 33880e12..1b526e62 100644 --- a/include/mv_3d_private.h +++ b/include/mv_3d_private.h @@ -17,8 +17,8 @@ #ifndef __TIZEN_MEDIAVISION_3D_PRIVATE_H__ #define __TIZEN_MEDIAVISION_3D_PRIVATE_H__ -#include <cstdio> #include "mv_3d_type.h" +#include <cstdio> #ifdef MV_3D_POINTCLOUD_IS_AVAILABLE #include <open3d/Open3D.h> diff --git a/include/mv_barcode.h b/include/mv_barcode.h index c71b12c2..4f1d9604 100644 --- a/include/mv_barcode.h +++ b/include/mv_barcode.h @@ -17,9 +17,9 @@ #ifndef __TIZEN_MEDIAVISION_BARCODE_H__ #define __TIZEN_MEDIAVISION_BARCODE_H__ -#include <mv_common.h> #include <mv_barcode_detect.h> #include <mv_barcode_generate.h> +#include <mv_common.h> /** * @file mv_barcode.h diff --git a/include/mv_barcode_detect.h b/include/mv_barcode_detect.h index c8e89bf8..1c47a697 100644 --- a/include/mv_barcode_detect.h +++ b/include/mv_barcode_detect.h @@ -17,8 +17,8 @@ #ifndef __TIZEN_MEDIAVISION_BARCODE_DETECT_H__ #define __TIZEN_MEDIAVISION_BARCODE_DETECT_H__ -#include <mv_common.h> #include <mv_barcode_type.h> +#include <mv_common.h> #ifdef __cplusplus extern "C" { diff --git a/include/mv_barcode_generate.h b/include/mv_barcode_generate.h index e3e281e4..2515e727 100644 --- a/include/mv_barcode_generate.h +++ b/include/mv_barcode_generate.h @@ -17,8 +17,8 @@ #ifndef __TIZEN_MEDIAVISION_BARCODE_GENERATE_H__ #define __TIZEN_MEDIAVISION_BARCODE_GENERATE_H__ -#include <mv_common.h> #include <mv_barcode_type.h> +#include <mv_common.h> #ifdef __cplusplus extern "C" { diff --git a/mv_3d/3d/include/Mv3d.h b/mv_3d/3d/include/Mv3d.h index 8a0e4379..ed475e66 100644 --- a/mv_3d/3d/include/Mv3d.h +++ b/mv_3d/3d/include/Mv3d.h @@ -17,13 +17,13 @@ #ifndef __MEDIA_VISION_3D_H__ #define __MEDIA_VISION_3D_H__ -#include <cstddef> -#include <glib.h> -#include "dfs_parameter.h" #include "dfs_adaptation_impl.h" +#include "dfs_parameter.h" #include "mv_3d.h" -#include "mv_3d_type.h" #include "mv_3d_private.h" +#include "mv_3d_type.h" +#include <cstddef> +#include <glib.h> /** * @file Depth.h diff --git a/mv_3d/3d/src/Mv3d.cpp b/mv_3d/3d/src/Mv3d.cpp index c1c960c0..c3adb3bd 100644 --- a/mv_3d/3d/src/Mv3d.cpp +++ b/mv_3d/3d/src/Mv3d.cpp @@ -15,13 +15,13 @@ */ #include "mv_private.h" -#include <mv_common.h> #include <MediaSource.h> #include <memory> -#include <unistd.h> +#include <mv_common.h> #include <opencv2/core.hpp> #include <opencv2/imgcodecs.hpp> #include <opencv2/imgproc.hpp> +#include <unistd.h> #ifdef MV_3D_POINTCLOUD_IS_AVAILABLE #include <open3d/Open3D.h> diff --git a/mv_3d/3d/src/mv_3d.cpp b/mv_3d/3d/src/mv_3d.cpp index a9ff00fa..282a4b5a 100644 --- a/mv_3d/3d/src/mv_3d.cpp +++ b/mv_3d/3d/src/mv_3d.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ -#include <new> -#include <exception> #include <cstddef> +#include <exception> +#include <new> -#include "mv_private.h" -#include "mv_feature_key.h" -#include "mv_common.h" -#include "mv_3d.h" #include "Mv3d.h" +#include "mv_3d.h" +#include "mv_common.h" +#include "mv_feature_key.h" +#include "mv_private.h" using namespace mediavision::mv3d; diff --git a/mv_3d/3d/src/mv_3d_internal.cpp b/mv_3d/3d/src/mv_3d_internal.cpp index a2d57f05..746a8f1b 100644 --- a/mv_3d/3d/src/mv_3d_internal.cpp +++ b/mv_3d/3d/src/mv_3d_internal.cpp @@ -19,10 +19,10 @@ #include <open3d/Open3D.h> #endif +#include "Mv3d.h" #include "mv_3d_internal.h" -#include "mv_private.h" #include "mv_3d_private.h" -#include "Mv3d.h" +#include "mv_private.h" #define DISTANCE_THRESHOLD 0.01 #define RANSAC_NUMBER 3 diff --git a/mv_barcode/barcode_detector/src/mv_barcode_detect.cpp b/mv_barcode/barcode_detector/src/mv_barcode_detect.cpp index 725ef18a..807e0913 100644 --- a/mv_barcode/barcode_detector/src/mv_barcode_detect.cpp +++ b/mv_barcode/barcode_detector/src/mv_barcode_detect.cpp @@ -16,9 +16,9 @@ #include <system_info.h> -#include "mv_private.h" -#include "mv_feature_key.h" #include "mv_barcode_detect.h" +#include "mv_feature_key.h" +#include "mv_private.h" /* Include headers of open barcode detect module here. */ #include "mv_barcode_detect_open.h" diff --git a/mv_barcode/barcode_detector/src/mv_barcode_detect_open.cpp b/mv_barcode/barcode_detector/src/mv_barcode_detect_open.cpp index d375e53c..d5e7a870 100644 --- a/mv_barcode/barcode_detector/src/mv_barcode_detect_open.cpp +++ b/mv_barcode/barcode_detector/src/mv_barcode_detect_open.cpp @@ -19,12 +19,12 @@ #include "Barcode.h" #include "BarcodeUtils.h" +#include <CommonUtils.h> #include <mv_private.h> -#include <vector> #include <opencv2/core/core.hpp> #include <opencv2/imgproc/imgproc.hpp> +#include <vector> #include <zbar.h> -#include <CommonUtils.h> using namespace MediaVision::Barcode; diff --git a/mv_barcode/barcode_generator/include/BarcodeGenerator.h b/mv_barcode/barcode_generator/include/BarcodeGenerator.h index 4aa0ec2c..77d80939 100644 --- a/mv_barcode/barcode_generator/include/BarcodeGenerator.h +++ b/mv_barcode/barcode_generator/include/BarcodeGenerator.h @@ -18,11 +18,11 @@ #define __MEDIA_VISION_BARCODE_GENERATOR_H__ #include "BarcodeOptions.h" -#include <zint.h> -#include <string> #include <EngineConfig.h> -#include <opencv2/core/mat.hpp> #include <mv_barcode_type.h> +#include <opencv2/core/mat.hpp> +#include <string> +#include <zint.h> /** * @file BarcodeGenerator.h diff --git a/mv_barcode/barcode_generator/include/mv_barcode_generate_open.h b/mv_barcode/barcode_generator/include/mv_barcode_generate_open.h index 8ecd486e..45336d94 100644 --- a/mv_barcode/barcode_generator/include/mv_barcode_generate_open.h +++ b/mv_barcode/barcode_generator/include/mv_barcode_generate_open.h @@ -17,8 +17,8 @@ #ifndef __MEDIA_VISION_BARCODE_GENERATE_OPEN_H__ #define __MEDIA_VISION_BARCODE_GENERATE_OPEN_H__ -#include "mv_barcode_generate.h" #include "BarcodeGenerator.h" +#include "mv_barcode_generate.h" #include <zint.h> /** diff --git a/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp b/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp index 2ad8be8a..bb036dc5 100644 --- a/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp +++ b/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp @@ -21,14 +21,14 @@ #include <zint.h> #include <opencv2/core.hpp> -#include <opencv2/imgproc.hpp> #include <opencv2/highgui.hpp> #include <opencv2/imgcodecs/legacy/constants_c.h> +#include <opencv2/imgproc.hpp> #include <cstring> -#include <vector> -#include <unistd.h> #include <mv_barcode_generate.h> +#include <unistd.h> +#include <vector> #define ZINT_COLOUR_SIZE 10 diff --git a/mv_barcode/barcode_generator/src/mv_barcode_generate.cpp b/mv_barcode/barcode_generator/src/mv_barcode_generate.cpp index 3bdaed52..84fd5de7 100644 --- a/mv_barcode/barcode_generator/src/mv_barcode_generate.cpp +++ b/mv_barcode/barcode_generator/src/mv_barcode_generate.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ +#include "mv_barcode_generate.h" +#include "mv_feature_key.h" +#include "mv_private.h" #include <string> #include <system_info.h> #include <zint.h> -#include "mv_private.h" -#include "mv_feature_key.h" -#include "mv_barcode_generate.h" /* Include headers of open barcode generate module here. */ #include "mv_barcode_generate_open.h" diff --git a/mv_barcode/barcode_generator/src/mv_barcode_generate_open.cpp b/mv_barcode/barcode_generator/src/mv_barcode_generate_open.cpp index 7dc507e0..edb71f82 100644 --- a/mv_barcode/barcode_generator/src/mv_barcode_generate_open.cpp +++ b/mv_barcode/barcode_generator/src/mv_barcode_generate_open.cpp @@ -16,8 +16,8 @@ #include "mv_barcode_generate_open.h" -#include "mv_common.h" #include "BarcodeGenerator.h" +#include "mv_common.h" #include <mv_private.h> diff --git a/mv_common/CMakeLists.txt b/mv_common/CMakeLists.txt index fc36248d..ce8727aa 100644 --- a/mv_common/CMakeLists.txt +++ b/mv_common/CMakeLists.txt @@ -1,20 +1,30 @@ project(${MV_COMMON_LIB_NAME}) cmake_minimum_required(VERSION 3.13) -file(GLOB MV_COMMON_SRC_LIST "${PROJECT_SOURCE_DIR}/src/*.cpp") - find_package(OpenCV REQUIRED imgproc) if(NOT OpenCV_FOUND) message(SEND_ERROR "Failed to find OpenCV") return() endif() -pkg_check_modules(${PROJECT_NAME}_DEP REQUIRED json-glib-1.0 capi-system-info capi-media-tool dlog) - +set(MV_COMMON_SRC_LIST + src/CommonUtils.cpp src/EngineConfig.cpp src/MediaSource.cpp src/mv_common.cpp) add_library(${PROJECT_NAME} SHARED ${MV_COMMON_SRC_LIST}) + +set(MV_COMMON_DEP json-glib-1.0 dlog capi-media-tool) + +if(${IS_TIZEN}) + list(APPEND MV_COMMON_DEP capi-system-info) + target_sources(${PROJECT_NAME} PRIVATE src/tizen/mv_feature_key.cpp) + target_compile_options(${PROJECT_NAME} PRIVATE -Werror) +else() + target_sources(${PROJECT_NAME} PRIVATE src/mv_feature_key.cpp) +endif() + +pkg_check_modules(${PROJECT_NAME}_DEP REQUIRED ${MV_COMMON_DEP}) target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS} ${${PROJECT_NAME}_DEP_LIBRARIES}) target_include_directories(${PROJECT_NAME} PUBLIC include ${${PROJECT_NAME}_DEP_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include) -target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror) +target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra) install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) install( DIRECTORY ${PROJECT_SOURCE_DIR}/../include/ DESTINATION include/media diff --git a/mv_common/include/EngineConfig.h b/mv_common/include/EngineConfig.h index dabf18a0..ac111ea6 100644 --- a/mv_common/include/EngineConfig.h +++ b/mv_common/include/EngineConfig.h @@ -17,8 +17,8 @@ #ifndef __MEDIA_VISION_ENGINE_CONFIG_H__ #define __MEDIA_VISION_ENGINE_CONFIG_H__ -#include <string> #include <map> +#include <string> #include <vector> #include "mv_common.h" diff --git a/mv_common/include/mv_private.h b/mv_common/include/mv_private.h index 93813db2..63ad0b39 100644 --- a/mv_common/include/mv_private.h +++ b/mv_common/include/mv_private.h @@ -21,8 +21,8 @@ extern "C" { #endif /* __cplusplus */ -#include <stdbool.h> #include <dlog.h> +#include <stdbool.h> #ifdef LOG_TAG #undef LOG_TAG diff --git a/mv_common/src/mv_common.cpp b/mv_common/src/mv_common.cpp index 313436b8..a80d5268 100644 --- a/mv_common/src/mv_common.cpp +++ b/mv_common/src/mv_common.cpp @@ -14,20 +14,20 @@ * limitations under the License. */ -#include <new> #include <memory> -#include <string.h> -#include <stdlib.h> +#include <new> #include <stdexcept> +#include <stdlib.h> +#include <string.h> +#include "mv_feature_key.h" #include <media_packet.h> #include <mv_common.h> #include <mv_common_internal.h> #include <mv_private.h> -#include "mv_feature_key.h" -#include "MediaSource.h" #include "EngineConfig.h" +#include "MediaSource.h" static const char *feature_keys[] = { "http://tizen.org/feature/vision.barcode_detection", "http://tizen.org/feature/vision.barcode_generation", diff --git a/mv_common/src/mv_feature_key.cpp b/mv_common/src/mv_feature_key.cpp index e8638bfb..36777487 100644 --- a/mv_common/src/mv_feature_key.cpp +++ b/mv_common/src/mv_feature_key.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2024 Samsung Electronics Co., Ltd All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,22 +15,8 @@ */ #include "mv_feature_key.h" -#include <system_info.h> bool mv_check_feature_key(const char *keys[], size_t num_keys, bool at_least_one) { - bool or_result = false; - for (size_t i = 0; i < num_keys; i++) { - bool supported = false; - - if (system_info_get_platform_bool(keys[i], &supported)) { - return false; - } - - or_result |= supported; - if (!supported && !at_least_one) - return false; - } - - return or_result; + return true; } diff --git a/mv_common/src/tizen/mv_feature_key.cpp b/mv_common/src/tizen/mv_feature_key.cpp new file mode 100644 index 00000000..471f892d --- /dev/null +++ b/mv_common/src/tizen/mv_feature_key.cpp @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2023 - 2024 Samsung Electronics Co., Ltd All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "mv_feature_key.h" +#include <system_info.h> + +bool mv_check_feature_key(const char *keys[], size_t num_keys, bool at_least_one) +{ + bool or_result = false; + for (size_t i = 0; i < num_keys; i++) { + bool supported = false; + + if (system_info_get_platform_bool(keys[i], &supported)) { + return false; + } + + or_result |= supported; + if (!supported && !at_least_one) + return false; + } + + return or_result; +} diff --git a/mv_face/face/include/FaceDetector.h b/mv_face/face/include/FaceDetector.h index 19176a61..b4281712 100644 --- a/mv_face/face/include/FaceDetector.h +++ b/mv_face/face/include/FaceDetector.h @@ -18,8 +18,8 @@ #define __MEDIA_VISION_FACE_DETECTOR_H__ #include <opencv2/objdetect.hpp> -#include <vector> #include <string> +#include <vector> /** * @file FaceDetector.h diff --git a/mv_face/face/include/FaceRecognitionModel.h b/mv_face/face/include/FaceRecognitionModel.h index 6ae4008b..5ae7c912 100644 --- a/mv_face/face/include/FaceRecognitionModel.h +++ b/mv_face/face/include/FaceRecognitionModel.h @@ -24,8 +24,8 @@ #include <opencv2/imgproc.hpp> #include <cstring> -#include <vector> #include <set> +#include <vector> /** * @file FaceRecognitionModel.h diff --git a/mv_face/face/include/FaceTrackingModel.h b/mv_face/face/include/FaceTrackingModel.h index ce9a5f81..f4e9fd98 100644 --- a/mv_face/face/include/FaceTrackingModel.h +++ b/mv_face/face/include/FaceTrackingModel.h @@ -17,8 +17,8 @@ #ifndef __MEDIA_VISION_FACE_TRACKING_MODEL_H__ #define __MEDIA_VISION_FACE_TRACKING_MODEL_H__ -#include <opencv2/core.hpp> #include "FaceTracker.h" +#include <opencv2/core.hpp> /** * @file FaceTrackingModel.h diff --git a/mv_face/face/src/FaceEyeCondition.cpp b/mv_face/face/src/FaceEyeCondition.cpp index a0cf7b47..7312d154 100644 --- a/mv_face/face/src/FaceEyeCondition.cpp +++ b/mv_face/face/src/FaceEyeCondition.cpp @@ -18,8 +18,8 @@ #include <mv_private.h> -#include <vector> #include <opencv2/imgproc/imgproc_c.h> +#include <vector> namespace MediaVision { diff --git a/mv_face/face/src/FaceRecognitionModel.cpp b/mv_face/face/src/FaceRecognitionModel.cpp index c926dab8..1cb5b13f 100644 --- a/mv_face/face/src/FaceRecognitionModel.cpp +++ b/mv_face/face/src/FaceRecognitionModel.cpp @@ -16,14 +16,14 @@ #include "FaceRecognitionModel.h" -#include "mv_private.h" #include "mv_common.h" +#include "mv_private.h" #include <map> +#include <fstream> #include <stdio.h> #include <unistd.h> -#include <fstream> namespace MediaVision { diff --git a/mv_face/face/src/FaceTracker.cpp b/mv_face/face/src/FaceTracker.cpp index 30cdf648..56e4ddde 100644 --- a/mv_face/face/src/FaceTracker.cpp +++ b/mv_face/face/src/FaceTracker.cpp @@ -41,8 +41,8 @@ #include "FaceTracker.h" -#include "opencv2/video/tracking.hpp" #include "opencv2/imgproc.hpp" +#include "opencv2/video/tracking.hpp" #include <algorithm> #include <cmath> diff --git a/mv_face/face/src/FaceTrackingModel.cpp b/mv_face/face/src/FaceTrackingModel.cpp index af206510..185d139b 100644 --- a/mv_face/face/src/FaceTrackingModel.cpp +++ b/mv_face/face/src/FaceTrackingModel.cpp @@ -16,8 +16,8 @@ #include "FaceTrackingModel.h" -#include "mv_private.h" #include "mv_common.h" +#include "mv_private.h" #include <unistd.h> diff --git a/mv_face/face/src/mv_face.c b/mv_face/face/src/mv_face.c index d4e669d5..15a3c00b 100644 --- a/mv_face/face/src/mv_face.c +++ b/mv_face/face/src/mv_face.c @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "mv_private.h" -#include "mv_feature_key.h" #include "mv_face.h" #include "mv_face_open.h" +#include "mv_feature_key.h" +#include "mv_private.h" /** * @file mv_face.c diff --git a/mv_face/face/src/mv_face_open.cpp b/mv_face/face/src/mv_face_open.cpp index 34e2d995..3eb1e48f 100644 --- a/mv_face/face/src/mv_face_open.cpp +++ b/mv_face/face/src/mv_face_open.cpp @@ -17,17 +17,17 @@ #include "mv_face_open.h" #include "FaceDetector.h" -#include "FaceUtil.h" +#include "FaceExpressionRecognizer.h" +#include "FaceEyeCondition.h" #include "FaceRecognitionModel.h" #include "FaceTrackingModel.h" -#include "FaceEyeCondition.h" -#include "FaceExpressionRecognizer.h" +#include "FaceUtil.h" #include "mv_private.h" -#include <vector> -#include <set> #include <cstring> +#include <set> +#include <vector> #include <CommonUtils.h> diff --git a/mv_image/image/include/Features/FeaturePack.h b/mv_image/image/include/Features/FeaturePack.h index 746dac66..16751572 100644 --- a/mv_image/image/include/Features/FeaturePack.h +++ b/mv_image/image/include/Features/FeaturePack.h @@ -17,15 +17,15 @@ #ifndef __MEDIA_VISION_FEATUREPACK_H__ #define __MEDIA_VISION_FEATUREPACK_H__ -#include "mv_private.h" #include "ImageConfig.h" +#include "mv_private.h" -#include <vector> +#include <opencv2/calib3d.hpp> #include <opencv2/core.hpp> -#include <opencv2/imgproc.hpp> #include <opencv2/features2d.hpp> +#include <opencv2/imgproc.hpp> #include <opencv2/xfeatures2d.hpp> -#include <opencv2/calib3d.hpp> +#include <vector> namespace MediaVision { diff --git a/mv_image/image/include/Recognition/ImageRecognizer.h b/mv_image/image/include/Recognition/ImageRecognizer.h index a549e169..226880ea 100644 --- a/mv_image/image/include/Recognition/ImageRecognizer.h +++ b/mv_image/image/include/Recognition/ImageRecognizer.h @@ -17,8 +17,8 @@ #ifndef __MEDIA_VISION_IMAGERECOGNIZER_H__ #define __MEDIA_VISION_IMAGERECOGNIZER_H__ -#include "ImageMathUtil.h" #include "ImageConfig.h" +#include "ImageMathUtil.h" #include "Recognition/ImageObject.h" diff --git a/mv_image/image/include/Tracking/ImageContourStabilizator.h b/mv_image/image/include/Tracking/ImageContourStabilizator.h index 3e42d08c..5b01937a 100644 --- a/mv_image/image/include/Tracking/ImageContourStabilizator.h +++ b/mv_image/image/include/Tracking/ImageContourStabilizator.h @@ -17,8 +17,8 @@ #ifndef __MEDIA_VISION_IMAGECONTOURSTABILIZATOR_H__ #define __MEDIA_VISION_IMAGECONTOURSTABILIZATOR_H__ -#include <deque> #include "ImageConfig.h" +#include <deque> /** * @file ImageContourStabilizator.h diff --git a/mv_image/image/include/Tracking/ImageTrackingModel.h b/mv_image/image/include/Tracking/ImageTrackingModel.h index f3a22b33..fcd4f6e1 100644 --- a/mv_image/image/include/Tracking/ImageTrackingModel.h +++ b/mv_image/image/include/Tracking/ImageTrackingModel.h @@ -19,8 +19,8 @@ #include "Recognition/ImageObject.h" -#include "Tracking/ObjectTracker.h" #include "Tracking/ImageContourStabilizator.h" +#include "Tracking/ObjectTracker.h" /** * @file ImageTrackingModel.h diff --git a/mv_image/image/src/Features/FeatureMatcher.cpp b/mv_image/image/src/Features/FeatureMatcher.cpp index 31e3e0eb..fce7716a 100644 --- a/mv_image/image/src/Features/FeatureMatcher.cpp +++ b/mv_image/image/src/Features/FeatureMatcher.cpp @@ -18,8 +18,8 @@ #include "ImageMathUtil.h" -#include <opencv2/core.hpp> #include <opencv2/calib3d/calib3d_c.h> +#include <opencv2/core.hpp> namespace MediaVision { diff --git a/mv_image/image/src/Recognition/ImageObject.cpp b/mv_image/image/src/Recognition/ImageObject.cpp index a13d5990..ce1e8a36 100644 --- a/mv_image/image/src/Recognition/ImageObject.cpp +++ b/mv_image/image/src/Recognition/ImageObject.cpp @@ -18,18 +18,18 @@ #include "ImageMathUtil.h" -#include "Features/FeatureExtractor.h" #include "Features/BasicExtractorFactory.h" +#include "Features/FeatureExtractor.h" #include "Features/ORBExtractorFactory.h" -#include "mv_private.h" #include "mv_common.h" +#include "mv_private.h" #include <opencv2/features2d.hpp> #include <fstream> -#include <unistd.h> #include <iomanip> +#include <unistd.h> namespace MediaVision { diff --git a/mv_image/image/src/Tracking/ImageTrackingModel.cpp b/mv_image/image/src/Tracking/ImageTrackingModel.cpp index e7d167bf..fde4c147 100644 --- a/mv_image/image/src/Tracking/ImageTrackingModel.cpp +++ b/mv_image/image/src/Tracking/ImageTrackingModel.cpp @@ -16,19 +16,19 @@ #include "Tracking/ImageTrackingModel.h" +#include "Tracking/AsyncTracker.h" #include "Tracking/CascadeTracker.h" -#include "Tracking/RecognitionBasedTracker.h" #include "Tracking/FeatureSubstitutionTracker.h" -#include "Tracking/AsyncTracker.h" #include "Tracking/MFTracker.h" +#include "Tracking/RecognitionBasedTracker.h" -#include "mv_private.h" #include "mv_common.h" +#include "mv_private.h" #include <fstream> -#include <unistd.h> -#include <new> #include <iomanip> +#include <new> +#include <unistd.h> namespace MediaVision { diff --git a/mv_image/image/src/Tracking/MFTracker.cpp b/mv_image/image/src/Tracking/MFTracker.cpp index 969f00d1..2f2f55c7 100644 --- a/mv_image/image/src/Tracking/MFTracker.cpp +++ b/mv_image/image/src/Tracking/MFTracker.cpp @@ -16,8 +16,8 @@ #include "Tracking/MFTracker.h" -#include "opencv2/video/tracking.hpp" #include "opencv2/imgproc.hpp" +#include "opencv2/video/tracking.hpp" namespace MediaVision { diff --git a/mv_image/image/src/mv_image.c b/mv_image/image/src/mv_image.c index d39eb61c..c06e46fc 100644 --- a/mv_image/image/src/mv_image.c +++ b/mv_image/image/src/mv_image.c @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "mv_private.h" -#include "mv_feature_key.h" #include "mv_image.h" +#include "mv_feature_key.h" #include "mv_image_open.h" +#include "mv_private.h" /** * @file mv_image.c diff --git a/mv_image/image/src/mv_image_open.cpp b/mv_image/image/src/mv_image_open.cpp index 8f732ea6..0638eb2d 100644 --- a/mv_image/image/src/mv_image_open.cpp +++ b/mv_image/image/src/mv_image_open.cpp @@ -16,12 +16,12 @@ #include "mv_image_open.h" -#include "mv_private.h" #include "mv_common.h" +#include "mv_private.h" -#include "ImageConfig.h" #include "Features/FeatureExtractor.h" #include "Features/ORBExtractorFactory.h" +#include "ImageConfig.h" #include "Recognition/ImageObject.h" #include "Recognition/ImageRecognizer.h" #include "Tracking/ImageTrackingModel.h" diff --git a/mv_machine_learning/CMakeLists.txt b/mv_machine_learning/CMakeLists.txt index 531ca29e..e9b8ad5d 100644 --- a/mv_machine_learning/CMakeLists.txt +++ b/mv_machine_learning/CMakeLists.txt @@ -1,5 +1,5 @@ -add_subdirectory(inference) add_subdirectory(common) +add_subdirectory(inference) if (${ENABLE_ML_IMAGE_CLASSIFICATION}) message("Enabled machine learning image classification task group.") diff --git a/mv_machine_learning/common/CMakeLists.txt b/mv_machine_learning/common/CMakeLists.txt index ba81c4e9..63cbb1a9 100644 --- a/mv_machine_learning/common/CMakeLists.txt +++ b/mv_machine_learning/common/CMakeLists.txt @@ -3,11 +3,9 @@ cmake_minimum_required(VERSION 3.13) file(GLOB MV_ML_SOURCE_LIST "${PROJECT_SOURCE_DIR}/src/*.cpp" "${PROJECT_SOURCE_DIR}/meta/src/*.cpp") -pkg_check_modules(${PROJECT_NAME}_DEP REQUIRED capi-appfw-app-common) add_library(${PROJECT_NAME} SHARED ${MV_ML_SOURCE_LIST}) -target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${${PROJECT_NAME}_DEP_LIBRARIES}) +target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME}) target_include_directories(${PROJECT_NAME} PRIVATE include meta/include ../../include) -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/MvMlException.h diff --git a/mv_machine_learning/common/include/AsyncManager.h b/mv_machine_learning/common/include/AsyncManager.h index 4e02752f..0f70c376 100644 --- a/mv_machine_learning/common/include/AsyncManager.h +++ b/mv_machine_learning/common/include/AsyncManager.h @@ -17,18 +17,18 @@ #ifndef __ASYNC_MANAGER_H__ #define __ASYNC_MANAGER_H__ -#include <queue> -#include <thread> -#include <mutex> -#include <condition_variable> -#include <atomic> -#include <functional> #include <algorithm> +#include <atomic> #include <chrono> +#include <condition_variable> +#include <functional> +#include <mutex> +#include <queue> +#include <thread> +#include "MvMlException.h" #include <mv_common.h> #include <mv_inference_type.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 ea6c654f..82825c09 100644 --- a/mv_machine_learning/common/include/Context.h +++ b/mv_machine_learning/common/include/Context.h @@ -17,8 +17,8 @@ #ifndef __CONTEXT_H__ #define __CONTEXT_H__ -#include <map> #include "ITask.h" +#include <map> namespace mediavision { diff --git a/mv_machine_learning/common/include/MvMlConfig.h b/mv_machine_learning/common/include/MvMlConfig.h index c8e038a9..99f55933 100644 --- a/mv_machine_learning/common/include/MvMlConfig.h +++ b/mv_machine_learning/common/include/MvMlConfig.h @@ -17,9 +17,9 @@ #ifndef __MV_ML_CONFIG_H__ #define __MV_ML_CONFIG_H__ -#include <mv_common.h> -#include "mv_private.h" #include "EngineConfig.h" +#include "mv_private.h" +#include <mv_common.h> #include "MetaParser.h" @@ -38,8 +38,8 @@ private: std::string _modelLabelFilePath; std::string _pluginFileName; bool _usePlugin {}; - int _backendType {}; - int _targetDeviceType {}; + int _backendType { MV_INFERENCE_BACKEND_NONE }; + int _targetDeviceType { MV_INFERENCE_TARGET_DEVICE_NONE }; double _confidence_threshold {}; public: diff --git a/mv_machine_learning/common/include/common.h b/mv_machine_learning/common/include/common.h index 0cebba25..f0093a33 100644 --- a/mv_machine_learning/common/include/common.h +++ b/mv_machine_learning/common/include/common.h @@ -17,9 +17,9 @@ #ifndef __COMMON_H__ #define __COMMON_H__ +#include <map> #include <string> #include <vector> -#include <map> #include "mv_inference_type.h" diff --git a/mv_machine_learning/common/include/native_capi.h b/mv_machine_learning/common/include/native_capi.h index bd13f949..b9be5050 100644 --- a/mv_machine_learning/common/include/native_capi.h +++ b/mv_machine_learning/common/include/native_capi.h @@ -22,8 +22,8 @@ #include "Context.h" #include "ITask.h" -#include "mv_private.h" #include "mv_ml_types.h" +#include "mv_private.h" namespace mediavision { diff --git a/mv_machine_learning/common/meta/include/AnchorParser.h b/mv_machine_learning/common/meta/include/AnchorParser.h index 1239d92c..b7484674 100644 --- a/mv_machine_learning/common/meta/include/AnchorParser.h +++ b/mv_machine_learning/common/meta/include/AnchorParser.h @@ -17,15 +17,15 @@ #ifndef __ANCHOR_PARSER_H__ #define __ANCHOR_PARSER_H__ -#include <string> #include <memory> +#include <string> #include <vector> #include <json-glib/json-glib.h> -#include <dlog.h> -#include "mv_private.h" #include "mv_common.h" +#include "mv_private.h" +#include <dlog.h> #include "types.h" diff --git a/mv_machine_learning/common/meta/include/MetaParser.h b/mv_machine_learning/common/meta/include/MetaParser.h index 6e9dc025..fe5db0a3 100644 --- a/mv_machine_learning/common/meta/include/MetaParser.h +++ b/mv_machine_learning/common/meta/include/MetaParser.h @@ -17,13 +17,13 @@ #ifndef __META_PARSER_H__ #define __META_PARSER_H__ -#include <string> +#include "types.h" +#include <dlog.h> +#include <json-glib/json-glib.h> #include <memory> #include <mv_common.h> #include <mv_private.h> -#include <json-glib/json-glib.h> -#include <dlog.h> -#include "types.h" +#include <string> namespace mediavision { diff --git a/mv_machine_learning/common/meta/include/MvMlPreprocess.h b/mv_machine_learning/common/meta/include/MvMlPreprocess.h index abbd0410..1d2f58d7 100644 --- a/mv_machine_learning/common/meta/include/MvMlPreprocess.h +++ b/mv_machine_learning/common/meta/include/MvMlPreprocess.h @@ -17,9 +17,9 @@ #ifndef __MV_ML_PREPROCESS_H__ #define __MV_ML_PREPROCESS_H__ -#include <string> #include <map> #include <memory> +#include <string> #include <vector> #include <inference_engine_type.h> diff --git a/mv_machine_learning/common/meta/include/Postprocess.h b/mv_machine_learning/common/meta/include/Postprocess.h index 0fdd6a8d..e0a19bf6 100644 --- a/mv_machine_learning/common/meta/include/Postprocess.h +++ b/mv_machine_learning/common/meta/include/Postprocess.h @@ -15,7 +15,7 @@ */ #ifndef __POSTPROCESS_H__ -#define __POSTPORCESS_H__ +#define __POSTPROCESS_H__ #include "types.h" diff --git a/mv_machine_learning/common/meta/include/PostprocessParser.h b/mv_machine_learning/common/meta/include/PostprocessParser.h index 018d5049..e0c78422 100644 --- a/mv_machine_learning/common/meta/include/PostprocessParser.h +++ b/mv_machine_learning/common/meta/include/PostprocessParser.h @@ -17,18 +17,18 @@ #ifndef __POSTPROCESS_PARSER_H__ #define __POSTPROCESS_PARSER_H__ -#include <string> #include <map> #include <memory> +#include <string> #include <vector> -#include <dlog.h> -#include "mv_private.h" #include "mv_common.h" +#include "mv_private.h" +#include <dlog.h> +#include "AnchorParser.h" #include "MetaParser.h" #include "types.h" -#include "AnchorParser.h" namespace mediavision { diff --git a/mv_machine_learning/common/meta/include/meta_common.h b/mv_machine_learning/common/meta/include/meta_common.h index 24caaf33..386df4dd 100644 --- a/mv_machine_learning/common/meta/include/meta_common.h +++ b/mv_machine_learning/common/meta/include/meta_common.h @@ -17,15 +17,15 @@ #ifndef __COMMON_H__ #define __COMMON_H__ -#include <string> -#include <mv_common.h> -#include <mv_private.h> -#include <json-glib/json-glib.h> -#include <inference_engine_type.h> -#include <dlog.h> #include "MvMlException.h" #include "mv_inference_type.h" #include "types.h" +#include <dlog.h> +#include <inference_engine_type.h> +#include <json-glib/json-glib.h> +#include <mv_common.h> +#include <mv_private.h> +#include <string> namespace mediavision { diff --git a/mv_machine_learning/common/meta/include/types.h b/mv_machine_learning/common/meta/include/types.h index e8112bab..75699838 100644 --- a/mv_machine_learning/common/meta/include/types.h +++ b/mv_machine_learning/common/meta/include/types.h @@ -17,10 +17,10 @@ #ifndef __TYPES_H__ #define __TYPES_H__ -#include <string> #include <map> #include <memory> #include <opencv2/core/types.hpp> +#include <string> #include <inference_engine_type.h> #include <mv_inference_type.h> diff --git a/mv_machine_learning/common/meta/src/MetaParser.cpp b/mv_machine_learning/common/meta/src/MetaParser.cpp index 56aebae6..e85056ff 100644 --- a/mv_machine_learning/common/meta/src/MetaParser.cpp +++ b/mv_machine_learning/common/meta/src/MetaParser.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#include <unistd.h> -#include <fstream> #include <algorithm> +#include <fstream> +#include <unistd.h> -#include "MvMlException.h" #include "MetaParser.h" +#include "MvMlException.h" #include "meta_common.h" using namespace std; diff --git a/mv_machine_learning/common/meta/src/MvMlPreprocess.cpp b/mv_machine_learning/common/meta/src/MvMlPreprocess.cpp index 0aa57c0e..fe849990 100644 --- a/mv_machine_learning/common/meta/src/MvMlPreprocess.cpp +++ b/mv_machine_learning/common/meta/src/MvMlPreprocess.cpp @@ -14,14 +14,14 @@ * limitations under the License. */ -#include <unistd.h> -#include <fstream> -#include <string> -#include <queue> -#include <algorithm> -#include "mv_private.h" #include "MvMlPreprocess.h" #include "MvMlException.h" +#include "mv_private.h" +#include <algorithm> +#include <fstream> +#include <queue> +#include <string> +#include <unistd.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/Postprocess.cpp b/mv_machine_learning/common/meta/src/Postprocess.cpp index 084d69b2..54f87c9a 100644 --- a/mv_machine_learning/common/meta/src/Postprocess.cpp +++ b/mv_machine_learning/common/meta/src/Postprocess.cpp @@ -16,8 +16,8 @@ #include <cmath> -#include "mv_private.h" #include "Postprocess.h" +#include "mv_private.h" using namespace std; diff --git a/mv_machine_learning/common/meta/src/PostprocessParser.cpp b/mv_machine_learning/common/meta/src/PostprocessParser.cpp index cacc2f61..984acf53 100644 --- a/mv_machine_learning/common/meta/src/PostprocessParser.cpp +++ b/mv_machine_learning/common/meta/src/PostprocessParser.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ -#include <unistd.h> -#include <string> -#include <queue> -#include <algorithm> -#include "MvMlException.h" #include "PostprocessParser.h" +#include "MvMlException.h" #include "meta_common.h" +#include <algorithm> +#include <queue> +#include <string> +#include <unistd.h> using namespace std; using namespace mediavision::machine_learning::exception; diff --git a/mv_machine_learning/common/src/MvMlConfig.cpp b/mv_machine_learning/common/src/MvMlConfig.cpp index e44a3d38..16233260 100644 --- a/mv_machine_learning/common/src/MvMlConfig.cpp +++ b/mv_machine_learning/common/src/MvMlConfig.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "MvMlException.h" #include "MvMlConfig.h" +#include "MvMlException.h" #include "keys.h" using namespace std; diff --git a/mv_machine_learning/common/src/native_capi.cpp b/mv_machine_learning/common/src/native_capi.cpp index 25fc5ebc..868f8e34 100644 --- a/mv_machine_learning/common/src/native_capi.cpp +++ b/mv_machine_learning/common/src/native_capi.cpp @@ -16,8 +16,8 @@ #include "mv_private.h" -#include "native_capi.h" #include "MvMlException.h" +#include "native_capi.h" using namespace std; using namespace mediavision::common; diff --git a/mv_machine_learning/face_recognition/CMakeLists.txt b/mv_machine_learning/face_recognition/CMakeLists.txt index 0739fadf..cfbaf6dc 100644 --- a/mv_machine_learning/face_recognition/CMakeLists.txt +++ b/mv_machine_learning/face_recognition/CMakeLists.txt @@ -1,7 +1,8 @@ project(${MV_FACE_RECOG_LIB_NAME}) cmake_minimum_required(VERSION 3.13) -pkg_check_modules(${PROJECT_NAME}_DEP REQUIRED inference-engine-interface-common training-engine-interface-common) +pkg_check_modules(${PROJECT_NAME}_DEP REQUIRED inference-engine-interface-common training-engine-interface-common + capi-appfw-app-common) file(GLOB MV_FACE_RECOG_SOURCE_LIST "${PROJECT_SOURCE_DIR}/src/*.c" "${PROJECT_SOURCE_DIR}/src/*.cpp") find_package(OpenCV REQUIRED dnn imgproc) @@ -13,6 +14,7 @@ endif() add_library(${PROJECT_NAME} SHARED ${MV_FACE_RECOG_SOURCE_LIST}) target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} ${${PROJECT_NAME}_DEP_LIBRARIES} mv_ml_common mv_inference mv_training) target_include_directories(${PROJECT_NAME} PRIVATE include ../inference/include ../training/include ../common/include ../common/meta/include) +target_include_directories(${PROJECT_NAME} PUBLIC ${${PROJECT_NAME}_DEP_INCLUDE_DIRS}) target_compile_definitions(${PROJECT_NAME} PRIVATE -DTEST_RES_PATH="${TEST_RES_PATH}") install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) install( diff --git a/mv_machine_learning/face_recognition/include/FaceRecognition.h b/mv_machine_learning/face_recognition/include/FaceRecognition.h index 5f2bdfad..895034bb 100644 --- a/mv_machine_learning/face_recognition/include/FaceRecognition.h +++ b/mv_machine_learning/face_recognition/include/FaceRecognition.h @@ -17,19 +17,19 @@ #ifndef __FACE_RECOGNITION_H__ #define __FACE_RECOGNITION_H__ -#include <unordered_map> #include <mv_common.h> #include <mv_inference_type.h> +#include <unordered_map> -#include "training_engine_error.h" -#include "training_engine_common_impl.h" -#include "inference_engine_common_impl.h" -#include "mv_ml_types.h" +#include "DataSetManager.h" +#include "FeatureVectorManager.h" #include "Inference.h" #include "LabelManager.h" -#include "FeatureVectorManager.h" -#include "DataSetManager.h" #include "SimpleShot.h" +#include "inference_engine_common_impl.h" +#include "mv_ml_types.h" +#include "training_engine_common_impl.h" +#include "training_engine_error.h" namespace mediavision { diff --git a/mv_machine_learning/face_recognition/include/FaceRecognitionAdapter.h b/mv_machine_learning/face_recognition/include/FaceRecognitionAdapter.h index f45a5657..777d4075 100644 --- a/mv_machine_learning/face_recognition/include/FaceRecognitionAdapter.h +++ b/mv_machine_learning/face_recognition/include/FaceRecognitionAdapter.h @@ -20,8 +20,8 @@ #include <dlog.h> #include "EngineConfig.h" -#include "ITask.h" #include "FaceRecognition.h" +#include "ITask.h" namespace mediavision { diff --git a/mv_machine_learning/face_recognition/include/FaceRecognitionDSM.h b/mv_machine_learning/face_recognition/include/FaceRecognitionDSM.h index 196b9654..4446ef4b 100644 --- a/mv_machine_learning/face_recognition/include/FaceRecognitionDSM.h +++ b/mv_machine_learning/face_recognition/include/FaceRecognitionDSM.h @@ -19,8 +19,8 @@ #include <string> -#include "FeatureVectorManager.h" #include "DataSetManager.h" +#include "FeatureVectorManager.h" class FaceRecognitionDSM : public DataSetManager { diff --git a/mv_machine_learning/face_recognition/include/Facenet.h b/mv_machine_learning/face_recognition/include/Facenet.h index c9d0ac30..19fa9372 100644 --- a/mv_machine_learning/face_recognition/include/Facenet.h +++ b/mv_machine_learning/face_recognition/include/Facenet.h @@ -21,11 +21,11 @@ #include <mv_inference_type.h> #include "EngineConfig.h" -#include "inference_engine_common_impl.h" -#include "Inference.h" #include "FacenetParser.h" -#include "face_recognition_type.h" +#include "Inference.h" #include "MvMlPreprocess.h" +#include "face_recognition_type.h" +#include "inference_engine_common_impl.h" #include "mv_ml_types.h" namespace mediavision diff --git a/mv_machine_learning/face_recognition/include/FacenetAdapter.h b/mv_machine_learning/face_recognition/include/FacenetAdapter.h index b2ef5140..67cd6619 100644 --- a/mv_machine_learning/face_recognition/include/FacenetAdapter.h +++ b/mv_machine_learning/face_recognition/include/FacenetAdapter.h @@ -20,9 +20,9 @@ #include <dlog.h> #include "EngineConfig.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/SimpleShot.h b/mv_machine_learning/face_recognition/include/SimpleShot.h index 48ef349a..0eb91ccd 100644 --- a/mv_machine_learning/face_recognition/include/SimpleShot.h +++ b/mv_machine_learning/face_recognition/include/SimpleShot.h @@ -17,8 +17,8 @@ #ifndef __SIMPLE_SHOT_H__ #define __SIMPLE_SHOT_H__ -#include <mv_inference_type.h> #include "TrainingModel.h" +#include <mv_inference_type.h> class SimpleShot : public TrainingModel { diff --git a/mv_machine_learning/face_recognition/src/FaceRecognition.cpp b/mv_machine_learning/face_recognition/src/FaceRecognition.cpp index 2af63a2f..7b8773b5 100644 --- a/mv_machine_learning/face_recognition/src/FaceRecognition.cpp +++ b/mv_machine_learning/face_recognition/src/FaceRecognition.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#include <string.h> +#include <algorithm> #include <fstream> #include <istream> -#include <tuple> #include <map> -#include <algorithm> +#include <string.h> +#include <tuple> #include <sys/stat.h> @@ -27,11 +27,11 @@ #include <mv_common.h> #include <mv_private.h> -#include "MvMlException.h" -#include "TensorBuffer.h" #include "FaceRecognition.h" -#include "FaceRecognitionFVM.h" #include "FaceRecognitionDSM.h" +#include "FaceRecognitionFVM.h" +#include "MvMlException.h" +#include "TensorBuffer.h" #include "file_util.h" using namespace std; diff --git a/mv_machine_learning/face_recognition/src/FaceRecognitionAdapter.cpp b/mv_machine_learning/face_recognition/src/FaceRecognitionAdapter.cpp index 3e0ae4d2..e263e2ef 100644 --- a/mv_machine_learning/face_recognition/src/FaceRecognitionAdapter.cpp +++ b/mv_machine_learning/face_recognition/src/FaceRecognitionAdapter.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "MvMlException.h" #include "FaceRecognitionAdapter.h" +#include "MvMlException.h" #include "face_recognition_type.h" #include <app_common.h> diff --git a/mv_machine_learning/face_recognition/src/FaceRecognitionDSM.cpp b/mv_machine_learning/face_recognition/src/FaceRecognitionDSM.cpp index a13a9982..38cb6e09 100644 --- a/mv_machine_learning/face_recognition/src/FaceRecognitionDSM.cpp +++ b/mv_machine_learning/face_recognition/src/FaceRecognitionDSM.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ +#include <algorithm> #include <dlog.h> #include <mv_private.h> -#include <algorithm> -#include "MvMlException.h" #include "FaceRecognitionDSM.h" +#include "MvMlException.h" #define MAX_FEATURE_VECTOR_CNT 5 #define MAX_FEATURE_SIZE 1024 diff --git a/mv_machine_learning/face_recognition/src/FaceRecognitionFVM.cpp b/mv_machine_learning/face_recognition/src/FaceRecognitionFVM.cpp index e93326ff..34ec24ed 100644 --- a/mv_machine_learning/face_recognition/src/FaceRecognitionFVM.cpp +++ b/mv_machine_learning/face_recognition/src/FaceRecognitionFVM.cpp @@ -17,8 +17,8 @@ #include <fstream> #include <unistd.h> -#include "MvMlException.h" #include "FaceRecognitionFVM.h" +#include "MvMlException.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 5b1c48e6..09abf0b0 100644 --- a/mv_machine_learning/face_recognition/src/Facenet.cpp +++ b/mv_machine_learning/face_recognition/src/Facenet.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ -#include <string.h> +#include <algorithm> #include <map> #include <memory> -#include <algorithm> +#include <string.h> -#include "MvMlException.h" #include "Facenet.h" +#include "MvMlException.h" #include "face_recognition_type.h" using namespace std; diff --git a/mv_machine_learning/face_recognition/src/FacenetAdapter.cpp b/mv_machine_learning/face_recognition/src/FacenetAdapter.cpp index 842b6651..c3c0df6e 100644 --- a/mv_machine_learning/face_recognition/src/FacenetAdapter.cpp +++ b/mv_machine_learning/face_recognition/src/FacenetAdapter.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "MvMlException.h" #include "FacenetAdapter.h" +#include "MvMlException.h" using namespace std; using namespace MediaVision::Common; diff --git a/mv_machine_learning/face_recognition/src/FacenetParser.cpp b/mv_machine_learning/face_recognition/src/FacenetParser.cpp index 6789e4d3..9b816a3c 100644 --- a/mv_machine_learning/face_recognition/src/FacenetParser.cpp +++ b/mv_machine_learning/face_recognition/src/FacenetParser.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "MvMlException.h" #include "FacenetParser.h" +#include "MvMlException.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 8a5a6635..8f21dd1f 100644 --- a/mv_machine_learning/face_recognition/src/mv_face_recognition.cpp +++ b/mv_machine_learning/face_recognition/src/mv_face_recognition.cpp @@ -19,15 +19,15 @@ #include <memory> #include <mutex> -#include "mv_private.h" -#include "mv_feature_key.h" #include "Context.h" -#include "MvMlException.h" #include "FaceRecognitionAdapter.h" #include "FacenetAdapter.h" -#include "native_capi.h" +#include "MvMlException.h" #include "mv_face_recognition.h" #include "mv_face_recognition_internal.h" +#include "mv_feature_key.h" +#include "mv_private.h" +#include "native_capi.h" using namespace std; using namespace mediavision::common; diff --git a/mv_machine_learning/face_recognition/src/simple_shot.cpp b/mv_machine_learning/face_recognition/src/simple_shot.cpp index d508ac5c..34de4122 100644 --- a/mv_machine_learning/face_recognition/src/simple_shot.cpp +++ b/mv_machine_learning/face_recognition/src/simple_shot.cpp @@ -14,19 +14,19 @@ * limitations under the License. */ -#include <string.h> +#include <algorithm> #include <fstream> #include <istream> -#include <tuple> #include <map> -#include <algorithm> +#include <string.h> +#include <tuple> #include <sys/stat.h> -#include "MvMlException.h" -#include "SimpleShot.h" #include "DataSetManager.h" #include "FeatureVectorManager.h" +#include "MvMlException.h" +#include "SimpleShot.h" #include "file_util.h" using namespace std; diff --git a/mv_machine_learning/image_classification/include/ImageClassification.h b/mv_machine_learning/image_classification/include/ImageClassification.h index f4d99d43..985be82c 100644 --- a/mv_machine_learning/image_classification/include/ImageClassification.h +++ b/mv_machine_learning/image_classification/include/ImageClassification.h @@ -17,20 +17,20 @@ #ifndef __IMAGE_CLASSIFICATION_H__ #define __IMAGE_CLASSIFICATION_H__ +#include "mv_private.h" #include <mv_common.h> #include <mv_inference_type.h> -#include "mv_private.h" +#include "AsyncManager.h" #include "EngineConfig.h" -#include "inference_engine_common_impl.h" +#include "IImageClassification.h" +#include "ImageClassificationParser.h" #include "Inference.h" -#include "image_classification_type.h" #include "MetaParser.h" #include "MvMlConfig.h" -#include "ImageClassificationParser.h" #include "MvMlPreprocess.h" -#include "AsyncManager.h" -#include "IImageClassification.h" +#include "image_classification_type.h" +#include "inference_engine_common_impl.h" namespace mediavision { diff --git a/mv_machine_learning/image_classification/include/ImageClassificationAdapter.h b/mv_machine_learning/image_classification/include/ImageClassificationAdapter.h index 23deb883..412f97e7 100644 --- a/mv_machine_learning/image_classification/include/ImageClassificationAdapter.h +++ b/mv_machine_learning/image_classification/include/ImageClassificationAdapter.h @@ -20,10 +20,10 @@ #include <dlog.h> #include "EngineConfig.h" +#include "IImageClassification.h" #include "ITask.h" -#include "MvMlConfig.h" #include "ImageClassificationDefault.h" -#include "IImageClassification.h" +#include "MvMlConfig.h" namespace mediavision { diff --git a/mv_machine_learning/image_classification/include/ImageClassificationDefault.h b/mv_machine_learning/image_classification/include/ImageClassificationDefault.h index 04f27a9a..5538907b 100644 --- a/mv_machine_learning/image_classification/include/ImageClassificationDefault.h +++ b/mv_machine_learning/image_classification/include/ImageClassificationDefault.h @@ -17,13 +17,13 @@ #ifndef __IMAGE_CLASSIFICATION_FLOAT_H__ #define __IMAGE_CLASSIFICATION_FLOAT_H__ +#include "mv_private.h" #include <memory> #include <mv_common.h> -#include "mv_private.h" +#include "EngineConfig.h" #include "ImageClassification.h" #include <mv_inference_type.h> -#include "EngineConfig.h" namespace mediavision { 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 db663b51..1730017f 100644 --- a/mv_machine_learning/image_classification/include/image_classification_type.h +++ b/mv_machine_learning/image_classification/include/image_classification_type.h @@ -19,9 +19,9 @@ #include <string> +#include "mv_ml_types.h" #include <mv_common.h> #include <mv_inference_type.h> -#include "mv_ml_types.h" namespace mediavision { diff --git a/mv_machine_learning/image_classification/src/ImageClassification.cpp b/mv_machine_learning/image_classification/src/ImageClassification.cpp index 0976f91e..f61b2ded 100644 --- a/mv_machine_learning/image_classification/src/ImageClassification.cpp +++ b/mv_machine_learning/image_classification/src/ImageClassification.cpp @@ -14,16 +14,16 @@ * limitations under the License. */ -#include <string.h> +#include <algorithm> #include <fstream> #include <map> #include <memory> -#include <algorithm> +#include <string.h> +#include "ImageClassification.h" #include "MvMlException.h" #include "common.h" #include "mv_image_classification_config.h" -#include "ImageClassification.h" using namespace std; using namespace mediavision::inference; diff --git a/mv_machine_learning/image_classification/src/ImageClassificationAdapter.cpp b/mv_machine_learning/image_classification/src/ImageClassificationAdapter.cpp index 9a445ab0..69a51989 100644 --- a/mv_machine_learning/image_classification/src/ImageClassificationAdapter.cpp +++ b/mv_machine_learning/image_classification/src/ImageClassificationAdapter.cpp @@ -16,9 +16,9 @@ #include <string> +#include "ImageClassificationAdapter.h" #include "MvMlException.h" #include "mv_image_classification_config.h" -#include "ImageClassificationAdapter.h" using namespace std; using namespace MediaVision::Common; diff --git a/mv_machine_learning/image_classification/src/ImageClassificationDefault.cpp b/mv_machine_learning/image_classification/src/ImageClassificationDefault.cpp index 36e48ec2..648db603 100644 --- a/mv_machine_learning/image_classification/src/ImageClassificationDefault.cpp +++ b/mv_machine_learning/image_classification/src/ImageClassificationDefault.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ -#include <string.h> +#include <algorithm> #include <map> #include <set> -#include <algorithm> +#include <string.h> -#include "MvMlException.h" #include "ImageClassificationDefault.h" +#include "MvMlException.h" #include "Postprocess.h" using namespace std; diff --git a/mv_machine_learning/image_classification/src/ImageClassificationParser.cpp b/mv_machine_learning/image_classification/src/ImageClassificationParser.cpp index 965ff5cc..effa7901 100644 --- a/mv_machine_learning/image_classification/src/ImageClassificationParser.cpp +++ b/mv_machine_learning/image_classification/src/ImageClassificationParser.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "MvMlException.h" #include "ImageClassificationParser.h" +#include "MvMlException.h" using namespace std; using namespace mediavision::machine_learning::exception; 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 aca756f9..104a9e26 100644 --- a/mv_machine_learning/image_classification/src/mv_image_classification.cpp +++ b/mv_machine_learning/image_classification/src/mv_image_classification.cpp @@ -14,20 +14,20 @@ * limitations under the License. */ -#include "mv_private.h" -#include "mv_feature_key.h" +#include "Context.h" #include "ITask.h" -#include "mv_image_classification_internal.h" #include "ImageClassificationAdapter.h" #include "MvMlException.h" -#include "native_capi.h" #include "image_classification_type.h" -#include "Context.h" +#include "mv_feature_key.h" +#include "mv_image_classification_internal.h" +#include "mv_private.h" +#include "native_capi.h" +#include <algorithm> #include <new> -#include <unistd.h> #include <string> -#include <algorithm> +#include <unistd.h> #define TASK_NAME "image_classification" diff --git a/mv_machine_learning/image_segmentation/include/ImageSegmentation.h b/mv_machine_learning/image_segmentation/include/ImageSegmentation.h index 31095bef..4f485956 100644 --- a/mv_machine_learning/image_segmentation/include/ImageSegmentation.h +++ b/mv_machine_learning/image_segmentation/include/ImageSegmentation.h @@ -17,25 +17,25 @@ #ifndef __IMAGE_SEGMENTATION_H__ #define __IMAGE_SEGMENTATION_H__ +#include <atomic> +#include <mutex> #include <queue> #include <thread> -#include <mutex> -#include <atomic> +#include "mv_private.h" #include <mv_common.h> #include <mv_inference_type.h> -#include "mv_private.h" +#include "AsyncManager.h" #include "EngineConfig.h" -#include "inference_engine_common_impl.h" +#include "IImageSegmentation.h" +#include "ImageSegmentationParser.h" #include "Inference.h" -#include "image_segmentation_type.h" #include "MetaParser.h" #include "MvMlConfig.h" -#include "ImageSegmentationParser.h" #include "MvMlPreprocess.h" -#include "IImageSegmentation.h" -#include "AsyncManager.h" +#include "image_segmentation_type.h" +#include "inference_engine_common_impl.h" namespace mediavision { diff --git a/mv_machine_learning/image_segmentation/include/ImageSegmentationAdapter.h b/mv_machine_learning/image_segmentation/include/ImageSegmentationAdapter.h index 0f7968fc..2c388a03 100644 --- a/mv_machine_learning/image_segmentation/include/ImageSegmentationAdapter.h +++ b/mv_machine_learning/image_segmentation/include/ImageSegmentationAdapter.h @@ -20,9 +20,9 @@ #include <dlog.h> #include "EngineConfig.h" +#include "IImageSegmentation.h" #include "ITask.h" #include "ImageSegmentation.h" -#include "IImageSegmentation.h" namespace mediavision { diff --git a/mv_machine_learning/image_segmentation/include/ImageSegmentationExternal.h b/mv_machine_learning/image_segmentation/include/ImageSegmentationExternal.h index e662e488..89fb9470 100644 --- a/mv_machine_learning/image_segmentation/include/ImageSegmentationExternal.h +++ b/mv_machine_learning/image_segmentation/include/ImageSegmentationExternal.h @@ -23,8 +23,8 @@ #include <opencv2/core.hpp> #include <opencv2/imgproc.hpp> -#include "image_segmentation_type.h" #include "IImageSegmentation.h" +#include "image_segmentation_type.h" namespace mediavision { 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 0b9f6882..df1d68d0 100644 --- a/mv_machine_learning/image_segmentation/include/image_segmentation_type.h +++ b/mv_machine_learning/image_segmentation/include/image_segmentation_type.h @@ -19,9 +19,9 @@ #include <opencv2/core.hpp> +#include "mv_ml_types.h" #include <mv_common.h> #include <mv_inference_type.h> -#include "mv_ml_types.h" namespace mediavision { diff --git a/mv_machine_learning/image_segmentation/src/ImageSegmentation.cpp b/mv_machine_learning/image_segmentation/src/ImageSegmentation.cpp index 7fecb325..55870eb1 100644 --- a/mv_machine_learning/image_segmentation/src/ImageSegmentation.cpp +++ b/mv_machine_learning/image_segmentation/src/ImageSegmentation.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ -#include <string.h> #include <fstream> #include <map> #include <memory> +#include <string.h> +#include "ImageSegmentation.h" #include "MvMlException.h" #include "common.h" #include "mv_image_segmentation_config.h" -#include "ImageSegmentation.h" using namespace std; using namespace mediavision::inference; diff --git a/mv_machine_learning/image_segmentation/src/ImageSegmentationAdapter.cpp b/mv_machine_learning/image_segmentation/src/ImageSegmentationAdapter.cpp index 381ba6cc..ad7c127d 100644 --- a/mv_machine_learning/image_segmentation/src/ImageSegmentationAdapter.cpp +++ b/mv_machine_learning/image_segmentation/src/ImageSegmentationAdapter.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "MvMlException.h" #include "ImageSegmentationAdapter.h" #include "ImageSegmentationExternal.h" +#include "MvMlException.h" #include "mv_image_segmentation_config.h" using namespace std; diff --git a/mv_machine_learning/image_segmentation/src/ImageSegmentationExternal.cpp b/mv_machine_learning/image_segmentation/src/ImageSegmentationExternal.cpp index 267f3ed7..73fac4a8 100644 --- a/mv_machine_learning/image_segmentation/src/ImageSegmentationExternal.cpp +++ b/mv_machine_learning/image_segmentation/src/ImageSegmentationExternal.cpp @@ -19,8 +19,8 @@ #include "mv_private.h" -#include "MvMlException.h" #include "ImageSegmentationExternal.h" +#include "MvMlException.h" using namespace std; using namespace mediavision::machine_learning::exception; diff --git a/mv_machine_learning/image_segmentation/src/ImageSegmentationParser.cpp b/mv_machine_learning/image_segmentation/src/ImageSegmentationParser.cpp index a3e56cac..b23e6f32 100644 --- a/mv_machine_learning/image_segmentation/src/ImageSegmentationParser.cpp +++ b/mv_machine_learning/image_segmentation/src/ImageSegmentationParser.cpp @@ -15,8 +15,8 @@ */ #include <memory> -#include "MvMlException.h" #include "ImageSegmentationParser.h" +#include "MvMlException.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 edf0ea2c..f9e366af 100644 --- a/mv_machine_learning/image_segmentation/src/mv_selfie_segmentation.cpp +++ b/mv_machine_learning/image_segmentation/src/mv_selfie_segmentation.cpp @@ -14,23 +14,23 @@ * limitations under the License. */ -#include "mv_private.h" -#include "mv_feature_key.h" +#include "Context.h" #include "ITask.h" -#include "mv_selfie_segmentation_type.h" -#include "mv_selfie_segmentation_internal.h" #include "ImageSegmentationAdapter.h" #include "MvMlException.h" -#include "native_capi.h" #include "image_segmentation_type.h" -#include "Context.h" +#include "mv_feature_key.h" +#include "mv_private.h" +#include "mv_selfie_segmentation_internal.h" +#include "mv_selfie_segmentation_type.h" +#include "native_capi.h" -#include <new> -#include <unistd.h> -#include <string> #include <algorithm> -#include <mutex> #include <iostream> +#include <mutex> +#include <new> +#include <string> +#include <unistd.h> #define TASK_NAME "selfie_segmentation" diff --git a/mv_machine_learning/inference/CMakeLists.txt b/mv_machine_learning/inference/CMakeLists.txt index b3b04d58..a22fe7fa 100644 --- a/mv_machine_learning/inference/CMakeLists.txt +++ b/mv_machine_learning/inference/CMakeLists.txt @@ -16,8 +16,12 @@ IF (${ENABLE_INFERENCE_PROFILER}) ADD_DEFINITIONS(-DENABLE_INFERENCE_PROFILER) ENDIF() +if(NOT ${IS_TIZEN}) + target_compile_definitions(${PROJECT_NAME} PRIVATE SYSCONFDIR="/etc") +endif() + target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} ${${PROJECT_NAME}_DEP_LIBRARIES}) -target_include_directories(${PROJECT_NAME} PRIVATE include ../common/include ../common/meta/include) +target_include_directories(${PROJECT_NAME} PRIVATE include ../common/include ../common/meta/include ${${PROJECT_NAME}_DEP_INCLUDE_DIRS}) install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) install( DIRECTORY ${PROJECT_SOURCE_DIR}/../../include/ DESTINATION include/media diff --git a/mv_machine_learning/inference/include/BoxInfo.h b/mv_machine_learning/inference/include/BoxInfo.h index 1414bfb8..b64d2589 100644 --- a/mv_machine_learning/inference/include/BoxInfo.h +++ b/mv_machine_learning/inference/include/BoxInfo.h @@ -17,14 +17,14 @@ #ifndef __BOX_INFO_H__ #define __BOX_INFO_H__ -#include <string> -#include <vector> #include <map> #include <memory> +#include <string> +#include <vector> +#include <inference_engine_type.h> #include <json-glib/json-glib.h> #include <mv_inference_type.h> -#include <inference_engine_type.h> #include "DecodeInfo.h" #include "DimInfo.h" diff --git a/mv_machine_learning/inference/include/Bvh.h b/mv_machine_learning/inference/include/Bvh.h index 150671e4..9186c4de 100644 --- a/mv_machine_learning/inference/include/Bvh.h +++ b/mv_machine_learning/inference/include/Bvh.h @@ -1,10 +1,10 @@ #ifndef __MEDIA_VISION_BVH_H__ #define __MEDIA_VISION_BVH_H__ -#include <opencv2/core.hpp> -#include <opencv2/imgproc.hpp> #include "Joint.h" #include <memory> +#include <opencv2/core.hpp> +#include <opencv2/imgproc.hpp> #include <vector> namespace mediavision diff --git a/mv_machine_learning/inference/include/DecodeInfo.h b/mv_machine_learning/inference/include/DecodeInfo.h index f3b2afe1..9e4817ee 100644 --- a/mv_machine_learning/inference/include/DecodeInfo.h +++ b/mv_machine_learning/inference/include/DecodeInfo.h @@ -17,15 +17,15 @@ #ifndef __DECODE_INFO_H__ #define __DECODE_INFO_H__ -#include <string> -#include <vector> #include <map> #include <memory> +#include <string> +#include <vector> +#include "Utils.h" #include <MetadataType.h> #include <mv_inference_type.h> #include <opencv2/core.hpp> -#include "Utils.h" namespace mediavision { diff --git a/mv_machine_learning/inference/include/DimInfo.h b/mv_machine_learning/inference/include/DimInfo.h index 68c3df77..744d9a47 100644 --- a/mv_machine_learning/inference/include/DimInfo.h +++ b/mv_machine_learning/inference/include/DimInfo.h @@ -17,8 +17,8 @@ #ifndef __DIM_INFO_H__ #define __DIM_INFO_H__ -#include <vector> #include <dlog.h> +#include <vector> namespace mediavision { diff --git a/mv_machine_learning/inference/include/DispVec.h b/mv_machine_learning/inference/include/DispVec.h index 9860be7a..7147ad47 100644 --- a/mv_machine_learning/inference/include/DispVec.h +++ b/mv_machine_learning/inference/include/DispVec.h @@ -17,15 +17,17 @@ #ifndef __DISP_VEC_H__ #define __DISP_VEC_H__ -#include <string> -#include <vector> -#include <map> -#include <memory> - -#include <mv_inference_type.h> #include "DimInfo.h" +#include "MetadataType.h" #include "Utils.h" +#include <mv_inference_type.h> + +#include <map> +#include <memory> +#include <string> +#include <vector> + namespace mediavision { namespace inference diff --git a/mv_machine_learning/inference/include/Edge.h b/mv_machine_learning/inference/include/Edge.h index 338bee1d..893ce9ca 100644 --- a/mv_machine_learning/inference/include/Edge.h +++ b/mv_machine_learning/inference/include/Edge.h @@ -17,10 +17,13 @@ #ifndef __EDGE_H__ #define __EDGE_H__ -#include <vector> #include <mv_inference_type.h> +#include <mv_private.h> + #include <json-glib/json-glib.h> +#include <vector> + namespace mediavision { namespace inference diff --git a/mv_machine_learning/inference/include/Inference.h b/mv_machine_learning/inference/include/Inference.h index 576a6302..bf4e4723 100644 --- a/mv_machine_learning/inference/include/Inference.h +++ b/mv_machine_learning/inference/include/Inference.h @@ -17,23 +17,23 @@ #ifndef __MEDIA_VISION_INFERENCE_H__ #define __MEDIA_VISION_INFERENCE_H__ -#include <string> #include <map> #include <memory> +#include <string> -#include "mv_common.h" -#include "inference_engine_error.h" +#include "MetaParser.h" +#include "Metadata.h" +#include "PostProcess.h" +#include "PreProcess.h" +#include "TensorBuffer.h" #include "inference_engine_common_impl.h" +#include "inference_engine_error.h" +#include "mv_common.h" #include "mv_inference_private.h" +#include "types.h" #include <mv_inference_type.h> #include <opencv2/core.hpp> #include <opencv2/imgproc.hpp> -#include "types.h" -#include "Metadata.h" -#include "MetaParser.h" -#include "PreProcess.h" -#include "PostProcess.h" -#include "TensorBuffer.h" #include "Landmark.h" diff --git a/mv_machine_learning/inference/include/InferenceIni.h b/mv_machine_learning/inference/include/InferenceIni.h index 6f95a0ac..b1ca63bb 100644 --- a/mv_machine_learning/inference/include/InferenceIni.h +++ b/mv_machine_learning/inference/include/InferenceIni.h @@ -17,9 +17,9 @@ #ifndef __MEDIA_VISION_INFERENCE_INI_H__ #define __MEDIA_VISION_INFERENCE_INI_H__ +#include <mv_inference_type.h> #include <string> #include <vector> -#include <mv_inference_type.h> namespace mediavision { diff --git a/mv_machine_learning/inference/include/InputMetadata.h b/mv_machine_learning/inference/include/InputMetadata.h index b7f45b58..fc9b3ee1 100644 --- a/mv_machine_learning/inference/include/InputMetadata.h +++ b/mv_machine_learning/inference/include/InputMetadata.h @@ -17,9 +17,9 @@ #ifndef __MEDIA_VISION_INPUTMETADATA_H__ #define __MEDIA_VISION_INPUTMETADATA_H__ +#include <map> #include <string> #include <vector> -#include <map> #include "MetadataType.h" #include <inference_engine_type.h> diff --git a/mv_machine_learning/inference/include/Joint.h b/mv_machine_learning/inference/include/Joint.h index 6632f979..4c805f74 100644 --- a/mv_machine_learning/inference/include/Joint.h +++ b/mv_machine_learning/inference/include/Joint.h @@ -1,8 +1,8 @@ #ifndef __MEDIA_VISION_JOINT_H__ #define __MEDIA_VISION_JOINT_H__ -#include <opencv2/core.hpp> #include <memory> +#include <opencv2/core.hpp> #include <string> #include <vector> diff --git a/mv_machine_learning/inference/include/LabelInfo.h b/mv_machine_learning/inference/include/LabelInfo.h index 81cd66f6..dc4dfab4 100644 --- a/mv_machine_learning/inference/include/LabelInfo.h +++ b/mv_machine_learning/inference/include/LabelInfo.h @@ -17,14 +17,14 @@ #ifndef __LABEL_INFO_H__ #define __LABEL_INFO_H__ -#include <string> -#include <vector> #include <map> #include <memory> +#include <string> +#include <vector> +#include <inference_engine_type.h> #include <json-glib/json-glib.h> #include <mv_inference_type.h> -#include <inference_engine_type.h> #include "DecodeInfo.h" #include "DimInfo.h" diff --git a/mv_machine_learning/inference/include/Landmark.h b/mv_machine_learning/inference/include/Landmark.h index a691ef0a..8f2c6d86 100644 --- a/mv_machine_learning/inference/include/Landmark.h +++ b/mv_machine_learning/inference/include/Landmark.h @@ -17,16 +17,18 @@ #ifndef __LANDMARK_H__ #define __LANDMARK_H__ -#include <string> -#include <vector> -#include <map> - -#include <opencv2/core.hpp> -#include <json-glib/json-glib.h> #include "DimInfo.h" #include "DispVec.h" +#include "Edge.h" #include "Utils.h" +#include <json-glib/json-glib.h> +#include <opencv2/core.hpp> + +#include <map> +#include <string> +#include <vector> + /** * @file Landmark.h * @brief This file contains the Landmark class definition which diff --git a/mv_machine_learning/inference/include/Metadata.h b/mv_machine_learning/inference/include/Metadata.h index b12fc75e..3d653f57 100644 --- a/mv_machine_learning/inference/include/Metadata.h +++ b/mv_machine_learning/inference/include/Metadata.h @@ -17,15 +17,15 @@ #ifndef __MEDIA_VISION_METADATA_H__ #define __MEDIA_VISION_METADATA_H__ -#include <string> #include <map> +#include <string> -#include "mv_common.h" -#include "mv_inference_private.h" -#include <mv_inference_type.h> #include "InputMetadata.h" #include "OutputMetadata.h" +#include "mv_common.h" +#include "mv_inference_private.h" #include <json-glib/json-glib.h> +#include <mv_inference_type.h> /** * @file Metadata.h diff --git a/mv_machine_learning/inference/include/MetadataType.h b/mv_machine_learning/inference/include/MetadataType.h index 6b76140f..f5483b49 100644 --- a/mv_machine_learning/inference/include/MetadataType.h +++ b/mv_machine_learning/inference/include/MetadataType.h @@ -17,9 +17,9 @@ #ifndef __MEDIA_VISION_OUTPUTMETADATA_TYPES_H__ #define __MEDIA_VISION_OUTPUTMETADATA_TYPES_H__ +#include <inference_engine_type.h> #include <mv_common.h> #include <mv_inference_type.h> -#include <inference_engine_type.h> /** * @file OutputMetadataTypes.h diff --git a/mv_machine_learning/inference/include/NumberInfo.h b/mv_machine_learning/inference/include/NumberInfo.h index 7c51799c..6a0451f4 100644 --- a/mv_machine_learning/inference/include/NumberInfo.h +++ b/mv_machine_learning/inference/include/NumberInfo.h @@ -17,14 +17,14 @@ #ifndef __NUMBER_INFO_H__ #define __NUMBER_INFO_H__ -#include <string> -#include <vector> #include <map> #include <memory> +#include <string> +#include <vector> +#include <inference_engine_type.h> #include <json-glib/json-glib.h> #include <mv_inference_type.h> -#include <inference_engine_type.h> #include "DecodeInfo.h" #include "DimInfo.h" diff --git a/mv_machine_learning/inference/include/ObjectDecoder.h b/mv_machine_learning/inference/include/ObjectDecoder.h index bbc33a4d..feff65c4 100644 --- a/mv_machine_learning/inference/include/ObjectDecoder.h +++ b/mv_machine_learning/inference/include/ObjectDecoder.h @@ -17,15 +17,15 @@ #ifndef __MEDIA_VISION_OBJECTDECODER_H__ #define __MEDIA_VISION_OBJECTDECODER_H__ -#include <string> -#include <vector> -#include <map> #include <list> +#include <map> #include <opencv2/core.hpp> +#include <string> +#include <vector> -#include "TensorBuffer.h" #include "OutputMetadata.h" #include "PostProcess.h" +#include "TensorBuffer.h" /** * @file ObjectDecoder.h diff --git a/mv_machine_learning/inference/include/OffsetVec.h b/mv_machine_learning/inference/include/OffsetVec.h index 6b3746e6..b714725e 100644 --- a/mv_machine_learning/inference/include/OffsetVec.h +++ b/mv_machine_learning/inference/include/OffsetVec.h @@ -17,13 +17,13 @@ #ifndef __OFFSET_VEC_H__ #define __OFFSET_VEC_H__ +#include <memory> #include <string> #include <vector> -#include <memory> -#include <mv_inference_type.h> #include "DimInfo.h" #include "Utils.h" +#include <mv_inference_type.h> namespace mediavision { diff --git a/mv_machine_learning/inference/include/OutputMetadata.h b/mv_machine_learning/inference/include/OutputMetadata.h index f04bc23e..9d9ebccc 100644 --- a/mv_machine_learning/inference/include/OutputMetadata.h +++ b/mv_machine_learning/inference/include/OutputMetadata.h @@ -17,26 +17,26 @@ #ifndef __MEDIA_VISION_OUTPUTMETADATA_H__ #define __MEDIA_VISION_OUTPUTMETADATA_H__ -#include <string> -#include <vector> #include <map> #include <memory> +#include <string> +#include <vector> -#include <mv_inference_type.h> -#include <inference_engine_type.h> -#include <json-glib/json-glib.h> -#include <opencv2/core.hpp> -#include "MetadataType.h" +#include "BoxInfo.h" #include "DecodeInfo.h" -#include "Edge.h" -#include "DispVec.h" #include "DimInfo.h" -#include "OffsetVec.h" -#include "Landmark.h" -#include "BoxInfo.h" +#include "DispVec.h" +#include "Edge.h" #include "LabelInfo.h" +#include "Landmark.h" +#include "MetadataType.h" #include "NumberInfo.h" +#include "OffsetVec.h" #include "ScoreInfo.h" +#include <inference_engine_type.h> +#include <json-glib/json-glib.h> +#include <mv_inference_type.h> +#include <opencv2/core.hpp> /** * @file OutputMetadata.h diff --git a/mv_machine_learning/inference/include/PoseDecoder.h b/mv_machine_learning/inference/include/PoseDecoder.h index 22e3fc15..dbe12a22 100644 --- a/mv_machine_learning/inference/include/PoseDecoder.h +++ b/mv_machine_learning/inference/include/PoseDecoder.h @@ -17,14 +17,14 @@ #ifndef __MEDIA_VISION_POSEDECODER_H__ #define __MEDIA_VISION_POSEDECODER_H__ +#include <list> +#include <map> #include <string> #include <vector> -#include <map> -#include <list> -#include "TensorBuffer.h" -#include "OutputMetadata.h" #include "Landmark.h" +#include "OutputMetadata.h" +#include "TensorBuffer.h" /** * @file PoseDecoder.h diff --git a/mv_machine_learning/inference/include/PostProcess.h b/mv_machine_learning/inference/include/PostProcess.h index 8a097d73..0d00d662 100644 --- a/mv_machine_learning/inference/include/PostProcess.h +++ b/mv_machine_learning/inference/include/PostProcess.h @@ -17,12 +17,12 @@ #ifndef __MEDIA_VISION_POSTPROCESS_H__ #define __MEDIA_VISION_POSTPROCESS_H__ -#include <string> #include <map> #include <queue> +#include <string> -#include "mv_common.h" #include "OutputMetadata.h" +#include "mv_common.h" #include <opencv2/core.hpp> #include <opencv2/imgproc.hpp> diff --git a/mv_machine_learning/inference/include/Posture.h b/mv_machine_learning/inference/include/Posture.h index 0359d70c..6dbb4b3b 100644 --- a/mv_machine_learning/inference/include/Posture.h +++ b/mv_machine_learning/inference/include/Posture.h @@ -17,13 +17,13 @@ #ifndef __MEDIA_VISION_POSE_H__ #define __MEDIA_VISION_POSE_H__ -#include <string> #include <map> +#include <string> -#include "mv_common.h" -#include "Inference.h" #include "Bvh.h" #include "BvhParser.h" +#include "Inference.h" +#include "mv_common.h" #include <mv_inference_type.h> #include <opencv2/core.hpp> #include <opencv2/imgproc.hpp> diff --git a/mv_machine_learning/inference/include/PreProcess.h b/mv_machine_learning/inference/include/PreProcess.h index bdb63768..18c0ef62 100644 --- a/mv_machine_learning/inference/include/PreProcess.h +++ b/mv_machine_learning/inference/include/PreProcess.h @@ -15,13 +15,13 @@ */ #ifndef __MEDIA_VISION_PREPROCESS_H__ -#define __MEDIA_VISION_PREPORCESS_H__ +#define __MEDIA_VISION_PREPROCESS_H__ -#include <string> #include <map> +#include <string> -#include "mv_common.h" #include "InputMetadata.h" +#include "mv_common.h" #include <opencv2/core.hpp> #include <opencv2/imgproc.hpp> diff --git a/mv_machine_learning/inference/include/ScoreInfo.h b/mv_machine_learning/inference/include/ScoreInfo.h index 2ebeddc9..2b993bf2 100644 --- a/mv_machine_learning/inference/include/ScoreInfo.h +++ b/mv_machine_learning/inference/include/ScoreInfo.h @@ -17,16 +17,16 @@ #ifndef __SCORE_INFO_H__ #define __SCORE_INFO_H__ -#include <string> -#include <vector> #include <map> #include <memory> +#include <string> +#include <vector> -#include <mv_inference_type.h> -#include <mv_private.h> -#include <MetadataType.h> #include "DimInfo.h" #include "Utils.h" +#include <MetadataType.h> +#include <mv_inference_type.h> +#include <mv_private.h> namespace mediavision { diff --git a/mv_machine_learning/inference/include/TensorBuffer.h b/mv_machine_learning/inference/include/TensorBuffer.h index c4654cd9..36e4271e 100644 --- a/mv_machine_learning/inference/include/TensorBuffer.h +++ b/mv_machine_learning/inference/include/TensorBuffer.h @@ -17,13 +17,13 @@ #ifndef __MEDIA_VISION_TENSORBUFFER_H__ #define __MEDIA_VISION_TENSORBUFFER_H__ -#include <string> -#include <map> -#include <variant> #include "mv_common.h" #include "mv_inference_private.h" #include <inference_engine_type.h> +#include <map> #include <mv_inference_type.h> +#include <string> +#include <variant> /** * @file TensorBuffer.h diff --git a/mv_machine_learning/inference/include/Utils.h b/mv_machine_learning/inference/include/Utils.h index 404924b1..949cace5 100644 --- a/mv_machine_learning/inference/include/Utils.h +++ b/mv_machine_learning/inference/include/Utils.h @@ -17,14 +17,14 @@ #ifndef __UTILS_H__ #define __UTILS_H__ -#include <string> -#include <vector> #include <map> #include <memory> +#include <string> +#include <vector> +#include <dlog.h> #include <json-glib/json-glib.h> #include <stdexcept> -#include <dlog.h> namespace mediavision { diff --git a/mv_machine_learning/inference/src/BvhParser.cpp b/mv_machine_learning/inference/src/BvhParser.cpp index 9f7431ed..ea46c6e8 100644 --- a/mv_machine_learning/inference/src/BvhParser.cpp +++ b/mv_machine_learning/inference/src/BvhParser.cpp @@ -17,8 +17,8 @@ #include "BvhParser.h" #include "mv_private.h" -#include <iostream> #include <fstream> +#include <iostream> #include <sstream> #include <string> diff --git a/mv_machine_learning/inference/src/DecodeInfo.cpp b/mv_machine_learning/inference/src/DecodeInfo.cpp index 680f89f2..9259167a 100644 --- a/mv_machine_learning/inference/src/DecodeInfo.cpp +++ b/mv_machine_learning/inference/src/DecodeInfo.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include <mv_private.h> #include <DecodeInfo.h> #include <Utils.h> +#include <mv_private.h> using namespace mediavision::inference; using namespace mediavision::inference::box; diff --git a/mv_machine_learning/inference/src/Inference.cpp b/mv_machine_learning/inference/src/Inference.cpp index e3372c6c..69145f3a 100644 --- a/mv_machine_learning/inference/src/Inference.cpp +++ b/mv_machine_learning/inference/src/Inference.cpp @@ -14,20 +14,20 @@ * limitations under the License. */ -#include "mv_private.h" #include "Inference.h" #include "InferenceIni.h" #include "ObjectDecoder.h" #include "PoseDecoder.h" +#include "mv_private.h" #include "util.h" -#include <map> #include <list> +#include <map> -#include <unistd.h> +#include <algorithm> #include <fstream> -#include <string> #include <queue> -#include <algorithm> +#include <string> +#include <unistd.h> #define MV_INFERENCE_OUTPUT_NUMBERS_MAX 10 #define MV_INFERENCE_OUTPUT_NUMBERS_MIN 1 diff --git a/mv_machine_learning/inference/src/InferenceIni.cpp b/mv_machine_learning/inference/src/InferenceIni.cpp index 9498e817..9d01f442 100644 --- a/mv_machine_learning/inference/src/InferenceIni.cpp +++ b/mv_machine_learning/inference/src/InferenceIni.cpp @@ -15,11 +15,11 @@ */ #include <iniparser.h> -#include <unistd.h> #include <map> +#include <unistd.h> -#include "mv_private.h" #include "InferenceIni.h" +#include "mv_private.h" namespace mediavision { diff --git a/mv_machine_learning/inference/src/InputMetadata.cpp b/mv_machine_learning/inference/src/InputMetadata.cpp index 8d488b6e..21c9be6a 100644 --- a/mv_machine_learning/inference/src/InputMetadata.cpp +++ b/mv_machine_learning/inference/src/InputMetadata.cpp @@ -16,14 +16,14 @@ #include "mv_private.h" -#include <unistd.h> -#include <fstream> -#include <string> -#include <queue> -#include <algorithm> #include "InputMetadata.h" -#include <mv_common.h> #include "Utils.h" +#include <algorithm> +#include <fstream> +#include <mv_common.h> +#include <queue> +#include <string> +#include <unistd.h> namespace mediavision { diff --git a/mv_machine_learning/inference/src/LabelInfo.cpp b/mv_machine_learning/inference/src/LabelInfo.cpp index 57b31c40..9ba84888 100644 --- a/mv_machine_learning/inference/src/LabelInfo.cpp +++ b/mv_machine_learning/inference/src/LabelInfo.cpp @@ -15,8 +15,8 @@ * limitations under the License. */ -#include <mv_private.h> #include "LabelInfo.h" +#include <mv_private.h> using namespace mediavision::inference::label; diff --git a/mv_machine_learning/inference/src/Metadata.cpp b/mv_machine_learning/inference/src/Metadata.cpp index 74c6ae51..9a9a0401 100644 --- a/mv_machine_learning/inference/src/Metadata.cpp +++ b/mv_machine_learning/inference/src/Metadata.cpp @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "mv_private.h" #include "Metadata.h" +#include "mv_private.h" #include <map> -#include <unistd.h> +#include <algorithm> #include <fstream> -#include <string> #include <queue> -#include <algorithm> +#include <string> +#include <unistd.h> using namespace std; diff --git a/mv_machine_learning/inference/src/NumberInfo.cpp b/mv_machine_learning/inference/src/NumberInfo.cpp index cdc3fcb0..c4593023 100644 --- a/mv_machine_learning/inference/src/NumberInfo.cpp +++ b/mv_machine_learning/inference/src/NumberInfo.cpp @@ -15,8 +15,8 @@ * limitations under the License. */ -#include <mv_private.h> #include "NumberInfo.h" +#include <mv_private.h> using namespace mediavision::inference::number; diff --git a/mv_machine_learning/inference/src/ObjectDecoder.cpp b/mv_machine_learning/inference/src/ObjectDecoder.cpp index 43a01567..3ff27854 100644 --- a/mv_machine_learning/inference/src/ObjectDecoder.cpp +++ b/mv_machine_learning/inference/src/ObjectDecoder.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "mv_private.h" #include "ObjectDecoder.h" +#include "mv_private.h" -#include <unistd.h> #include <fstream> #include <string> +#include <unistd.h> namespace mediavision { diff --git a/mv_machine_learning/inference/src/OutputMetadata.cpp b/mv_machine_learning/inference/src/OutputMetadata.cpp index 01600bf3..b8663edb 100644 --- a/mv_machine_learning/inference/src/OutputMetadata.cpp +++ b/mv_machine_learning/inference/src/OutputMetadata.cpp @@ -16,11 +16,11 @@ #include "mv_private.h" -#include <unistd.h> +#include <algorithm> #include <fstream> -#include <string> #include <queue> -#include <algorithm> +#include <string> +#include <unistd.h> #include "OutputMetadata.h" #include "Utils.h" diff --git a/mv_machine_learning/inference/src/PoseDecoder.cpp b/mv_machine_learning/inference/src/PoseDecoder.cpp index 832077f4..9d89964f 100644 --- a/mv_machine_learning/inference/src/PoseDecoder.cpp +++ b/mv_machine_learning/inference/src/PoseDecoder.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "mv_private.h" #include "PoseDecoder.h" #include "PostProcess.h" +#include "mv_private.h" -#include <unistd.h> #include <fstream> #include <string> +#include <unistd.h> #define MAX_NUMBER_OF_CORRECTION 3 diff --git a/mv_machine_learning/inference/src/PostProcess.cpp b/mv_machine_learning/inference/src/PostProcess.cpp index 7060da7a..96b7f730 100644 --- a/mv_machine_learning/inference/src/PostProcess.cpp +++ b/mv_machine_learning/inference/src/PostProcess.cpp @@ -16,11 +16,11 @@ #include "mv_private.h" -#include <unistd.h> +#include "PostProcess.h" +#include <cmath> #include <fstream> #include <string> -#include <cmath> -#include "PostProcess.h" +#include <unistd.h> namespace mediavision { diff --git a/mv_machine_learning/inference/src/Posture.cpp b/mv_machine_learning/inference/src/Posture.cpp index 3601b254..a0c8a79b 100644 --- a/mv_machine_learning/inference/src/Posture.cpp +++ b/mv_machine_learning/inference/src/Posture.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "mv_private.h" #include "Posture.h" +#include "mv_private.h" -#include <ios> +#include <cfloat> #include <fstream> +#include <ios> #include <sstream> #include <string> #include <unistd.h> -#include <cfloat> #define POSE_OFFSET_VALUE 20 diff --git a/mv_machine_learning/inference/src/PreProcess.cpp b/mv_machine_learning/inference/src/PreProcess.cpp index b0a17e9a..ed89e0e5 100644 --- a/mv_machine_learning/inference/src/PreProcess.cpp +++ b/mv_machine_learning/inference/src/PreProcess.cpp @@ -16,12 +16,12 @@ #include "mv_private.h" -#include <unistd.h> +#include "PreProcess.h" +#include <algorithm> #include <fstream> -#include <string> #include <queue> -#include <algorithm> -#include "PreProcess.h" +#include <string> +#include <unistd.h> const int colorConvertTable[][12] = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, diff --git a/mv_machine_learning/inference/src/TensorBuffer.cpp b/mv_machine_learning/inference/src/TensorBuffer.cpp index 2510549f..afb0b405 100644 --- a/mv_machine_learning/inference/src/TensorBuffer.cpp +++ b/mv_machine_learning/inference/src/TensorBuffer.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "mv_private.h" #include "TensorBuffer.h" +#include "mv_private.h" #include <map> -#include <unistd.h> #include <fstream> -#include <string> #include <stdexcept> +#include <string> +#include <unistd.h> namespace mediavision { diff --git a/mv_machine_learning/inference/src/mv_inference.cpp b/mv_machine_learning/inference/src/mv_inference.cpp index d9f76682..d500a634 100644 --- a/mv_machine_learning/inference/src/mv_inference.cpp +++ b/mv_machine_learning/inference/src/mv_inference.cpp @@ -14,18 +14,18 @@ * limitations under the License. */ -#include "mv_private.h" -#include "mv_feature_key.h" #include "mv_inference.h" #include "Inference.h" #include "Posture.h" +#include "mv_feature_key.h" +#include "mv_private.h" -#include <new> -#include <unistd.h> -#include <string> #include <mv_common.h> -#include <mv_inference_type.h> #include <mv_inference.h> +#include <mv_inference_type.h> +#include <new> +#include <string> +#include <unistd.h> /** * @file mv_inference.cpp diff --git a/mv_machine_learning/landmark_detection/include/FacialLandmarkAdapter.h b/mv_machine_learning/landmark_detection/include/FacialLandmarkAdapter.h index 5ec7ee12..3307042e 100644 --- a/mv_machine_learning/landmark_detection/include/FacialLandmarkAdapter.h +++ b/mv_machine_learning/landmark_detection/include/FacialLandmarkAdapter.h @@ -20,10 +20,10 @@ #include <dlog.h> #include "EngineConfig.h" -#include "ITask.h" -#include "MvMlConfig.h" #include "FldTweakCnn.h" #include "ILandmarkDetection.h" +#include "ITask.h" +#include "MvMlConfig.h" namespace mediavision { diff --git a/mv_machine_learning/landmark_detection/include/FldTweakCnn.h b/mv_machine_learning/landmark_detection/include/FldTweakCnn.h index b6e13bbd..c37e39c6 100644 --- a/mv_machine_learning/landmark_detection/include/FldTweakCnn.h +++ b/mv_machine_learning/landmark_detection/include/FldTweakCnn.h @@ -17,10 +17,10 @@ #ifndef __FLD_TWEAK_CNN_H__ #define __FLD_TWEAK_CNN_H__ -#include <string> +#include "mv_private.h" #include <memory> #include <mv_common.h> -#include "mv_private.h" +#include <string> #include "LandmarkDetection.h" #include <mv_inference_type.h> diff --git a/mv_machine_learning/landmark_detection/include/LandmarkDetection.h b/mv_machine_learning/landmark_detection/include/LandmarkDetection.h index 33b0137f..0fb5774e 100644 --- a/mv_machine_learning/landmark_detection/include/LandmarkDetection.h +++ b/mv_machine_learning/landmark_detection/include/LandmarkDetection.h @@ -17,20 +17,20 @@ #ifndef __LANDMARK_DETECTION_H__ #define __LANDMARK_DETECTION_H__ +#include "mv_private.h" #include <mv_common.h> #include <mv_inference_type.h> -#include "mv_private.h" +#include "AsyncManager.h" #include "EngineConfig.h" -#include "inference_engine_common_impl.h" +#include "ILandmarkDetection.h" #include "Inference.h" -#include "landmark_detection_type.h" -#include "MetaParser.h" #include "LandmarkDetectionParser.h" +#include "MetaParser.h" #include "MvMlConfig.h" #include "MvMlPreprocess.h" -#include "AsyncManager.h" -#include "ILandmarkDetection.h" +#include "inference_engine_common_impl.h" +#include "landmark_detection_type.h" namespace mediavision { diff --git a/mv_machine_learning/landmark_detection/include/PldCpm.h b/mv_machine_learning/landmark_detection/include/PldCpm.h index 3a06e264..b29d9541 100644 --- a/mv_machine_learning/landmark_detection/include/PldCpm.h +++ b/mv_machine_learning/landmark_detection/include/PldCpm.h @@ -17,10 +17,10 @@ #ifndef __PLD_CPM_H__ #define __PLD_CPM_H__ -#include <string> +#include "mv_private.h" #include <memory> #include <mv_common.h> -#include "mv_private.h" +#include <string> #include "LandmarkDetection.h" #include <mv_inference_type.h> diff --git a/mv_machine_learning/landmark_detection/include/PoseLandmarkAdapter.h b/mv_machine_learning/landmark_detection/include/PoseLandmarkAdapter.h index d4d1505c..01f225dd 100644 --- a/mv_machine_learning/landmark_detection/include/PoseLandmarkAdapter.h +++ b/mv_machine_learning/landmark_detection/include/PoseLandmarkAdapter.h @@ -20,10 +20,10 @@ #include <dlog.h> #include "EngineConfig.h" +#include "ILandmarkDetection.h" #include "ITask.h" #include "MvMlConfig.h" #include "PldCpm.h" -#include "ILandmarkDetection.h" namespace mediavision { 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 80a947b0..fe20397a 100644 --- a/mv_machine_learning/landmark_detection/include/landmark_detection_type.h +++ b/mv_machine_learning/landmark_detection/include/landmark_detection_type.h @@ -19,9 +19,9 @@ #include <vector> +#include "mv_ml_types.h" #include <mv_common.h> #include <mv_inference_type.h> -#include "mv_ml_types.h" namespace mediavision { diff --git a/mv_machine_learning/landmark_detection/src/FacialLandmarkAdapter.cpp b/mv_machine_learning/landmark_detection/src/FacialLandmarkAdapter.cpp index 53ffe797..a4ba0adf 100644 --- a/mv_machine_learning/landmark_detection/src/FacialLandmarkAdapter.cpp +++ b/mv_machine_learning/landmark_detection/src/FacialLandmarkAdapter.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "MvMlException.h" #include "FacialLandmarkAdapter.h" +#include "MvMlException.h" #include "mv_landmark_detection_config.h" using namespace std; diff --git a/mv_machine_learning/landmark_detection/src/FldTweakCnn.cpp b/mv_machine_learning/landmark_detection/src/FldTweakCnn.cpp index 512b3be9..97421697 100644 --- a/mv_machine_learning/landmark_detection/src/FldTweakCnn.cpp +++ b/mv_machine_learning/landmark_detection/src/FldTweakCnn.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#include <string.h> -#include <map> #include <algorithm> +#include <map> +#include <string.h> -#include "MvMlException.h" #include "FldTweakCnn.h" +#include "MvMlException.h" #include "Postprocess.h" using namespace std; diff --git a/mv_machine_learning/landmark_detection/src/LandmarkDetection.cpp b/mv_machine_learning/landmark_detection/src/LandmarkDetection.cpp index 86caa047..54bbf4be 100644 --- a/mv_machine_learning/landmark_detection/src/LandmarkDetection.cpp +++ b/mv_machine_learning/landmark_detection/src/LandmarkDetection.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ -#include <string.h> +#include <algorithm> #include <fstream> #include <map> #include <memory> -#include <algorithm> +#include <string.h> +#include "LandmarkDetection.h" #include "MvMlException.h" #include "common.h" -#include "LandmarkDetection.h" using namespace std; using namespace mediavision::inference; diff --git a/mv_machine_learning/landmark_detection/src/LandmarkDetectionParser.cpp b/mv_machine_learning/landmark_detection/src/LandmarkDetectionParser.cpp index d47c6eee..a9593f20 100644 --- a/mv_machine_learning/landmark_detection/src/LandmarkDetectionParser.cpp +++ b/mv_machine_learning/landmark_detection/src/LandmarkDetectionParser.cpp @@ -15,8 +15,8 @@ */ #include <memory> -#include "MvMlException.h" #include "LandmarkDetectionParser.h" +#include "MvMlException.h" #include "landmark_detection_type.h" using namespace std; diff --git a/mv_machine_learning/landmark_detection/src/PldCpm.cpp b/mv_machine_learning/landmark_detection/src/PldCpm.cpp index b8714903..89b0f99d 100644 --- a/mv_machine_learning/landmark_detection/src/PldCpm.cpp +++ b/mv_machine_learning/landmark_detection/src/PldCpm.cpp @@ -14,14 +14,14 @@ * limitations under the License. */ -#include <string.h> -#include <map> #include <algorithm> +#include <map> +#include <string.h> #include "MvMlException.h" -#include "mv_landmark_detection_config.h" #include "PldCpm.h" #include "Postprocess.h" +#include "mv_landmark_detection_config.h" using namespace std; using namespace mediavision::inference; diff --git a/mv_machine_learning/landmark_detection/src/PoseLandmarkAdapter.cpp b/mv_machine_learning/landmark_detection/src/PoseLandmarkAdapter.cpp index 3203c495..b934f71d 100644 --- a/mv_machine_learning/landmark_detection/src/PoseLandmarkAdapter.cpp +++ b/mv_machine_learning/landmark_detection/src/PoseLandmarkAdapter.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "MvMlException.h" #include "PoseLandmarkAdapter.h" +#include "MvMlException.h" #include "mv_landmark_detection_config.h" using namespace std; 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 08e33536..8020ab03 100644 --- a/mv_machine_learning/landmark_detection/src/mv_facial_landmark.cpp +++ b/mv_machine_learning/landmark_detection/src/mv_facial_landmark.cpp @@ -14,20 +14,20 @@ * limitations under the License. */ -#include "mv_private.h" -#include "mv_feature_key.h" -#include "ITask.h" -#include "mv_facial_landmark_internal.h" +#include "Context.h" #include "FacialLandmarkAdapter.h" +#include "ITask.h" #include "MvMlException.h" -#include "native_capi.h" #include "landmark_detection_type.h" -#include "Context.h" +#include "mv_facial_landmark_internal.h" +#include "mv_feature_key.h" +#include "mv_private.h" +#include "native_capi.h" +#include <algorithm> #include <new> -#include <unistd.h> #include <string> -#include <algorithm> +#include <unistd.h> #define TASK_NAME "facial_landmark" 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 8cd22cee..e7fe6d9e 100644 --- a/mv_machine_learning/landmark_detection/src/mv_pose_landmark.cpp +++ b/mv_machine_learning/landmark_detection/src/mv_pose_landmark.cpp @@ -14,20 +14,20 @@ * limitations under the License. */ -#include "mv_private.h" -#include "mv_feature_key.h" +#include "Context.h" #include "ITask.h" -#include "mv_pose_landmark_internal.h" -#include "PoseLandmarkAdapter.h" #include "MvMlException.h" -#include "native_capi.h" +#include "PoseLandmarkAdapter.h" #include "landmark_detection_type.h" -#include "Context.h" +#include "mv_feature_key.h" +#include "mv_pose_landmark_internal.h" +#include "mv_private.h" +#include "native_capi.h" +#include <algorithm> #include <new> -#include <unistd.h> #include <string> -#include <algorithm> +#include <unistd.h> #define TASK_NAME "pose_landmark" diff --git a/mv_machine_learning/object_detection/include/FaceDetectionAdapter.h b/mv_machine_learning/object_detection/include/FaceDetectionAdapter.h index 2ebb7a88..f285b99f 100644 --- a/mv_machine_learning/object_detection/include/FaceDetectionAdapter.h +++ b/mv_machine_learning/object_detection/include/FaceDetectionAdapter.h @@ -21,8 +21,8 @@ #include "EngineConfig.h" #include "ITask.h" -#include "MvMlConfig.h" #include "MobilenetV1Ssd.h" +#include "MvMlConfig.h" namespace mediavision { diff --git a/mv_machine_learning/object_detection/include/MobilenetV1Ssd.h b/mv_machine_learning/object_detection/include/MobilenetV1Ssd.h index e8e9d387..b9017fd1 100644 --- a/mv_machine_learning/object_detection/include/MobilenetV1Ssd.h +++ b/mv_machine_learning/object_detection/include/MobilenetV1Ssd.h @@ -17,10 +17,10 @@ #ifndef __MOBILENET_V1_SSD_H__ #define __MOBILENET_V1_SSD_H__ -#include <string> +#include "mv_private.h" #include <memory> #include <mv_common.h> -#include "mv_private.h" +#include <string> #include "ObjectDetection.h" #include <mv_inference_type.h> diff --git a/mv_machine_learning/object_detection/include/MobilenetV2Ssd.h b/mv_machine_learning/object_detection/include/MobilenetV2Ssd.h index 1f6f7891..0df2bebe 100644 --- a/mv_machine_learning/object_detection/include/MobilenetV2Ssd.h +++ b/mv_machine_learning/object_detection/include/MobilenetV2Ssd.h @@ -17,10 +17,10 @@ #ifndef __MOBILENET_V2_SSD_H__ #define __MOBILENET_V2_SSD_H__ -#include <string> +#include "mv_private.h" #include <memory> #include <mv_common.h> -#include "mv_private.h" +#include <string> #include "ObjectDetection.h" #include <mv_inference_type.h> diff --git a/mv_machine_learning/object_detection/include/ObjectDetection.h b/mv_machine_learning/object_detection/include/ObjectDetection.h index ad3b71d8..0ee398c9 100644 --- a/mv_machine_learning/object_detection/include/ObjectDetection.h +++ b/mv_machine_learning/object_detection/include/ObjectDetection.h @@ -17,25 +17,25 @@ #ifndef __OBJECT_DETECTION_H__ #define __OBJECT_DETECTION_H__ +#include <atomic> +#include <mutex> #include <queue> #include <thread> -#include <mutex> -#include <atomic> +#include "mv_private.h" #include <mv_common.h> #include <mv_inference_type.h> -#include "mv_private.h" +#include "AsyncManager.h" #include "EngineConfig.h" -#include "inference_engine_common_impl.h" +#include "IObjectDetection.h" #include "Inference.h" -#include "object_detection_type.h" #include "MetaParser.h" -#include "ObjectDetectionParser.h" #include "MvMlConfig.h" #include "MvMlPreprocess.h" -#include "IObjectDetection.h" -#include "AsyncManager.h" +#include "ObjectDetectionParser.h" +#include "inference_engine_common_impl.h" +#include "object_detection_type.h" namespace mediavision { diff --git a/mv_machine_learning/object_detection/include/ObjectDetectionAdapter.h b/mv_machine_learning/object_detection/include/ObjectDetectionAdapter.h index e62c4b1d..6a43f996 100644 --- a/mv_machine_learning/object_detection/include/ObjectDetectionAdapter.h +++ b/mv_machine_learning/object_detection/include/ObjectDetectionAdapter.h @@ -21,9 +21,9 @@ #include "EngineConfig.h" #include "ITask.h" -#include "MvMlConfig.h" #include "MobilenetV1Ssd.h" #include "MobilenetV2Ssd.h" +#include "MvMlConfig.h" namespace mediavision { diff --git a/mv_machine_learning/object_detection/include/ObjectDetectionExternal.h b/mv_machine_learning/object_detection/include/ObjectDetectionExternal.h index e82f0bb7..12f35371 100644 --- a/mv_machine_learning/object_detection/include/ObjectDetectionExternal.h +++ b/mv_machine_learning/object_detection/include/ObjectDetectionExternal.h @@ -23,8 +23,8 @@ #include <opencv2/core.hpp> #include <opencv2/imgproc.hpp> -#include "object_detection_type.h" #include "IObjectDetection.h" +#include "object_detection_type.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 b5e3b944..98fe59b9 100644 --- a/mv_machine_learning/object_detection/include/object_detection_type.h +++ b/mv_machine_learning/object_detection/include/object_detection_type.h @@ -19,9 +19,9 @@ #include <opencv2/core.hpp> +#include "mv_ml_types.h" #include <mv_common.h> #include <mv_inference_type.h> -#include "mv_ml_types.h" namespace mediavision { diff --git a/mv_machine_learning/object_detection/src/FaceDetectionAdapter.cpp b/mv_machine_learning/object_detection/src/FaceDetectionAdapter.cpp index 30188442..4441eb70 100644 --- a/mv_machine_learning/object_detection/src/FaceDetectionAdapter.cpp +++ b/mv_machine_learning/object_detection/src/FaceDetectionAdapter.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "MvMlException.h" #include "FaceDetectionAdapter.h" +#include "MvMlException.h" #include "ObjectDetectionExternal.h" #include "mv_object_detection_config.h" diff --git a/mv_machine_learning/object_detection/src/MobilenetV1Ssd.cpp b/mv_machine_learning/object_detection/src/MobilenetV1Ssd.cpp index cb3c7ef8..60340251 100644 --- a/mv_machine_learning/object_detection/src/MobilenetV1Ssd.cpp +++ b/mv_machine_learning/object_detection/src/MobilenetV1Ssd.cpp @@ -14,14 +14,14 @@ * limitations under the License. */ -#include <string.h> -#include <map> #include <algorithm> +#include <map> +#include <string.h> -#include "MvMlException.h" -#include "mv_object_detection_config.h" #include "MobilenetV1Ssd.h" +#include "MvMlException.h" #include "Postprocess.h" +#include "mv_object_detection_config.h" using namespace std; using namespace mediavision::inference; diff --git a/mv_machine_learning/object_detection/src/MobilenetV2AnchorParser.cpp b/mv_machine_learning/object_detection/src/MobilenetV2AnchorParser.cpp index 42c3526d..e68eeb68 100644 --- a/mv_machine_learning/object_detection/src/MobilenetV2AnchorParser.cpp +++ b/mv_machine_learning/object_detection/src/MobilenetV2AnchorParser.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ -#include <unistd.h> -#include <string> -#include <queue> -#include <algorithm> -#include "MvMlException.h" #include "MobilenetV2AnchorParser.h" +#include "MvMlException.h" #include "meta_common.h" +#include <algorithm> +#include <queue> +#include <string> +#include <unistd.h> using namespace std; using namespace mediavision::machine_learning::exception; diff --git a/mv_machine_learning/object_detection/src/MobilenetV2Ssd.cpp b/mv_machine_learning/object_detection/src/MobilenetV2Ssd.cpp index 47ed03a3..fe1c999e 100644 --- a/mv_machine_learning/object_detection/src/MobilenetV2Ssd.cpp +++ b/mv_machine_learning/object_detection/src/MobilenetV2Ssd.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ -#include <string.h> -#include <map> #include <algorithm> #include <iostream> +#include <map> +#include <string.h> -#include "MvMlException.h" -#include "mv_object_detection_config.h" #include "MobilenetV2Ssd.h" +#include "MvMlException.h" #include "Postprocess.h" +#include "mv_object_detection_config.h" using namespace std; using namespace mediavision::inference; diff --git a/mv_machine_learning/object_detection/src/ObjectDetection.cpp b/mv_machine_learning/object_detection/src/ObjectDetection.cpp index ddf9ab1b..d2d346e8 100644 --- a/mv_machine_learning/object_detection/src/ObjectDetection.cpp +++ b/mv_machine_learning/object_detection/src/ObjectDetection.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ -#include <string.h> #include <fstream> #include <map> #include <memory> +#include <string.h> #include "MvMlException.h" +#include "ObjectDetection.h" #include "common.h" #include "mv_object_detection_config.h" -#include "ObjectDetection.h" using namespace std; using namespace mediavision::inference; diff --git a/mv_machine_learning/object_detection/src/ObjectDetectionAdapter.cpp b/mv_machine_learning/object_detection/src/ObjectDetectionAdapter.cpp index d089f05d..6e685b29 100644 --- a/mv_machine_learning/object_detection/src/ObjectDetectionAdapter.cpp +++ b/mv_machine_learning/object_detection/src/ObjectDetectionAdapter.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "MvMlException.h" #include "ObjectDetectionAdapter.h" +#include "MvMlException.h" #include "ObjectDetectionExternal.h" #include "mv_object_detection_config.h" diff --git a/mv_machine_learning/object_detection/src/ObjectDetectionParser.cpp b/mv_machine_learning/object_detection/src/ObjectDetectionParser.cpp index d4400424..31eed1b8 100644 --- a/mv_machine_learning/object_detection/src/ObjectDetectionParser.cpp +++ b/mv_machine_learning/object_detection/src/ObjectDetectionParser.cpp @@ -15,10 +15,10 @@ */ #include <memory> +#include "MobilenetV2AnchorParser.h" #include "MvMlException.h" #include "ObjectDetectionParser.h" #include "object_detection_type.h" -#include "MobilenetV2AnchorParser.h" using namespace std; using namespace mediavision::machine_learning::exception; 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 a8e0b711..e07cd527 100644 --- a/mv_machine_learning/object_detection/src/mv_face_detection.cpp +++ b/mv_machine_learning/object_detection/src/mv_face_detection.cpp @@ -14,22 +14,22 @@ * limitations under the License. */ -#include "mv_private.h" -#include "mv_feature_key.h" -#include "ITask.h" -#include "mv_face_detection_internal.h" +#include "Context.h" #include "FaceDetectionAdapter.h" +#include "ITask.h" #include "MvMlException.h" +#include "mv_face_detection_internal.h" +#include "mv_feature_key.h" +#include "mv_private.h" #include "native_capi.h" #include "object_detection_type.h" -#include "Context.h" -#include <new> -#include <unistd.h> -#include <string> #include <algorithm> -#include <mutex> #include <iostream> +#include <mutex> +#include <new> +#include <string> +#include <unistd.h> #define TASK_NAME "face_detection" 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 384be078..3e2be8ae 100644 --- a/mv_machine_learning/object_detection/src/mv_object_detection.cpp +++ b/mv_machine_learning/object_detection/src/mv_object_detection.cpp @@ -14,22 +14,22 @@ * limitations under the License. */ -#include "mv_private.h" -#include "mv_feature_key.h" +#include "Context.h" #include "ITask.h" -#include "mv_object_detection_internal.h" -#include "ObjectDetectionAdapter.h" #include "MvMlException.h" +#include "ObjectDetectionAdapter.h" +#include "mv_feature_key.h" +#include "mv_object_detection_internal.h" +#include "mv_private.h" #include "native_capi.h" #include "object_detection_type.h" -#include "Context.h" -#include <new> -#include <unistd.h> -#include <string> #include <algorithm> -#include <mutex> #include <iostream> +#include <mutex> +#include <new> +#include <string> +#include <unistd.h> #define TASK_NAME "object_detection" diff --git a/mv_machine_learning/object_detection_3d/include/IObjectDetection3d.h b/mv_machine_learning/object_detection_3d/include/IObjectDetection3d.h index b3852007..cf70b589 100644 --- a/mv_machine_learning/object_detection_3d/include/IObjectDetection3d.h +++ b/mv_machine_learning/object_detection_3d/include/IObjectDetection3d.h @@ -17,10 +17,11 @@ #ifndef __IOBJECT_DETECTION_3D_H__ #define __IOBJECT_DETECTION_3D_H__ -#include <mv_common.h> - #include "object_detection_3d_type.h" +#include <mv_common.h> +#include <types.h> + namespace mediavision { namespace machine_learning diff --git a/mv_machine_learning/object_detection_3d/include/ObjectDetection3d.h b/mv_machine_learning/object_detection_3d/include/ObjectDetection3d.h index 7fcf809b..fb941d65 100644 --- a/mv_machine_learning/object_detection_3d/include/ObjectDetection3d.h +++ b/mv_machine_learning/object_detection_3d/include/ObjectDetection3d.h @@ -17,19 +17,19 @@ #ifndef __OBJECT_DETECTION_3D_H__ #define __OBJECT_DETECTION_3D_H__ +#include "mv_private.h" #include <mv_common.h> #include <mv_inference_type.h> -#include "mv_private.h" #include "EngineConfig.h" -#include "inference_engine_common_impl.h" -#include "Inference.h" -#include "object_detection_3d_type.h" #include "IObjectDetection3d.h" +#include "Inference.h" #include "MetaParser.h" #include "MvMlConfig.h" -#include "ObjectDetection3dParser.h" #include "MvMlPreprocess.h" +#include "ObjectDetection3dParser.h" +#include "inference_engine_common_impl.h" +#include "object_detection_3d_type.h" namespace mediavision { diff --git a/mv_machine_learning/object_detection_3d/include/ObjectDetection3dAdapter.h b/mv_machine_learning/object_detection_3d/include/ObjectDetection3dAdapter.h index dbb89b6c..a922ab8b 100644 --- a/mv_machine_learning/object_detection_3d/include/ObjectDetection3dAdapter.h +++ b/mv_machine_learning/object_detection_3d/include/ObjectDetection3dAdapter.h @@ -20,10 +20,10 @@ #include <dlog.h> #include "EngineConfig.h" +#include "IObjectDetection3d.h" #include "ITask.h" #include "MvMlConfig.h" #include "Objectron.h" -#include "IObjectDetection3d.h" namespace mediavision { diff --git a/mv_machine_learning/object_detection_3d/include/Objectron.h b/mv_machine_learning/object_detection_3d/include/Objectron.h index 3fa88751..5166c2d0 100644 --- a/mv_machine_learning/object_detection_3d/include/Objectron.h +++ b/mv_machine_learning/object_detection_3d/include/Objectron.h @@ -17,10 +17,10 @@ #ifndef __OBJECTRON_H__ #define __OBJECTRON_H__ +#include "MvMlConfig.h" +#include "mv_private.h" #include <memory> #include <mv_common.h> -#include "mv_private.h" -#include "MvMlConfig.h" #include "ObjectDetection3d.h" #include <mv_inference_type.h> diff --git a/mv_machine_learning/object_detection_3d/include/mv_object_detection_3d_open.h b/mv_machine_learning/object_detection_3d/include/mv_object_detection_3d_open.h index a0a22609..e10036d2 100644 --- a/mv_machine_learning/object_detection_3d/include/mv_object_detection_3d_open.h +++ b/mv_machine_learning/object_detection_3d/include/mv_object_detection_3d_open.h @@ -18,8 +18,8 @@ #define __MEDIA_VISION_OBJECT_DETECTION_3D_OPEN_H__ #include <mv_common.h> -#include <mv_private.h> #include <mv_object_detection_3d_type.h> +#include <mv_private.h> #ifdef __cplusplus extern "C" { 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 ecbfd0b8..215791db 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 @@ -17,9 +17,9 @@ #ifndef __OBJECT_DETECTION_3D_TYPE_H__ #define __OBJECT_DETECTION_3D_TYPE_H__ +#include "mv_ml_types.h" #include <mv_common.h> #include <mv_inference_type.h> -#include "mv_ml_types.h" namespace mediavision { diff --git a/mv_machine_learning/object_detection_3d/src/ObjectDetection3d.cpp b/mv_machine_learning/object_detection_3d/src/ObjectDetection3d.cpp index 0c2772ad..abc8f6be 100644 --- a/mv_machine_learning/object_detection_3d/src/ObjectDetection3d.cpp +++ b/mv_machine_learning/object_detection_3d/src/ObjectDetection3d.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ -#include <string.h> +#include <algorithm> #include <fstream> #include <map> #include <memory> -#include <algorithm> +#include <string.h> #include "MvMlException.h" -#include "common.h" #include "ObjectDetection3d.h" +#include "common.h" using namespace std; using namespace mediavision::inference; diff --git a/mv_machine_learning/object_detection_3d/src/ObjectDetection3dAdapter.cpp b/mv_machine_learning/object_detection_3d/src/ObjectDetection3dAdapter.cpp index 80a70658..540da0bb 100644 --- a/mv_machine_learning/object_detection_3d/src/ObjectDetection3dAdapter.cpp +++ b/mv_machine_learning/object_detection_3d/src/ObjectDetection3dAdapter.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "MvMlException.h" #include "ObjectDetection3dAdapter.h" +#include "MvMlException.h" using namespace std; using namespace MediaVision::Common; diff --git a/mv_machine_learning/object_detection_3d/src/ObjectDetection3dParser.cpp b/mv_machine_learning/object_detection_3d/src/ObjectDetection3dParser.cpp index 37d2bf9f..fa2dbca0 100644 --- a/mv_machine_learning/object_detection_3d/src/ObjectDetection3dParser.cpp +++ b/mv_machine_learning/object_detection_3d/src/ObjectDetection3dParser.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include <iostream> -#include "MvMlException.h" #include "ObjectDetection3dParser.h" +#include "MvMlException.h" +#include <iostream> using namespace std; using namespace mediavision::machine_learning::exception; diff --git a/mv_machine_learning/object_detection_3d/src/Objectron.cpp b/mv_machine_learning/object_detection_3d/src/Objectron.cpp index cc0bdb1d..a47deb34 100644 --- a/mv_machine_learning/object_detection_3d/src/Objectron.cpp +++ b/mv_machine_learning/object_detection_3d/src/Objectron.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include <string.h> -#include <map> #include <algorithm> +#include <map> +#include <string.h> #include "MvMlException.h" #include "Objectron.h" 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 48224a5a..74192469 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 @@ -14,21 +14,21 @@ * limitations under the License. */ -#include "mv_private.h" -#include "mv_feature_key.h" +#include "Context.h" #include "ITask.h" -#include "mv_object_detection_3d_internal.h" -#include "ObjectDetection3dAdapter.h" #include "MvMlException.h" +#include "ObjectDetection3dAdapter.h" +#include "mv_feature_key.h" +#include "mv_object_detection_3d_internal.h" +#include "mv_private.h" #include "native_capi.h" #include "object_detection_3d_type.h" -#include "Context.h" -#include <new> -#include <unistd.h> -#include <string> #include <algorithm> #include <mutex> +#include <new> +#include <string> +#include <unistd.h> #define TASK_NAME "object_detection_3d" diff --git a/mv_machine_learning/training/include/DataSetManager.h b/mv_machine_learning/training/include/DataSetManager.h index b526e7e8..4ee2ee2c 100644 --- a/mv_machine_learning/training/include/DataSetManager.h +++ b/mv_machine_learning/training/include/DataSetManager.h @@ -18,8 +18,8 @@ #define __DATA_SET_MANAGER_H__ #include <fstream> -#include <vector> #include <map> +#include <vector> #include "FeatureVectorManager.h" diff --git a/mv_machine_learning/training/include/FeatureVectorManager.h b/mv_machine_learning/training/include/FeatureVectorManager.h index 5dce36fb..2b4860c1 100644 --- a/mv_machine_learning/training/include/FeatureVectorManager.h +++ b/mv_machine_learning/training/include/FeatureVectorManager.h @@ -20,8 +20,8 @@ #include <string> #include <vector> -#include <opencv2/opencv.hpp> #include <opencv2/imgproc/imgproc.hpp> +#include <opencv2/opencv.hpp> #include "file_util.h" diff --git a/mv_machine_learning/training/include/LabelManager.h b/mv_machine_learning/training/include/LabelManager.h index 325c1ab8..e6f49327 100644 --- a/mv_machine_learning/training/include/LabelManager.h +++ b/mv_machine_learning/training/include/LabelManager.h @@ -17,13 +17,13 @@ #ifndef __LABEL_MANAGER_H__ #define __LABEL_MANAGER_H__ -#include <string.h> -#include <iostream> +#include <algorithm> #include <fstream> +#include <iostream> #include <istream> -#include <algorithm> -#include <vector> #include <map> +#include <string.h> +#include <vector> #include "file_util.h" diff --git a/mv_machine_learning/training/include/TrainingModel.h b/mv_machine_learning/training/include/TrainingModel.h index f153fc64..847bfacd 100644 --- a/mv_machine_learning/training/include/TrainingModel.h +++ b/mv_machine_learning/training/include/TrainingModel.h @@ -22,11 +22,11 @@ #include <mv_inference_type.h> -#include "training_engine_error.h" -#include "training_engine_common_impl.h" -#include "inference_engine_common_impl.h" #include "DataSetManager.h" #include "FeatureVectorManager.h" +#include "inference_engine_common_impl.h" +#include "training_engine_common_impl.h" +#include "training_engine_error.h" struct TrainingEngineBackendInfo { std::vector<std::string> input_layer_names; diff --git a/mv_machine_learning/training/src/FeatureVectorManager.cpp b/mv_machine_learning/training/src/FeatureVectorManager.cpp index eb243408..e0a3615d 100644 --- a/mv_machine_learning/training/src/FeatureVectorManager.cpp +++ b/mv_machine_learning/training/src/FeatureVectorManager.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#include <opencv2/opencv.hpp> #include <opencv2/imgproc/imgproc.hpp> +#include <opencv2/opencv.hpp> -#include "MvMlException.h" #include "FeatureVectorManager.h" +#include "MvMlException.h" using namespace std; using namespace mediavision::machine_learning::exception; diff --git a/mv_machine_learning/training/src/LabelManager.cpp b/mv_machine_learning/training/src/LabelManager.cpp index b0335416..a7d57af2 100644 --- a/mv_machine_learning/training/src/LabelManager.cpp +++ b/mv_machine_learning/training/src/LabelManager.cpp @@ -17,8 +17,8 @@ #include <dlog.h> #include <mv_private.h> -#include "MvMlException.h" #include "LabelManager.h" +#include "MvMlException.h" using namespace std; using namespace mediavision::machine_learning::exception; diff --git a/mv_machine_learning/training/src/TrainingModel.cpp b/mv_machine_learning/training/src/TrainingModel.cpp index e35adf76..4a981373 100644 --- a/mv_machine_learning/training/src/TrainingModel.cpp +++ b/mv_machine_learning/training/src/TrainingModel.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#include <string.h> +#include <algorithm> #include <fstream> #include <istream> -#include <tuple> #include <map> -#include <algorithm> +#include <string.h> +#include <tuple> #include <sys/stat.h> diff --git a/mv_roi_tracker/roi_tracker/src/ROITracker.cpp b/mv_roi_tracker/roi_tracker/src/ROITracker.cpp index 52e8aae9..c93760bd 100644 --- a/mv_roi_tracker/roi_tracker/src/ROITracker.cpp +++ b/mv_roi_tracker/roi_tracker/src/ROITracker.cpp @@ -14,18 +14,18 @@ * limitations under the License. */ -#include <string.h> +#include <algorithm> #include <fstream> #include <istream> -#include <tuple> #include <map> -#include <algorithm> +#include <string.h> +#include <tuple> #include <sys/stat.h> -#include <dlog.h> #include "mv_common.h" #include "mv_private.h" +#include <dlog.h> #include <opencv2/core/core.hpp> #include <opencv2/core/utility.hpp> diff --git a/mv_roi_tracker/roi_tracker/src/ROITrackerUtil.cpp b/mv_roi_tracker/roi_tracker/src/ROITrackerUtil.cpp index 6e41c3f4..5e963292 100644 --- a/mv_roi_tracker/roi_tracker/src/ROITrackerUtil.cpp +++ b/mv_roi_tracker/roi_tracker/src/ROITrackerUtil.cpp @@ -16,9 +16,9 @@ #include "ROITrackerUtil.h" +#include <iostream> #include <opencv2/tracking.hpp> #include <opencv2/tracking/tracking_legacy.hpp> -#include <iostream> namespace MediaVision { diff --git a/mv_roi_tracker/roi_tracker/src/mv_roi_tracker.c b/mv_roi_tracker/roi_tracker/src/mv_roi_tracker.c index 4e53cf85..e27064b1 100644 --- a/mv_roi_tracker/roi_tracker/src/mv_roi_tracker.c +++ b/mv_roi_tracker/roi_tracker/src/mv_roi_tracker.c @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "mv_private.h" -#include "mv_feature_key.h" #include "mv_roi_tracker.h" +#include "mv_feature_key.h" +#include "mv_private.h" #include "mv_roi_tracker_open.h" static const char *feature_keys[] = { "http://tizen.org/feature/vision.roi_tracking" }; diff --git a/mv_surveillance/surveillance/include/EventDefs.h b/mv_surveillance/surveillance/include/EventDefs.h index 0fd812e9..2f5cd9bc 100644 --- a/mv_surveillance/surveillance/include/EventDefs.h +++ b/mv_surveillance/surveillance/include/EventDefs.h @@ -24,10 +24,10 @@ #include <mv_common.h> -#include <string> -#include <vector> #include <list> #include <map> +#include <string> +#include <vector> #include <opencv2/opencv.hpp> diff --git a/mv_surveillance/surveillance/include/EventManager.h b/mv_surveillance/surveillance/include/EventManager.h index 77e8b494..3947e3fe 100644 --- a/mv_surveillance/surveillance/include/EventManager.h +++ b/mv_surveillance/surveillance/include/EventManager.h @@ -22,8 +22,8 @@ * @brief This file contains functionality for event manager. */ -#include "EventTrigger.h" #include "EventDefs.h" +#include "EventTrigger.h" namespace mediavision { diff --git a/mv_surveillance/surveillance/include/EventTrigger.h b/mv_surveillance/surveillance/include/EventTrigger.h index 3cc6805b..1da38b5c 100644 --- a/mv_surveillance/surveillance/include/EventTrigger.h +++ b/mv_surveillance/surveillance/include/EventTrigger.h @@ -27,9 +27,9 @@ #include <mv_surveillance.h> #include <mv_surveillance_private.h> -#include <string> -#include <map> #include <list> +#include <map> +#include <string> namespace mediavision { diff --git a/mv_surveillance/surveillance/include/EventTriggerMovementDetection.h b/mv_surveillance/surveillance/include/EventTriggerMovementDetection.h index db2b473d..055c25f6 100644 --- a/mv_surveillance/surveillance/include/EventTriggerMovementDetection.h +++ b/mv_surveillance/surveillance/include/EventTriggerMovementDetection.h @@ -24,8 +24,8 @@ #include "EventTrigger.h" -#include "EventResult.h" #include "EventDefs.h" +#include "EventResult.h" namespace mediavision { diff --git a/mv_surveillance/surveillance/include/EventTriggerPersonAppearance.h b/mv_surveillance/surveillance/include/EventTriggerPersonAppearance.h index a9236d68..c05d4612 100644 --- a/mv_surveillance/surveillance/include/EventTriggerPersonAppearance.h +++ b/mv_surveillance/surveillance/include/EventTriggerPersonAppearance.h @@ -25,11 +25,11 @@ #include "EventTrigger.h" #include "MFTracker.h" -#include "EventResult.h" #include "EventDefs.h" +#include "EventResult.h" -#include <opencv2/opencv.hpp> #include <opencv2/objdetect.hpp> +#include <opencv2/opencv.hpp> #include <sys/time.h> diff --git a/mv_surveillance/surveillance/include/EventTriggerPersonRecognition.h b/mv_surveillance/surveillance/include/EventTriggerPersonRecognition.h index bbfcd1ae..17bec3b4 100644 --- a/mv_surveillance/surveillance/include/EventTriggerPersonRecognition.h +++ b/mv_surveillance/surveillance/include/EventTriggerPersonRecognition.h @@ -26,8 +26,8 @@ #include "EventTrigger.h" -#include "EventResult.h" #include "EventDefs.h" +#include "EventResult.h" #include "EventTriggerPersonAppearance.h" diff --git a/mv_surveillance/surveillance/src/EventManager.cpp b/mv_surveillance/surveillance/src/EventManager.cpp index 5c9165dc..7d84e57e 100644 --- a/mv_surveillance/surveillance/src/EventManager.cpp +++ b/mv_surveillance/surveillance/src/EventManager.cpp @@ -18,9 +18,9 @@ #include "SurveillanceHelper.h" +#include "EventTriggerMovementDetection.h" #include "EventTriggerPersonAppearance.h" #include "EventTriggerPersonRecognition.h" -#include "EventTriggerMovementDetection.h" #include "mv_private.h" #include <CommonUtils.h> diff --git a/mv_surveillance/surveillance/src/EventTrigger.cpp b/mv_surveillance/surveillance/src/EventTrigger.cpp index 7581765b..4f61a416 100644 --- a/mv_surveillance/surveillance/src/EventTrigger.cpp +++ b/mv_surveillance/surveillance/src/EventTrigger.cpp @@ -16,9 +16,9 @@ #include "EventTrigger.h" -#include <mv_private.h> -#include <mv_mask_buffer.h> #include <mv_apply_mask.h> +#include <mv_mask_buffer.h> +#include <mv_private.h> namespace mediavision { diff --git a/mv_surveillance/surveillance/src/EventTriggerMovementDetection.cpp b/mv_surveillance/surveillance/src/EventTriggerMovementDetection.cpp index d880e8c2..4d434f79 100644 --- a/mv_surveillance/surveillance/src/EventTriggerMovementDetection.cpp +++ b/mv_surveillance/surveillance/src/EventTriggerMovementDetection.cpp @@ -17,8 +17,8 @@ #include "EventTriggerMovementDetection.h" #include "EventDefs.h" -#include "mv_absdiff.h" #include "SurveillanceHelper.h" +#include "mv_absdiff.h" #include <mv_private.h> diff --git a/mv_surveillance/surveillance/src/EventTriggerPersonAppearance.cpp b/mv_surveillance/surveillance/src/EventTriggerPersonAppearance.cpp index 51b997b2..5b3b7a98 100644 --- a/mv_surveillance/surveillance/src/EventTriggerPersonAppearance.cpp +++ b/mv_surveillance/surveillance/src/EventTriggerPersonAppearance.cpp @@ -17,8 +17,8 @@ #include "EventTriggerPersonAppearance.h" #include "EventManager.h" -#include "SurveillanceHelper.h" #include "EventTriggerMovementDetection.h" +#include "SurveillanceHelper.h" #include "opencv2/highgui.hpp" diff --git a/mv_surveillance/surveillance/src/EventTriggerPersonRecognition.cpp b/mv_surveillance/surveillance/src/EventTriggerPersonRecognition.cpp index 5a3243f3..d0f8870d 100644 --- a/mv_surveillance/surveillance/src/EventTriggerPersonRecognition.cpp +++ b/mv_surveillance/surveillance/src/EventTriggerPersonRecognition.cpp @@ -17,8 +17,8 @@ #include "EventTriggerPersonRecognition.h" #include "EventManager.h" -#include <mv_private.h> #include <mv_face.h> +#include <mv_private.h> #include <mv_surveillance.h> #include <sstream> diff --git a/mv_surveillance/surveillance/src/MFTracker.cpp b/mv_surveillance/surveillance/src/MFTracker.cpp index c7d19a8b..e2ff616a 100644 --- a/mv_surveillance/surveillance/src/MFTracker.cpp +++ b/mv_surveillance/surveillance/src/MFTracker.cpp @@ -16,8 +16,8 @@ #include "MFTracker.h" -#include "opencv2/video/tracking.hpp" #include "opencv2/imgproc.hpp" +#include "opencv2/video/tracking.hpp" namespace mediavision { diff --git a/mv_surveillance/surveillance/src/SurveillanceHelper.cpp b/mv_surveillance/surveillance/src/SurveillanceHelper.cpp index ce2c21cd..d45c4d2d 100644 --- a/mv_surveillance/surveillance/src/SurveillanceHelper.cpp +++ b/mv_surveillance/surveillance/src/SurveillanceHelper.cpp @@ -18,8 +18,8 @@ #include "mv_private.h" -#include "opencv2/imgproc.hpp" #include "opencv2/highgui.hpp" +#include "opencv2/imgproc.hpp" #include "opencv2/imgproc/imgproc_c.h" namespace mediavision diff --git a/mv_surveillance/surveillance/src/mv_surveillance.c b/mv_surveillance/surveillance/src/mv_surveillance.c index edb7f9dd..0f539627 100644 --- a/mv_surveillance/surveillance/src/mv_surveillance.c +++ b/mv_surveillance/surveillance/src/mv_surveillance.c @@ -14,13 +14,13 @@ * limitations under the License. */ -#include <stdlib.h> #include "mv_surveillance.h" +#include <stdlib.h> -#include "mv_surveillance_private.h" -#include "mv_private.h" #include "mv_feature_key.h" +#include "mv_private.h" #include "mv_surveillance_open.h" +#include "mv_surveillance_private.h" /** * @file mv_surveillance.c diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec index f2e43c05..f86568bc 100644 --- a/packaging/capi-media-vision.spec +++ b/packaging/capi-media-vision.spec @@ -1,6 +1,6 @@ Name: capi-media-vision Summary: Media Vision library for Tizen Native API -Version: 0.34.0 +Version: 0.35.0 Release: 0 Group: Multimedia/Framework License: Apache-2.0 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 23cd09ad..a4f94ade 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -14,9 +14,6 @@ if(MV_3D_POINTCLOUD_IS_AVAILABLE) endif() set(SRC_FILES - testsuites/common/test_pkt.cpp - testsuites/barcode/test_barcode.cpp - testsuites/barcode/test_designqr.cpp testsuites/machine_learning/inference/test_inference_helper.cpp testsuites/machine_learning/inference/test_image_classification.cpp testsuites/machine_learning/inference/test_object_detection.cpp @@ -24,6 +21,13 @@ set(SRC_FILES testsuites/machine_learning/inference/test_face_landmark_detection.cpp testsuites/machine_learning/inference/test_pose_landmark_detection.cpp) +if(${IS_TIZEN}) + set(SRC_FILES ${SRC_FILES} + testsuites/common/test_pkt.cpp + testsuites/barcode/test_barcode.cpp + testsuites/barcode/test_designqr.cpp) +endif() + if (${ENABLE_ML_FACE_RECOGNITION}) include(testsuites/machine_learning/face_recognition/CMakeLists.txt) endif() @@ -49,7 +53,7 @@ if (${ENABLE_ML_IMAGE_SEGMENTATION}) endif() if (${BUILD_DEPTH_STREAM_TESTSUITE}) -set(SRC_FILES ${SRC_FILES} testsuites/mv3d/test_3d.cpp) + set(SRC_FILES ${SRC_FILES} testsuites/mv3d/test_3d.cpp) endif() if (${BUILD_CAMERA_PACKET}) @@ -61,9 +65,11 @@ add_executable(${PROJECT_NAME} ${SRC_FILES}) target_compile_definitions(${PROJECT_NAME} PRIVATE -DTEST_RES_PATH="${TEST_RES_PATH}") target_link_libraries(${PROJECT_NAME} gtest gtest_main mv_inference mv_image_helper - mv_barcode_detector mv_barcode_generator pthread mv_ml_common) +if(${IS_TIZEN}) +target_link_libraries(${PROJECT_NAME} ${MV_BARCODE_DETECTOR_LIB_NAME} ${MV_BARCODE_GENERATOR_LIB_NAME}) +endif() if (${ENABLE_ML_FACE_RECOGNITION}) target_link_libraries(${PROJECT_NAME} ${MV_FACE_RECOG_LIB_NAME}) diff --git a/test/assessment/barcode/assessment_barcode.cpp b/test/assessment/barcode/assessment_barcode.cpp index 4548a214..09cce6d0 100644 --- a/test/assessment/barcode/assessment_barcode.cpp +++ b/test/assessment/barcode/assessment_barcode.cpp @@ -19,14 +19,14 @@ #include <opencv2/core.hpp> #include <opencv2/highgui.hpp> +#include <opencv2/imgcodecs/legacy/constants_c.h> #include <opencv2/imgproc.hpp> #include <opencv2/imgproc/imgproc_c.h> -#include <opencv2/imgcodecs/legacy/constants_c.h> -#include <error.h> #include <argp.h> -#include <iostream> #include <chrono> +#include <error.h> +#include <iostream> #define MAX_ARGS 2 diff --git a/test/assessment/face/assessment_face.cpp b/test/assessment/face/assessment_face.cpp index 3d210dd9..c8d72941 100644 --- a/test/assessment/face/assessment_face.cpp +++ b/test/assessment/face/assessment_face.cpp @@ -14,20 +14,20 @@ * limitations under the License. */ -#include <mv_face.h> #include <mv_common.h> +#include <mv_face.h> #include <mv_private.h> #include <opencv2/core.hpp> #include <opencv2/highgui.hpp> +#include <opencv2/imgcodecs/legacy/constants_c.h> #include <opencv2/imgproc.hpp> #include <opencv2/imgproc/imgproc_c.h> -#include <opencv2/imgcodecs/legacy/constants_c.h> -#include <error.h> #include <argp.h> -#include <iostream> #include <chrono> +#include <error.h> +#include <iostream> #define MAX_ARGS 3 diff --git a/test/assessment/surveillance/assessment_surveillance.cpp b/test/assessment/surveillance/assessment_surveillance.cpp index 071ea13f..7f53e699 100644 --- a/test/assessment/surveillance/assessment_surveillance.cpp +++ b/test/assessment/surveillance/assessment_surveillance.cpp @@ -14,20 +14,20 @@ * limitations under the License. */ -#include <mv_surveillance.h> #include <mv_common.h> #include <mv_private.h> +#include <mv_surveillance.h> #include <opencv2/core.hpp> -#include <opencv2/video.hpp> +#include <opencv2/highgui.hpp> #include <opencv2/imgproc.hpp> +#include <opencv2/video.hpp> #include <opencv2/videoio.hpp> -#include <opencv2/highgui.hpp> -#include <error.h> #include <argp.h> -#include <iostream> #include <chrono> +#include <error.h> +#include <iostream> #define MAX_ARGS 3 diff --git a/test/testsuites/barcode/barcode_test_suite.c b/test/testsuites/barcode/barcode_test_suite.c index e6c9fac5..68d8b776 100644 --- a/test/testsuites/barcode/barcode_test_suite.c +++ b/test/testsuites/barcode/barcode_test_suite.c @@ -20,18 +20,18 @@ #include <mv_private.h> #include <ctype.h> -#include <stdlib.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <unistd.h> -#include <libswscale/swscale.h> #include <libavcodec/avcodec.h> #include <libavutil/pixfmt.h> +#include <libswscale/swscale.h> +#include <argp.h> #include <curses.h> #include <error.h> -#include <argp.h> #define MINX 0 #define MINY 0 diff --git a/test/testsuites/barcode/test_barcode.cpp b/test/testsuites/barcode/test_barcode.cpp index bc0be098..a2878ea0 100644 --- a/test/testsuites/barcode/test_barcode.cpp +++ b/test/testsuites/barcode/test_barcode.cpp @@ -1,10 +1,10 @@ +#include <ImageHelper.h> #include <gtest/gtest.h> #include <json-glib/json-glib.h> #include <mv_barcode.h> #include <string> #include <tuple> #include <vector> -#include <ImageHelper.h> using namespace std; using TestParams = tuple<string, string>; @@ -98,7 +98,7 @@ TEST_P(TestBarcode, Detection) MEDIA_VISION_ERROR_NONE); } -INSTANTIATE_TEST_CASE_P(GeneralAndSpecial, TestBarcode, testing::ValuesIn(ReadDetPositive1())); +INSTANTIATE_TEST_SUITE_P(GeneralAndSpecial, TestBarcode, testing::ValuesIn(ReadDetPositive1())); class TestBarcodeGen : public ::testing::Test { diff --git a/test/testsuites/barcode/test_designqr.cpp b/test/testsuites/barcode/test_designqr.cpp index 8d08da9d..f08463ce 100644 --- a/test/testsuites/barcode/test_designqr.cpp +++ b/test/testsuites/barcode/test_designqr.cpp @@ -1,5 +1,5 @@ -#include <gtest/gtest.h> #include <algorithm> +#include <gtest/gtest.h> #include <mv_barcode_generate.h> #define IMAGE1_PATH TEST_RES_PATH "/res/inference/images/banana.jpg" @@ -63,7 +63,7 @@ TEST_P(CombinationsTest, DesignQR) qr_version, test_file.c_str(), image_format), MEDIA_VISION_ERROR_NONE); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Combinations, CombinationsTest, testing::Combine(testing::ValuesIn(vector<string> { "smalletextHttps://", diff --git a/test/testsuites/common/image_helper/src/ImageHelper.cpp b/test/testsuites/common/image_helper/src/ImageHelper.cpp index 2cc58887..80c8f7f9 100644 --- a/test/testsuites/common/image_helper/src/ImageHelper.cpp +++ b/test/testsuites/common/image_helper/src/ImageHelper.cpp @@ -22,12 +22,12 @@ #include <setjmp.h> +#include <MediaSource.h> #include <opencv2/core.hpp> #include <opencv2/highgui.hpp> +#include <opencv2/imgcodecs/legacy/constants_c.h> #include <opencv2/imgproc.hpp> #include <opencv2/imgproc/imgproc_c.h> -#include <opencv2/imgcodecs/legacy/constants_c.h> -#include <MediaSource.h> /** * @file ImageHelper.cpp diff --git a/test/testsuites/common/image_helper/src/image_helper.cpp b/test/testsuites/common/image_helper/src/image_helper.cpp index 0b4db2a0..50c854d4 100644 --- a/test/testsuites/common/image_helper/src/image_helper.cpp +++ b/test/testsuites/common/image_helper/src/image_helper.cpp @@ -16,8 +16,8 @@ #include "image_helper.h" -#include "mv_private.h" #include "ImageHelper.h" +#include "mv_private.h" #include <opencv2/core.hpp> diff --git a/test/testsuites/common/test_camera_pkt.cpp b/test/testsuites/common/test_camera_pkt.cpp index 645108e3..19709acf 100644 --- a/test/testsuites/common/test_camera_pkt.cpp +++ b/test/testsuites/common/test_camera_pkt.cpp @@ -1,5 +1,5 @@ -#include <gtest/gtest.h> #include <camera.h> +#include <gtest/gtest.h> #include <mv_common.h> /* This test needs camera privilege and to be owner user*/ diff --git a/test/testsuites/common/testsuite_common/mv_testsuite_common.c b/test/testsuites/common/testsuite_common/mv_testsuite_common.c index 677f13be..02604d3b 100644 --- a/test/testsuites/common/testsuite_common/mv_testsuite_common.c +++ b/test/testsuites/common/testsuite_common/mv_testsuite_common.c @@ -19,9 +19,9 @@ #include "image_helper.h" #include "mv_log_cfg.h" -#include <string.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> void print_fail_result(const char *action_name, int action_return_value) { diff --git a/test/testsuites/common/video_helper/mv_video_helper.c b/test/testsuites/common/video_helper/mv_video_helper.c index a7037867..8ac94fc1 100644 --- a/test/testsuites/common/video_helper/mv_video_helper.c +++ b/test/testsuites/common/video_helper/mv_video_helper.c @@ -14,17 +14,17 @@ * limitations under the License. */ -#include "mv_common.h" #include "mv_video_helper.h" +#include "mv_common.h" #include "mv_log_cfg.h" -#include <string.h> #include <stdio.h> +#include <string.h> -#include <gst/gst.h> #include <gst/app/gstappsink.h> #include <gst/app/gstappsrc.h> +#include <gst/gst.h> #include <gst/video/video.h> #include <pthread.h> diff --git a/test/testsuites/common/video_helper/mv_video_helper.h b/test/testsuites/common/video_helper/mv_video_helper.h index d54aa09f..f694d9f6 100644 --- a/test/testsuites/common/video_helper/mv_video_helper.h +++ b/test/testsuites/common/video_helper/mv_video_helper.h @@ -17,8 +17,8 @@ #ifndef __MEDIA_VISION_MV_VIDEO_HELPER_H__ #define __MEDIA_VISION_MV_VIDEO_HELPER_H__ -#include "mv_common.h" #include "image_helper.h" +#include "mv_common.h" /** * @brief The handle to the video reader. diff --git a/test/testsuites/common/visualizer/include/mv_util_shader.h b/test/testsuites/common/visualizer/include/mv_util_shader.h index 9a1d619d..a1945ec5 100644 --- a/test/testsuites/common/visualizer/include/mv_util_shader.h +++ b/test/testsuites/common/visualizer/include/mv_util_shader.h @@ -21,11 +21,11 @@ extern "C" { #endif /* __cplusplus */ -#include <cstdlib> #include <EGL/egl.h> #include <EGL/eglext.h> #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> +#include <cstdlib> typedef struct shader_obj_t { GLuint program; diff --git a/test/testsuites/common/visualizer/include/mv_util_visualizer_3d.h b/test/testsuites/common/visualizer/include/mv_util_visualizer_3d.h index 7d47e1f7..8e3ca2b8 100644 --- a/test/testsuites/common/visualizer/include/mv_util_visualizer_3d.h +++ b/test/testsuites/common/visualizer/include/mv_util_visualizer_3d.h @@ -27,11 +27,11 @@ extern "C" { #include "mv_util_render_3d.h" #ifdef __cplusplus -#include <cstdlib> #include <cmath> +#include <cstdlib> #else -#include <stdlib.h> #include <math.h> +#include <stdlib.h> #endif int mv_util_visualizer_3d(mv_source_h source, float *depth, int xpos, int ypos); diff --git a/test/testsuites/common/visualizer/src/mv_util_matrix.cpp b/test/testsuites/common/visualizer/src/mv_util_matrix.cpp index ba01fa5b..63dda46d 100644 --- a/test/testsuites/common/visualizer/src/mv_util_matrix.cpp +++ b/test/testsuites/common/visualizer/src/mv_util_matrix.cpp @@ -15,10 +15,10 @@ */ #define _USE_MATH_DEFINES +#include "mv_util_matrix.h" #include <math.h> #include <mv_common.h> #include <mv_private.h> -#include "mv_util_matrix.h" static float vec3_length(float *v) { diff --git a/test/testsuites/common/visualizer/src/mv_util_render_3d.cpp b/test/testsuites/common/visualizer/src/mv_util_render_3d.cpp index ae5f2359..2319b61b 100644 --- a/test/testsuites/common/visualizer/src/mv_util_render_3d.cpp +++ b/test/testsuites/common/visualizer/src/mv_util_render_3d.cpp @@ -14,14 +14,14 @@ * limitations under the License. */ -#include <stdio.h> -#include <math.h> #include <EGL/egl.h> #include <EGL/eglext.h> #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> +#include <math.h> #include <mv_common.h> #include <mv_private.h> +#include <stdio.h> #include "mv_util_matrix.h" #include "mv_util_render_2d.h" diff --git a/test/testsuites/common/visualizer/src/mv_util_shader.cpp b/test/testsuites/common/visualizer/src/mv_util_shader.cpp index 42bca00c..b69faf55 100644 --- a/test/testsuites/common/visualizer/src/mv_util_shader.cpp +++ b/test/testsuites/common/visualizer/src/mv_util_shader.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include <mv_private.h> #include "mv_util_shader.h" +#include <mv_private.h> GLuint compile_shader_text(GLenum shaderType, const char *text) { diff --git a/test/testsuites/common/visualizer/src/mv_util_visualizer_2d.cpp b/test/testsuites/common/visualizer/src/mv_util_visualizer_2d.cpp index b4617361..e1150b8e 100644 --- a/test/testsuites/common/visualizer/src/mv_util_visualizer_2d.cpp +++ b/test/testsuites/common/visualizer/src/mv_util_visualizer_2d.cpp @@ -14,16 +14,16 @@ * limitations under the License. */ -#include <mv_private.h> #include <grpcpp/grpcpp.h> +#include <mv_private.h> #include <opencv2/core.hpp> #include <opencv2/imgcodecs.hpp> #include <opencv2/imgproc/imgproc.hpp> #include <opencv2/opencv.hpp> -#include "mv_util_visualizer_rd.grpc.pb.h" #include "mv_util_visualizer_2d.h" +#include "mv_util_visualizer_rd.grpc.pb.h" static int win_w = 1920; static int win_h = 1080; diff --git a/test/testsuites/common/visualizer/src/mv_util_visualizer_3d.cpp b/test/testsuites/common/visualizer/src/mv_util_visualizer_3d.cpp index 59d79a67..8a7a58c1 100644 --- a/test/testsuites/common/visualizer/src/mv_util_visualizer_3d.cpp +++ b/test/testsuites/common/visualizer/src/mv_util_visualizer_3d.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include <mv_private.h> -#include "mv_util_matrix.h" #include "mv_util_visualizer_3d.h" +#include "mv_util_matrix.h" +#include <mv_private.h> #define MAX_DEPTH_WIDTH 640 #define MAX_DEPTH_HEIGHT 480 diff --git a/test/testsuites/common/visualizer/src/mv_util_winsys.cpp b/test/testsuites/common/visualizer/src/mv_util_winsys.cpp index f243621a..2246c20a 100644 --- a/test/testsuites/common/visualizer/src/mv_util_winsys.cpp +++ b/test/testsuites/common/visualizer/src/mv_util_winsys.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ -#include <string.h> -#include <sys/mman.h> -#include <signal.h> -#include <mv_private.h> +#include "mv_util_winsys.h" #include "wayland-client.h" #include "wayland-egl.h" -#include "mv_util_winsys.h" +#include <mv_private.h> +#include <signal.h> +#include <string.h> +#include <sys/mman.h> #define UNUSED(x) (void) (x) diff --git a/test/testsuites/face/face_test_suite.c b/test/testsuites/face/face_test_suite.c index a85e2585..79f87f0d 100644 --- a/test/testsuites/face/face_test_suite.c +++ b/test/testsuites/face/face_test_suite.c @@ -27,11 +27,11 @@ #include "pthread.h" #include <ctype.h> -#include <stdlib.h> -#include <stdio.h> #include <dirent.h> -#include <string.h> #include <limits.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #define MIN_ALLOWED_LABEL 0 #define MAX_ALLOWED_LABEL 100 diff --git a/test/testsuites/image/image_test_suite.c b/test/testsuites/image/image_test_suite.c index fc2adc75..4657cbd0 100644 --- a/test/testsuites/image/image_test_suite.c +++ b/test/testsuites/image/image_test_suite.c @@ -18,11 +18,11 @@ #include "mv_private.h" #include "image_helper.h" -#include "mv_video_helper.h" #include "mv_testsuite_common.h" +#include "mv_video_helper.h" -#include <stdlib.h> #include <glib-2.0/glib.h> +#include <stdlib.h> #include <string.h> #include <pthread.h> diff --git a/test/testsuites/machine_learning/face_recognition/face_recognition_test_util.cpp b/test/testsuites/machine_learning/face_recognition/face_recognition_test_util.cpp index 75be896b..2e114dd3 100644 --- a/test/testsuites/machine_learning/face_recognition/face_recognition_test_util.cpp +++ b/test/testsuites/machine_learning/face_recognition/face_recognition_test_util.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ +#include <app_common.h> #include <stdio.h> #include <string> -#include <vector> -#include <app_common.h> #include <unistd.h> +#include <vector> using namespace std; diff --git a/test/testsuites/machine_learning/face_recognition/measure_face_recognition.cpp b/test/testsuites/machine_learning/face_recognition/measure_face_recognition.cpp index fcdcf6a2..1bc62e13 100644 --- a/test/testsuites/machine_learning/face_recognition/measure_face_recognition.cpp +++ b/test/testsuites/machine_learning/face_recognition/measure_face_recognition.cpp @@ -14,18 +14,18 @@ * limitations under the License. */ +#include <algorithm> +#include <fstream> #include <iostream> -#include <string.h> #include <map> -#include <fstream> +#include <string.h> #include <vector> -#include <algorithm> #include "gtest/gtest.h" #include "ImageHelper.h" -#include "mv_face_recognition.h" #include "face_recognition_test_util.h" +#include "mv_face_recognition.h" #define TRAIN_LIST_FILE TEST_RES_PATH "/res/face_recognition/res/measurement/train_list.txt" #define TEST_LIST_FILE TEST_RES_PATH "/res/face_recognition/res/measurement/test_list.txt" diff --git a/test/testsuites/machine_learning/face_recognition/test_face_recognition.cpp b/test/testsuites/machine_learning/face_recognition/test_face_recognition.cpp index 49d0560b..92d90950 100644 --- a/test/testsuites/machine_learning/face_recognition/test_face_recognition.cpp +++ b/test/testsuites/machine_learning/face_recognition/test_face_recognition.cpp @@ -15,16 +15,16 @@ */ #include <iostream> -#include <string.h> #include <map> +#include <string.h> #include <thread> #include "gtest/gtest.h" #include "ImageHelper.h" +#include "face_recognition_test_util.h" #include "mv_face_recognition.h" #include "mv_face_recognition_internal.h" -#include "face_recognition_test_util.h" #define TRAINING_IMAGE_PATH TEST_RES_PATH "/res/face_recognition/res/test/training/" #define TEST_IMAGE_PATH TEST_RES_PATH "/res/face_recognition/res/test/test/" diff --git a/test/testsuites/machine_learning/image_classification/test_image_classification.cpp b/test/testsuites/machine_learning/image_classification/test_image_classification.cpp index aa14b2b8..ba3037bc 100644 --- a/test/testsuites/machine_learning/image_classification/test_image_classification.cpp +++ b/test/testsuites/machine_learning/image_classification/test_image_classification.cpp @@ -15,9 +15,9 @@ */ #include <iostream> +#include <map> #include <string.h> #include <vector> -#include <map> #include "gtest/gtest.h" diff --git a/test/testsuites/machine_learning/image_classification/test_image_classification_async.cpp b/test/testsuites/machine_learning/image_classification/test_image_classification_async.cpp index 32330d1d..e292a53f 100644 --- a/test/testsuites/machine_learning/image_classification/test_image_classification_async.cpp +++ b/test/testsuites/machine_learning/image_classification/test_image_classification_async.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include <iostream> #include <algorithm> +#include <iostream> #include <string.h> #include <thread> diff --git a/test/testsuites/machine_learning/image_segmentation/test_selfie_segmentation.cpp b/test/testsuites/machine_learning/image_segmentation/test_selfie_segmentation.cpp index 57864ee2..543735b2 100644 --- a/test/testsuites/machine_learning/image_segmentation/test_selfie_segmentation.cpp +++ b/test/testsuites/machine_learning/image_segmentation/test_selfie_segmentation.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ +#include <algorithm> #include <fstream> #include <iostream> -#include <algorithm> -#include <string.h> #include <opencv2/core.hpp> #include <opencv2/imgcodecs.hpp> #include <opencv2/imgproc.hpp> +#include <string.h> #include "gtest/gtest.h" diff --git a/test/testsuites/machine_learning/inference/inference_test_suite.c b/test/testsuites/machine_learning/inference/inference_test_suite.c index 39702120..a0f23cfc 100644 --- a/test/testsuites/machine_learning/inference/inference_test_suite.c +++ b/test/testsuites/machine_learning/inference/inference_test_suite.c @@ -17,18 +17,18 @@ #include <mv_common.h> #include <mv_inference.h> -#include <mv_testsuite_common.h> #include <image_helper.h> +#include <mv_testsuite_common.h> #include <mv_video_helper.h> #include <mv_log_cfg.h> #include <ctype.h> -#include <stdlib.h> -#include <stdio.h> #include <dirent.h> -#include <string.h> #include <limits.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <time.h> #define ARRAY_SIZE(x) (sizeof((x)) / sizeof((x)[0])) diff --git a/test/testsuites/machine_learning/inference/test_face_detection.cpp b/test/testsuites/machine_learning/inference/test_face_detection.cpp index db2f0342..e2aff2c8 100644 --- a/test/testsuites/machine_learning/inference/test_face_detection.cpp +++ b/test/testsuites/machine_learning/inference/test_face_detection.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ +#include "test_inference_helper.hpp" +#include <ImageHelper.h> #include <gtest/gtest.h> #include <string> -#include <ImageHelper.h> -#include "test_inference_helper.hpp" #define FD_TFLITE_WEIGHT_MOBILENET_V1_SSD_300_PATH \ TEST_RES_PATH \ @@ -79,6 +79,6 @@ TEST_P(TestFaceDetectionTflite, MobilenetV1_SSD) inferenceFace(); } -INSTANTIATE_TEST_CASE_P(Prefix, TestFaceDetectionTflite, - ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU), - ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU)));
\ No newline at end of file +INSTANTIATE_TEST_SUITE_P(Prefix, TestFaceDetectionTflite, + ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU), + ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU)));
\ No newline at end of file diff --git a/test/testsuites/machine_learning/inference/test_face_landmark_detection.cpp b/test/testsuites/machine_learning/inference/test_face_landmark_detection.cpp index 88262d6f..5b3e2db5 100644 --- a/test/testsuites/machine_learning/inference/test_face_landmark_detection.cpp +++ b/test/testsuites/machine_learning/inference/test_face_landmark_detection.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include <gtest/gtest.h> -#include <ImageHelper.h> #include "test_inference_helper.hpp" +#include <ImageHelper.h> +#include <gtest/gtest.h> #define FLD_OPENCV_WEIGHT_CAFFE_PATH \ TEST_RES_PATH \ @@ -91,9 +91,9 @@ TEST_P(TestFaceLandmarkDetectionOpenCV, CAFFE_CNNCASCADE) inferenceFaceLandmark(); } -INSTANTIATE_TEST_CASE_P(Prefix, TestFaceLandmarkDetectionOpenCV, - ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU), - ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU))); +INSTANTIATE_TEST_SUITE_P(Prefix, TestFaceLandmarkDetectionOpenCV, + ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU), + ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU))); class TestFaceLandmarkDetectionTflite : public TestInference { @@ -118,5 +118,5 @@ TEST_P(TestFaceLandmarkDetectionTflite, TweakCNN) } } -INSTANTIATE_TEST_CASE_P(Prefix, TestFaceLandmarkDetectionTflite, - ::testing::Values(ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU)));
\ No newline at end of file +INSTANTIATE_TEST_SUITE_P(Prefix, TestFaceLandmarkDetectionTflite, + ::testing::Values(ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU)));
\ No newline at end of file diff --git a/test/testsuites/machine_learning/inference/test_image_classification.cpp b/test/testsuites/machine_learning/inference/test_image_classification.cpp index 13f26682..8ed892a6 100644 --- a/test/testsuites/machine_learning/inference/test_image_classification.cpp +++ b/test/testsuites/machine_learning/inference/test_image_classification.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ +#include "test_inference_helper.hpp" +#include <ImageHelper.h> #include <gtest/gtest.h> #include <string> -#include <ImageHelper.h> -#include "test_inference_helper.hpp" #define IC_LABEL_MOBILENET_V1_224_PATH \ TEST_RES_PATH \ @@ -363,14 +363,14 @@ TEST_P(TestImageClassificationSnpe, DISABLED_InceptionV3_Quantized) inferenceBanana(); } -INSTANTIATE_TEST_CASE_P(Prefix, TestImageClassificationTflite, - ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU), - ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU))); - -INSTANTIATE_TEST_CASE_P(Prefix, TestImageClassificationSnpe, - ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU), - ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_GPU), - ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CUSTOM), - ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU), - ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_GPU), - ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CUSTOM)));
\ No newline at end of file +INSTANTIATE_TEST_SUITE_P(Prefix, TestImageClassificationTflite, + ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU), + ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU))); + +INSTANTIATE_TEST_SUITE_P(Prefix, TestImageClassificationSnpe, + ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU), + ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_GPU), + ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CUSTOM), + ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU), + ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_GPU), + ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CUSTOM)));
\ No newline at end of file diff --git a/test/testsuites/machine_learning/inference/test_inference_helper.cpp b/test/testsuites/machine_learning/inference/test_inference_helper.cpp index e449d17b..1a57dea6 100644 --- a/test/testsuites/machine_learning/inference/test_inference_helper.cpp +++ b/test/testsuites/machine_learning/inference/test_inference_helper.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ +#include "test_inference_helper.hpp" #include <gtest/gtest.h> #include <image_helper.h> -#include "test_inference_helper.hpp" TestInference::TestInference() : _use_json_parser(false), _target_device_type(MV_INFERENCE_TARGET_DEVICE_NONE) { diff --git a/test/testsuites/machine_learning/inference/test_inference_helper.hpp b/test/testsuites/machine_learning/inference/test_inference_helper.hpp index 82af2f99..a29f0733 100644 --- a/test/testsuites/machine_learning/inference/test_inference_helper.hpp +++ b/test/testsuites/machine_learning/inference/test_inference_helper.hpp @@ -19,6 +19,10 @@ #include <mv_inference.h> +#include <gtest/gtest.h> + +#include <tuple> + typedef std::tuple<bool, mv_inference_target_device_e> ParamTypes; class TestInference : public ::testing::TestWithParam<ParamTypes> diff --git a/test/testsuites/machine_learning/inference/test_object_detection.cpp b/test/testsuites/machine_learning/inference/test_object_detection.cpp index 791e30fe..be596442 100644 --- a/test/testsuites/machine_learning/inference/test_object_detection.cpp +++ b/test/testsuites/machine_learning/inference/test_object_detection.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ +#include "test_inference_helper.hpp" +#include <ImageHelper.h> #include <gtest/gtest.h> #include <string> -#include <ImageHelper.h> -#include "test_inference_helper.hpp" #define OD_LABEL_MOBILENET_V1_SSD_300_PATH \ TEST_RES_PATH \ @@ -118,9 +118,9 @@ TEST_P(TestObjectDetectionTflite, MobilenetV2_SSD) } } -INSTANTIATE_TEST_CASE_P(Prefix, TestObjectDetectionTflite, - ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU), - ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU))); +INSTANTIATE_TEST_SUITE_P(Prefix, TestObjectDetectionTflite, + ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU), + ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU))); class TestObjectDetectionSnpe : public TestInference { @@ -155,5 +155,5 @@ TEST_P(TestObjectDetectionSnpe, DISABLED_YoloV5MultiAnchor) inferenceDog(answer); } -INSTANTIATE_TEST_CASE_P(Prefix, TestObjectDetectionSnpe, - ::testing::Values(ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CUSTOM)));
\ No newline at end of file +INSTANTIATE_TEST_SUITE_P(Prefix, TestObjectDetectionSnpe, + ::testing::Values(ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CUSTOM)));
\ No newline at end of file diff --git a/test/testsuites/machine_learning/inference/test_pose_landmark_detection.cpp b/test/testsuites/machine_learning/inference/test_pose_landmark_detection.cpp index 80bc744d..4175a673 100644 --- a/test/testsuites/machine_learning/inference/test_pose_landmark_detection.cpp +++ b/test/testsuites/machine_learning/inference/test_pose_landmark_detection.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include <gtest/gtest.h> -#include <ImageHelper.h> #include "test_inference_helper.hpp" +#include <ImageHelper.h> +#include <gtest/gtest.h> #define PLD_TFLITE_WEIGHT_MOBILENET_V1_POSENET_257_PATH \ TEST_RES_PATH \ @@ -232,6 +232,6 @@ TEST_P(TestPoseLandmarkDetectionTflite, MoveNetLightning4Quant) } } -INSTANTIATE_TEST_CASE_P(Prefix, TestPoseLandmarkDetectionTflite, - ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU), - ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU)));
\ No newline at end of file +INSTANTIATE_TEST_SUITE_P(Prefix, TestPoseLandmarkDetectionTflite, + ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU), + ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU)));
\ No newline at end of file diff --git a/test/testsuites/machine_learning/landmark_detection/test_landmark_detection.cpp b/test/testsuites/machine_learning/landmark_detection/test_landmark_detection.cpp index 6f90e587..752553c0 100644 --- a/test/testsuites/machine_learning/landmark_detection/test_landmark_detection.cpp +++ b/test/testsuites/machine_learning/landmark_detection/test_landmark_detection.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include <iostream> #include <algorithm> +#include <iostream> #include <string.h> #include "gtest/gtest.h" diff --git a/test/testsuites/machine_learning/landmark_detection/test_landmark_detection_async.cpp b/test/testsuites/machine_learning/landmark_detection/test_landmark_detection_async.cpp index 7e71125b..93e7f3fc 100644 --- a/test/testsuites/machine_learning/landmark_detection/test_landmark_detection_async.cpp +++ b/test/testsuites/machine_learning/landmark_detection/test_landmark_detection_async.cpp @@ -14,16 +14,16 @@ * limitations under the License. */ -#include <iostream> #include <algorithm> +#include <iostream> #include <string.h> #include <thread> #include "gtest/gtest.h" #include "ImageHelper.h" -#include "mv_pose_landmark_internal.h" #include "mv_facial_landmark_internal.h" +#include "mv_pose_landmark_internal.h" #define IMG_FACE TEST_RES_PATH "/res/inference/images/faceLandmark.jpg" #define IMG_POSE TEST_RES_PATH "/res/inference/images/poseLandmark.jpg" diff --git a/test/testsuites/machine_learning/object_detection/test_object_detection.cpp b/test/testsuites/machine_learning/object_detection/test_object_detection.cpp index 8f8bfd97..aaee147b 100644 --- a/test/testsuites/machine_learning/object_detection/test_object_detection.cpp +++ b/test/testsuites/machine_learning/object_detection/test_object_detection.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ -#include <iostream> #include <algorithm> +#include <iostream> #include <string.h> #include "gtest/gtest.h" #include "ImageHelper.h" -#include "mv_object_detection_internal.h" #include "mv_face_detection_internal.h" +#include "mv_object_detection_internal.h" #define IMG_DOG TEST_RES_PATH "/res/inference/images/dog2.jpg" #define IMG_FACE TEST_RES_PATH "/res/inference/images/faceDetection.jpg" diff --git a/test/testsuites/machine_learning/object_detection/test_object_detection_async.cpp b/test/testsuites/machine_learning/object_detection/test_object_detection_async.cpp index bcaddc4c..5084b276 100644 --- a/test/testsuites/machine_learning/object_detection/test_object_detection_async.cpp +++ b/test/testsuites/machine_learning/object_detection/test_object_detection_async.cpp @@ -14,16 +14,16 @@ * limitations under the License. */ -#include <iostream> #include <algorithm> +#include <iostream> #include <string.h> #include <thread> #include "gtest/gtest.h" #include "ImageHelper.h" -#include "mv_object_detection_internal.h" #include "mv_face_detection_internal.h" +#include "mv_object_detection_internal.h" #define IMG_DOG TEST_RES_PATH "/res/inference/images/dog2.jpg" #define IMG_FACE TEST_RES_PATH "/res/inference/images/faceDetection.jpg" diff --git a/test/testsuites/machine_learning/object_detection_3d/test_object_detection_3d.cpp b/test/testsuites/machine_learning/object_detection_3d/test_object_detection_3d.cpp index 0eecf8da..cd32735c 100644 --- a/test/testsuites/machine_learning/object_detection_3d/test_object_detection_3d.cpp +++ b/test/testsuites/machine_learning/object_detection_3d/test_object_detection_3d.cpp @@ -15,8 +15,8 @@ */ #include <iostream> -#include <string.h> #include <map> +#include <string.h> #include "gtest/gtest.h" diff --git a/test/testsuites/mv3d/depth_test_suite.cpp b/test/testsuites/mv3d/depth_test_suite.cpp index 40ab602d..9cef5339 100644 --- a/test/testsuites/mv3d/depth_test_suite.cpp +++ b/test/testsuites/mv3d/depth_test_suite.cpp @@ -14,21 +14,21 @@ * limitations under the License. */ -#include <pthread.h> #include <chrono> -#include <iostream> #include <fstream> #include <iomanip> -#include <stdlib.h> -#include <unistd.h> +#include <iostream> #include <math.h> -#include <typeinfo> #include <opencv2/core.hpp> #include <opencv2/imgcodecs.hpp> #include <opencv2/imgproc.hpp> +#include <pthread.h> +#include <stdlib.h> +#include <typeinfo> +#include <unistd.h> -#include <mv_log_cfg.h> #include <mv_common.h> +#include <mv_log_cfg.h> #include <mv_testsuite_common.h> #include "mv_3d.h" diff --git a/test/testsuites/mv3d/depthstream_test_suite.cpp b/test/testsuites/mv3d/depthstream_test_suite.cpp index 90befaee..090235cb 100644 --- a/test/testsuites/mv3d/depthstream_test_suite.cpp +++ b/test/testsuites/mv3d/depthstream_test_suite.cpp @@ -14,31 +14,31 @@ * limitations under the License. */ -#include <pthread.h> #include <chrono> -#include <iostream> #include <fstream> #include <iomanip> -#include <stdlib.h> -#include <unistd.h> +#include <iostream> #include <math.h> #include <opencv2/core.hpp> #include <opencv2/imgcodecs.hpp> #include <opencv2/imgproc.hpp> +#include <pthread.h> +#include <stdlib.h> +#include <unistd.h> #ifdef MV_3D_POINTCLOUD_IS_AVAILABLE #include <open3d/Open3D.h> #endif -#include <mv_log_cfg.h> -#include <mv_common.h> #include "mv_3d.h" +#include <mv_common.h> +#include <mv_log_cfg.h> #include <mv_testsuite_common.h> #include <vision_source.h> #include <glib-2.0/glib.h> +#include <gst/app/gstappsrc.h> #include <gst/gst.h> #include <gst/video/video.h> -#include <gst/app/gstappsrc.h> #ifdef BUILD_VISUALIZER #include "mv_util_visualizer_2d.h" diff --git a/test/testsuites/mv3d/test_3d.cpp b/test/testsuites/mv3d/test_3d.cpp index 93ff725d..b8011a40 100644 --- a/test/testsuites/mv3d/test_3d.cpp +++ b/test/testsuites/mv3d/test_3d.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ -#include <unistd.h> -#include <pthread.h> #include <glib-2.0/glib.h> +#include <pthread.h> +#include <unistd.h> -#include "gtest/gtest.h" #include "ImageHelper.h" #include "mv_3d.h" +#include "gtest/gtest.h" using namespace testing; diff --git a/test/testsuites/surveillance/surveillance_test_suite.c b/test/testsuites/surveillance/surveillance_test_suite.c index 70907900..c2a77ecf 100644 --- a/test/testsuites/surveillance/surveillance_test_suite.c +++ b/test/testsuites/surveillance/surveillance_test_suite.c @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "mv_testsuite_common.h" #include "image_helper.h" +#include "mv_testsuite_common.h" #include "mv_log_cfg.h" #include "mv_private.h" #include "mv_surveillance.h" -#include <stdlib.h> #include <limits.h> +#include <stdlib.h> #define MAX_EVENTS_NUMBER 101 diff --git a/test/testsuites/tracker/test_tracker.cpp b/test/testsuites/tracker/test_tracker.cpp index 6cc66714..ceae3bc8 100644 --- a/test/testsuites/tracker/test_tracker.cpp +++ b/test/testsuites/tracker/test_tracker.cpp @@ -15,8 +15,8 @@ */ #include <iostream> -#include <string.h> #include <map> +#include <string.h> #include "gtest/gtest.h" diff --git a/test/testsuites/visualizer/remote_display_server/server.cpp b/test/testsuites/visualizer/remote_display_server/server.cpp index e5e466f7..71032cc1 100644 --- a/test/testsuites/visualizer/remote_display_server/server.cpp +++ b/test/testsuites/visualizer/remote_display_server/server.cpp @@ -1,14 +1,14 @@ -#include <stdio.h> -#include <grpcpp/grpcpp.h> #include "proto/mv_util_visualizer_rd.grpc.pb.h" +#include <grpcpp/grpcpp.h> +#include <stdio.h> #include <stdlib.h> #include <string> #include <opencv2/core.hpp> -#include <opencv2/imgcodecs.hpp> #include <opencv2/highgui.hpp> +#include <opencv2/imgcodecs.hpp> #include <opencv2/imgproc/imgproc.hpp> typedef unsigned char byte; @@ -18,8 +18,8 @@ using grpc::ServerBuilder; using grpc::ServerContext; using grpc::Status; -using std::cout; using std::cin; +using std::cout; using std::endl; #define WIN_NAME "draw_image" diff --git a/test/testsuites/visualizer/visualizer_test_suite.cpp b/test/testsuites/visualizer/visualizer_test_suite.cpp index 42c152a1..b773ca15 100644 --- a/test/testsuites/visualizer/visualizer_test_suite.cpp +++ b/test/testsuites/visualizer/visualizer_test_suite.cpp @@ -16,14 +16,14 @@ #include <mv_private.h> -#include <iostream> +#include <argp.h> #include <chrono> #include <error.h> -#include <argp.h> +#include <iostream> +#include "bunny.h" #include "mv_util_visualizer_2d.h" #include "mv_util_visualizer_3d.h" -#include "bunny.h" #define MAX_ARGS 3 |