resolve conflict

Author: terryyz

bigcodebench/generate.py

@@ -36,7 +36,7 @@ def codegen(
 
         if model.is_direct_completion() and split == "instruct":
             raise Exception("Base model does not support direct completion for instruct tasks")
-
+        
         # create save_path if it doesn't exist, e.g., a/b.jsonl
         dirname = os.path.dirname(save_path)
         if not os.path.exists(dirname) and dirname != "":
@@ -120,6 +120,7 @@ def main():
     parser.add_argument("--tp", default=1, type=int)
     parser.add_argument("--trust_remote_code", action="store_true")
     parser.add_argument("--tokenizer_name", default=None, type=str)
+
     args = parser.parse_args()
 
     if args.greedy and (args.temperature != 0 or args.bs != 1 or args.n_samples != 1)\
@@ -162,7 +163,7 @@ def main():
         strip_newlines=args.strip_newlines,
         n_samples=args.n_samples,
         resume=args.resume,
-        id_range=args.id_range,
+        id_range=args.id_range
     )
 
 

bigcodebench/model.py

@@ -194,6 +194,7 @@ def __init__(self, name: str, dataset: str, **kwargs):
             self.tokenizer_name = self.name
 
         self.tokenizer = AutoTokenizer.from_pretrained(self.tokenizer_name, legacy=False, **kwargs)
+        
         if self.tokenizer.chat_template is None:
             self.eos += extra_eos_for_direct_completion(dataset)