Fix conflict and add check for batch_size

Author: mengweiguo

tools/who_what_benchmark/whowhatbench/embeddings_evaluator.py

@@ -182,6 +182,7 @@ def default_gen_answer(model, tokenizer, passages, **kwargs):
                       'normalize': self.normalize}
 
             batch_size = self.batch_size or len(data[0])
+            batch_size = min(batch_size, len(data[0]))
             data_input = data[0][:batch_size]
             result = gen_answer_fn(model, self.tokenizer, data_input, **kwargs)
 

tools/who_what_benchmark/whowhatbench/wwb.py

@@ -523,7 +523,6 @@ def genai_gen_visual_text(model, prompt, image, processor, tokenizer, max_new_to
 
 def genai_gen_embedding(model, tokenizer, passages, **kwargs):
     embeddings = model.embed_documents(passages)
-
     return embeddings