change cuda

minigpt4/conversation/conversation.py

@@ -674,11 +674,12 @@ class Chat:
                 # # 等待两线程结束
                 # thread0.join()
                 # thread1.join()
-                try:
-                    self.model_list[0].to('cuda')
-                    answer = self.model_list[0].generate_step(lr_img_list_combination, confidence_instruction, hr_img_list_combination)
-                except Exception as e:
-                    print('model_0 error',e)
+                
+                # try:
+                #     self.model_list[0].to('cuda')
+                #     answer = self.model_list[0].generate_step(lr_img_list_combination, confidence_instruction, hr_img_list_combination)
+                # except Exception as e:
+                #     print('model_0 error',e)
 
                 try:
                     self.model_list[1].to('cuda')
@@ -686,6 +687,7 @@ class Chat:
                 except Exception as e:
                     print('model_1 error',e)
 
+                answer = answer_new
                 output_text=answer
                 answer_list.append(answer_new)
                 
@@ -775,11 +777,12 @@ class Chat:
 
                 # answer = answer[0]
                 # answer_new = answer_new[0]
-                try:
-                    self.model_list[0].to('cuda')
-                    answer = self.model_list[0].generate_step(lr_img_list_combination, confidence_instruction, hr_img_list_combination)
-                except Exception as e:
-                    print('model_0 error',e)
+                
+                # try:
+                #     self.model_list[0].to('cuda')
+                #     answer = self.model_list[0].generate_step(lr_img_list_combination, confidence_instruction, hr_img_list_combination)
+                # except Exception as e:
+                #     print('model_0 error',e)
                 
                 try:
                     self.model_list[1].to('cuda')
@@ -787,6 +790,7 @@ class Chat:
                 except Exception as e:
                     print('model_1 error',e)
                 
+                answer=answer_new
                 output_text=answer
             
                 answer_list.append(answer_new)

minigpt4/models/minigpt_base.py

@@ -1787,7 +1787,7 @@ class MiniGPTBase(BaseModel):
             out_tokens.append(toks)
         
         answers = self.llama_tokenizer.decode(out_tokens[0])
-        # print('answers',answers)
+        
         return answers