Revert "Patch for Seq2Seq Model predictions (#1584)" (#1601)

This reverts commit b7923a84.

lm_eval/api/model.py

@@ -5,7 +5,6 @@ import logging
 import os
 from typing import List, Optional, Tuple, Type, TypeVar
 
-import transformers
 from sqlitedict import SqliteDict
 from tqdm import tqdm
 
@@ -304,16 +303,11 @@ class TemplateLM(LM):
             continuation = context[-n_spaces:] + continuation
             context = context[:-n_spaces]
 
-        if self.AUTO_MODEL_CLASS == transformers.AutoModelForCausalLM:
-            whole_enc = self.tok_encode(context + continuation)
-            context_enc = self.tok_encode(context)
+        whole_enc = self.tok_encode(context + continuation)
+        context_enc = self.tok_encode(context)
 
-            context_enc_len = len(context_enc)
-            continuation_enc = whole_enc[context_enc_len:]
-
-        elif self.AUTO_MODEL_CLASS == transformers.AutoModelForSeq2SeqLM:
-            context_enc = self.tok_encode(context)
-            continuation_enc = self.tok_encode(continuation)
+        context_enc_len = len(context_enc)
+        continuation_enc = whole_enc[context_enc_len:]
 
         return context_enc, continuation_enc
 

lm_eval/models/huggingface.py

@@ -726,15 +726,11 @@ class HFLM(TemplateLM):
 
         return encoding["input_ids"], encoding["attention_mask"]
 
-    def tok_decode(self, tokens, skip_special_tokens=True):
+    def tok_decode(self, tokens):
         if self.AUTO_MODEL_CLASS == transformers.AutoModelForCausalLM:
-            return self.tokenizer.decode(
-                tokens, skip_special_tokens=skip_special_tokens
-            )
+            return self.tokenizer.decode(tokens)
         elif self.AUTO_MODEL_CLASS == transformers.AutoModelForSeq2SeqLM:
-            return self.tokenizer.decode(
-                tokens, skip_special_tokens=skip_special_tokens
-            )
+            return self.tokenizer.decode(tokens, skip_special_tokens=True)
 
     def _model_call(self, inps, attn_mask=None, labels=None):
         """
@@ -1177,7 +1173,7 @@ class HFLM(TemplateLM):
                     f"Expected `kwargs` to be of type `dict` but got {type(gen_kwargs)}"
                 )
             # add EOS token to stop sequences
-            eos = self.tok_decode(self.eot_token_id, skip_special_tokens=False)
+            eos = self.tok_decode(self.eot_token_id)
             if not until:
                 until = [eos]
             else: