fix

Author: hiworldwzj

lightllm/server/router/batch.py

@@ -67,19 +67,25 @@ def is_clear(self):
         return len(self.reqs) == 0
 
     def merge(self, mini_batch: "Batch"):
-        for _req in mini_batch.reqs:
-            self.reqs.append(_req)
-        self.id_to_reqs = {req.request_id: req for req in self.reqs}
-        return
-
-    def dp_merge(self, mini_batch: "Batch"):
         if mini_batch is None:
             return
-
+        
         for _req in mini_batch.reqs:
             self.reqs.append(_req)
         self.id_to_reqs = {req.request_id: req for req in self.reqs}
         return
+    
+    @staticmethod
+    def merge_two_batch(batch1: "Batch", batch2: "Batch"):
+        if batch1 is None and batch2 is None:
+            return None
+        
+        not_none_batch = batch1 if batch1 is not None else batch2
+
+        merge_batch = Batch(-1, [], not_none_batch.dp_size_in_node)
+        merge_batch.merge(batch1)
+        merge_batch.merge(batch2)
+        return
 
     def __repr__(self):
         return f"batch_id={self.batch_id}, " f"reqs={self.reqs}, "

lightllm/server/router/req_queue/dp_base_queue.py

@@ -43,7 +43,7 @@ def _merge_batch(self, dp_batches: List[Batch]):
         merged_batch: Batch = None
         for iter_batch in dp_batches:
             if merged_batch is not None:
-                merged_batch.dp_merge(iter_batch)
+                merged_batch.merge(iter_batch)
             else:
                 merged_batch = iter_batch
         return merged_batch