Formatting

RHeckerIntel · RHeckerIntel · commit f40a10d717b6 · 2025-06-19T12:57:59.000+02:00
diff --git a/src/cpp/include/tasks/instance_segmentation.h b/src/cpp/include/tasks/instance_segmentation.h
@@ -18,7 +18,8 @@ class InstanceSegmentation {
     std::shared_ptr<InferenceAdapter> adapter;
     std::unique_ptr<Pipeline<InstanceSegmentationResult>> pipeline;
 
-    InstanceSegmentation(std::shared_ptr<InferenceAdapter> adapter, const ov::AnyMap& configuration) : adapter(adapter) {
+    InstanceSegmentation(std::shared_ptr<InferenceAdapter> adapter, const ov::AnyMap& configuration)
+        : adapter(adapter) {
         auto config = adapter->getModelConfig();
         tiling = utils::get_from_any_maps("tiling", configuration, config, tiling);
         if (tiling) {
@@ -75,14 +76,12 @@ class InstanceSegmentation {
                                                             const std::vector<cv::Rect>&,
                                                             const utils::TilingInfo&);
 
-    
     static std::vector<SegmentedObjectWithRects> getRotatedRectangles(const InstanceSegmentationResult& result);
     static std::vector<Contour> getContours(const std::vector<SegmentedObject>& objects);
 
     bool postprocess_semantic_masks = true;
 
 private:
-
     bool tiling;
 
     utils::RESIZE_MODE resize_mode;
diff --git a/src/cpp/include/utils/config.h b/src/cpp/include/utils/config.h
@@ -16,7 +16,6 @@ enum RESIZE_MODE {
     NO_RESIZE,
 };
 
-
 template <typename Type>
 Type get_from_any_maps(const std::string& key,
                        const ov::AnyMap& top_priority,
@@ -51,12 +50,11 @@ inline bool get_from_any_maps(const std::string& key,
     return low_priority;
 }
 
-template<>
+template <>
 inline RESIZE_MODE get_from_any_maps(const std::string& key,
-                              const ov::AnyMap& top_priority,
-                              const ov::AnyMap& mid_priority,
-                              RESIZE_MODE low_priority) {
-
+                                     const ov::AnyMap& top_priority,
+                                     const ov::AnyMap& mid_priority,
+                                     RESIZE_MODE low_priority) {
     std::string resize_type = "standard";
     resize_type = utils::get_from_any_maps("resize_type", top_priority, mid_priority, resize_type);
     RESIZE_MODE resize = RESIZE_FILL;
@@ -75,8 +73,6 @@ inline RESIZE_MODE get_from_any_maps(const std::string& key,
     return resize;
 }
 
-
-
 inline bool model_has_embedded_processing(std::shared_ptr<ov::Model> model) {
     if (model->has_rt_info("model_info")) {
         auto model_info = model->get_rt_info<ov::AnyMap>("model_info");
diff --git a/src/cpp/include/utils/preprocessing.h b/src/cpp/include/utils/preprocessing.h
@@ -7,6 +7,7 @@
 
 #include <opencv2/opencv.hpp>
 #include <openvino/openvino.hpp>
+
 #include "utils/config.h"
 
 namespace utils {
diff --git a/src/cpp/src/tasks/instance_segmentation.cpp b/src/cpp/src/tasks/instance_segmentation.cpp
@@ -8,9 +8,9 @@
 #include "adapters/openvino_adapter.h"
 #include "utils/config.h"
 #include "utils/math.h"
+#include "utils/nms.h"
 #include "utils/preprocessing.h"
 #include "utils/tensor.h"
-#include "utils/nms.h"
 
 constexpr char saliency_map_name[]{"saliency_map"};
 constexpr char feature_vector_name[]{"feature_vector"};
@@ -232,7 +232,7 @@ InstanceSegmentationResult InstanceSegmentation::postprocess(InferenceResult& in
     std::cout << "resize mode: " << resize_mode << std::endl;
     int padLeft = 0, padTop = 0;
     if (utils::RESIZE_KEEP_ASPECT == resize_mode || utils::RESIZE_KEEP_ASPECT_LETTERBOX == resize_mode) {
-        std::cout << "using some other resize mode..."  << std::endl;
+        std::cout << "using some other resize mode..." << std::endl;
         invertedScaleX = invertedScaleY = std::max(invertedScaleX, invertedScaleY);
         if (utils::RESIZE_KEEP_ASPECT_LETTERBOX == resize_mode) {
             padLeft = (input_shape.width - int(std::round(floatInputImgWidth / invertedScaleX))) / 2;
@@ -306,7 +306,8 @@ InstanceSegmentationResult InstanceSegmentation::postprocess(InferenceResult& in
     return result;
 }
 
-InstanceSegmentationResult InstanceSegmentation::postprocess_tile(InstanceSegmentationResult result, const cv::Rect& coord) {
+InstanceSegmentationResult InstanceSegmentation::postprocess_tile(InstanceSegmentationResult result,
+                                                                  const cv::Rect& coord) {
     for (auto& det : result.segmentedObjects) {
         det.x += coord.x;
         det.y += coord.y;
@@ -322,11 +323,12 @@ InstanceSegmentationResult InstanceSegmentation::postprocess_tile(InstanceSegmen
     return result;
 }
 
-InstanceSegmentationResult InstanceSegmentation::merge_tiling_results(const std::vector<InstanceSegmentationResult>& tiles_results,
-                                                const cv::Size& image_size,
-                                                const std::vector<cv::Rect>& tile_coords,
-                                                const utils::TilingInfo& tiling_info) {
-    size_t max_pred_number = 200; //TODO: Actually get this from config!
+InstanceSegmentationResult InstanceSegmentation::merge_tiling_results(
+    const std::vector<InstanceSegmentationResult>& tiles_results,
+    const cv::Size& image_size,
+    const std::vector<cv::Rect>& tile_coords,
+    const utils::TilingInfo& tiling_info) {
+    size_t max_pred_number = 200;  // TODO: Actually get this from config!
 
     InstanceSegmentationResult output;
     std::vector<AnchorLabeled> all_detections;
@@ -346,15 +348,15 @@ InstanceSegmentationResult InstanceSegmentation::merge_tiling_results(const std:
     output.segmentedObjects.reserve(keep_idx.size());
     for (auto idx : keep_idx) {
         if (postprocess_semantic_masks) {
-            //why does this happen again?
-            //all_detections_ptrs[idx].get().mask = ;
-            //SegmentedObject obj = all_detections_ptrs[idx]; //copy
-            //std::cout << "Mask size before: " << obj.mask.size() << std::endl;
-            //std::cout << static_cast<cv::Rect>(obj) << std::endl;
-            //obj.mask = segm_postprocess(all_detections_ptrs[idx],
-            //                                                       obj.mask,
-            //                                                       image_size.height,
-            //                                                       image_size.width);
+            // why does this happen again?
+            // all_detections_ptrs[idx].get().mask = ;
+            // SegmentedObject obj = all_detections_ptrs[idx]; //copy
+            // std::cout << "Mask size before: " << obj.mask.size() << std::endl;
+            // std::cout << static_cast<cv::Rect>(obj) << std::endl;
+            // obj.mask = segm_postprocess(all_detections_ptrs[idx],
+            //                                                        obj.mask,
+            //                                                        image_size.height,
+            //                                                        image_size.width);
         }
 
         output.segmentedObjects.push_back(all_detections_ptrs[idx]);
@@ -390,14 +392,13 @@ InstanceSegmentationResult InstanceSegmentation::merge_tiling_results(const std:
     output.saliency_map = merge_saliency_maps(tiles_results, image_size, tile_coords, tiling_info);
 
     return output;
-
 }
 
-
-std::vector<cv::Mat_<std::uint8_t>> InstanceSegmentation::merge_saliency_maps(const std::vector<InstanceSegmentationResult>& tiles_results,
-                                                        const cv::Size& image_size,
-                                                        const std::vector<cv::Rect>& tile_coords,
-                                                        const utils::TilingInfo& tiling_info ) {
+std::vector<cv::Mat_<std::uint8_t>> InstanceSegmentation::merge_saliency_maps(
+    const std::vector<InstanceSegmentationResult>& tiles_results,
+    const cv::Size& image_size,
+    const std::vector<cv::Rect>& tile_coords,
+    const utils::TilingInfo& tiling_info) {
     std::vector<std::vector<cv::Mat_<std::uint8_t>>> all_saliency_maps;
     all_saliency_maps.reserve(tiles_results.size());
     for (const auto& result : tiles_results) {
@@ -435,7 +436,8 @@ std::vector<cv::Mat_<std::uint8_t>> InstanceSegmentation::merge_saliency_maps(co
     }
 
     for (size_t class_idx = 0; class_idx < num_classes; ++class_idx) {
-        auto image_map_cls = tiling_info.tile_with_full_image ? image_saliency_map[class_idx] : cv::Mat_<std::uint8_t>();
+        auto image_map_cls =
+            tiling_info.tile_with_full_image ? image_saliency_map[class_idx] : cv::Mat_<std::uint8_t>();
         if (image_map_cls.empty()) {
             if (cv::sum(merged_map[class_idx]) == cv::Scalar(0.)) {
                 merged_map[class_idx] = cv::Mat_<std::uint8_t>();
