Merge pull request #7 from Bourn3z/dev-offlineinfer

Add the function of concatenating to crops after detection.

Author: Bourn3z

deploy/py_infer/src/parallel/module/detection/det_post_node.py

@@ -28,10 +28,9 @@ def concat_crops(self, crops: list):
         Returns:
             numpy.ndarray: A horizontally concatenated image array.
         """
-        crops_sorted = sorted(crops, key=lambda points: (points[0][1], points[0][0]))
-        max_height = max(crop.shape[0] for crop in crops_sorted)
+        max_height = max(crop.shape[0] for crop in crops)
         resized_crops = []
-        for crop in crops_sorted:
+        for crop in crops:
             h, w, c = crop.shape
             new_h = max_height
             new_w = int((w / h) * new_h)
@@ -48,6 +47,8 @@ def process(self, input_data):
 
         data = input_data.data
         boxes = self.text_detector.postprocess(data["pred"], data["shape_list"])
+        if self.is_concat:
+            boxes = sorted(boxes, key=lambda points: (points[0][1], points[0][0]))
 
         infer_res_list = []
         for box in boxes:

deploy/py_infer/src/parallel/module/recognition/rec_post_node.py

@@ -7,6 +7,7 @@ def __init__(self, args, msg_queue):
         super(RecPostNode, self).__init__(args, msg_queue)
         self.text_recognizer = None
         self.task_type = self.args.task_type
+        self.is_concat = self.args.is_concat
 
     def init_self_args(self):
         self.text_recognizer = TextRecognizer(self.args)
@@ -28,9 +29,13 @@ def process(self, input_data):
         else:
             texts = output["texts"]
             confs = output["confs"]
-            for result, text, conf in zip(input_data.infer_result, texts, confs):
-                result.append(text)
-                result.append(conf)
+            for i, result in enumerate(input_data.infer_result):
+                if self.is_concat:
+                    result.append(texts[0])
+                    result.append(confs[0])
+                else:
+                    result.append(texts[i])
+                    result.append(confs[i])
 
         input_data.data = None