change cuda

minigpt4/conversation/conversation.py

@@ -647,34 +647,35 @@ class Chat:
                 answer = None
                 answer_new = None
 
-                def worker_model_0():
-                    nonlocal answer
-                    if model_type == 'Diagnosis and Confidence':
-                        answer = self.model_list[0].generate_step(lr_img_list_combination, confidence_instruction, hr_img_list_combination)
-                    else:
-                        answer = self.model.generate_step(lr_img_list_combination, confidence_instruction, hr_img_list_combination)
-
-                def worker_model_1():
-                    nonlocal answer_new
-                    # Note: Both "Diagnosis and Confidence" 和其他类型的逻辑一样, 可酌情保留
-                    answer_new = self.model_list[1].generate_step(
-                        lr_img_list_combination.to(self.model_list[1].device), 
-                        instruction, 
-                        hr_img_list_combination.to(self.model_list[1].device)
-                    )
-
-                # 创建线程
-                thread0 = threading.Thread(target=worker_model_0)
-                thread1 = threading.Thread(target=worker_model_1)
-
-                # 启动线程
-                thread0.start()
-                thread1.start()
-
-                # 等待两线程结束
-                thread0.join()
-                thread1.join()
-
+                # def worker_model_0():
+                #     nonlocal answer
+                #     if model_type == 'Diagnosis and Confidence':
+                #         answer = self.model_list[0].generate_step(lr_img_list_combination, confidence_instruction, hr_img_list_combination)
+                #     else:
+                #         answer = self.model.generate_step(lr_img_list_combination, confidence_instruction, hr_img_list_combination)
+
+                # def worker_model_1():
+                #     nonlocal answer_new
+                #     # Note: Both "Diagnosis and Confidence" 和其他类型的逻辑一样, 可酌情保留
+                #     answer_new = self.model_list[1].generate_step(
+                #         lr_img_list_combination.to(self.model_list[1].device), 
+                #         instruction, 
+                #         hr_img_list_combination.to(self.model_list[1].device)
+                #     )
+
+                # # 创建线程
+                # thread0 = threading.Thread(target=worker_model_0)
+                # thread1 = threading.Thread(target=worker_model_1)
+
+                # # 启动线程
+                # thread0.start()
+                # thread1.start()
+
+                # # 等待两线程结束
+                # thread0.join()
+                # thread1.join()
+                answer = self.model_list[0].generate_step(lr_img_list_combination, confidence_instruction, hr_img_list_combination)
+                answer_new = self.model_list[1].generate_step(lr_img_list_combination, instruction, hr_img_list_combination)
                 output_text=answer
                 answer_list.append(answer_new)
                 
@@ -737,34 +738,35 @@ class Chat:
 
                 # 同时让两个模型在不同显卡上并发生成答案
 
-                import threading
+                # import threading
 
-                answer = [None]
-                answer_new = [None]
+                # answer = [None]
+                # answer_new = [None]
 
-                def run_model_0():
-                    answer[0] = self.model.generate_step(
-                        lr_img_list_combination, confidence_instruction, hr_img_list_combination
-                    )
+                # def run_model_0():
+                #     answer[0] = self.model.generate_step(
+                #         lr_img_list_combination, confidence_instruction, hr_img_list_combination
+                #     )
 
-                def run_model_1():
-                    answer_new[0] = self.model_list[1].generate_step(
-                        lr_img_list_combination.to(self.model_list[1].device),
-                        instruction,
-                        hr_img_list_combination.to(self.model_list[1].device)
-                    )
+                # def run_model_1():
+                #     answer_new[0] = self.model_list[1].generate_step(
+                #         lr_img_list_combination.to(self.model_list[1].device),
+                #         instruction,
+                #         hr_img_list_combination.to(self.model_list[1].device)
+                #     )
 
-                thread0 = threading.Thread(target=run_model_0)
-                thread1 = threading.Thread(target=run_model_1)
+                # thread0 = threading.Thread(target=run_model_0)
+                # thread1 = threading.Thread(target=run_model_1)
 
-                thread0.start()
-                thread1.start()
-                thread0.join()
-                thread1.join()
+                # thread0.start()
+                # thread1.start()
+                # thread0.join()
+                # thread1.join()
 
-                answer = answer[0]
-                answer_new = answer_new[0]
-                
+                # answer = answer[0]
+                # answer_new = answer_new[0]
+                answer = self.model_list[0].generate_step(lr_img_list_combination, confidence_instruction, hr_img_list_combination)
+                answer_new = self.model_list[1].generate_step(lr_img_list_combination, instruction, hr_img_list_combination)
                 
                 output_text=answer