From 748d18b5df1e0eafaa3ea085c0d88103961e7170 Mon Sep 17 00:00:00 2001
From: junchen14 <jun.chen@kaust.edu.sa>
Date: Wed, 1 Nov 2023 12:18:06 +0300
Subject: [PATCH] update evaluation files

---
 eval_configs/minigptv2_benchmark_evaluation.yaml | 4 ++--
 eval_configs/minigptv2_eval.yaml                 | 2 +-
 minigpt4/configs/models/minigpt_v2.yaml          | 2 +-
 minigpt4/models/minigpt_base.py                  | 5 -----
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/eval_configs/minigptv2_benchmark_evaluation.yaml b/eval_configs/minigptv2_benchmark_evaluation.yaml
index 2efe3d9..c0e3a26 100644
--- a/eval_configs/minigptv2_benchmark_evaluation.yaml
+++ b/eval_configs/minigptv2_benchmark_evaluation.yaml
@@ -64,9 +64,9 @@ evaluation_datasets:
     batch_size: 10
   hm:
     eval_file_path: /path/to/eval/annotation/path  
-    img_path: /path/to/eval/image/path     
+    img_path: /path/to/eval/image/path 
     max_new_tokens: 20
-    batch_size: 10
+    batch_size: 100
 
 run:
   task: image_text_pretrain
diff --git a/eval_configs/minigptv2_eval.yaml b/eval_configs/minigptv2_eval.yaml
index 1fa5d7b..3634770 100644
--- a/eval_configs/minigptv2_eval.yaml
+++ b/eval_configs/minigptv2_eval.yaml
@@ -5,7 +5,7 @@ model:
   end_sym: "</s>"
   low_resource: True
   prompt_template: '[INST] {} [/INST]'
-  llama_model: "/ibex/project/c2133/llama_v2/llama-2-7b-chat-pytorch_update"
+  llama_model: ""
   ckpt: ""
   lora_r: 64
   lora_alpha: 16
diff --git a/minigpt4/configs/models/minigpt_v2.yaml b/minigpt4/configs/models/minigpt_v2.yaml
index 8f1c7c2..4c9514d 100755
--- a/minigpt4/configs/models/minigpt_v2.yaml
+++ b/minigpt4/configs/models/minigpt_v2.yaml
@@ -11,7 +11,7 @@ model:
   # generation configs
   prompt: ""
 
-  llama_model: "/ibex/project/c2133/llama_v2/llama-2-7b-chat-pytorch"
+  llama_model: ""
   lora_r: 64
   lora_alpha: 16
 
diff --git a/minigpt4/models/minigpt_base.py b/minigpt4/models/minigpt_base.py
index a5f6fe9..66c8c80 100644
--- a/minigpt4/models/minigpt_base.py
+++ b/minigpt4/models/minigpt_base.py
@@ -10,11 +10,6 @@ from minigpt4.models.base_model import BaseModel
 from transformers import StoppingCriteria, StoppingCriteriaList
 
 from minigpt4.conversation.conversation import StoppingCriteriaSub
-<<<<<<< HEAD
-=======
-
-
->>>>>>> upstream/main
 
 class MiniGPTBase(BaseModel):
     """