diff --git a/mteb/abstasks/Image/AbsTaskImageClassification.py b/mteb/abstasks/Image/AbsTaskImageClassification.py index d3ba2dabf0..a4c52a4471 100644 --- a/mteb/abstasks/Image/AbsTaskImageClassification.py +++ b/mteb/abstasks/Image/AbsTaskImageClassification.py @@ -111,8 +111,7 @@ def _calculate_metrics_from_split( imgs = self.dataset[hf_subset][split][self.image_column_name] labels = self.dataset[hf_subset][split][self.label_column_name] elif compute_overall: - imgs = [] - labels = [] + imgs, labels = [], [] for hf_subset in self.metadata.eval_langs: imgs.extend(self.dataset[hf_subset][split][self.image_column_name]) labels.extend(self.dataset[hf_subset][split][self.label_column_name]) @@ -126,7 +125,7 @@ def _calculate_metrics_from_split( img_widths, img_heights = [], [] for img in imgs: - width, height = img.size + width, height = img.size # type: ignore img_heights.append(height) img_widths.append(width) diff --git a/mteb/abstasks/Image/AbsTaskImageClustering.py b/mteb/abstasks/Image/AbsTaskImageClustering.py index 585bf4ea5b..33287b45aa 100644 --- a/mteb/abstasks/Image/AbsTaskImageClustering.py +++ b/mteb/abstasks/Image/AbsTaskImageClustering.py @@ -73,8 +73,7 @@ def _calculate_metrics_from_split( imgs = self.dataset[hf_subset][split][self.image_column_name] labels = self.dataset[hf_subset][split][self.label_column_name] elif compute_overall: - imgs = [] - labels = [] + imgs, labels = [], [] for hf_subset in self.metadata.eval_langs: imgs.extend(self.dataset[hf_subset][split][self.image_column_name]) labels.extend(self.dataset[hf_subset][split][self.label_column_name]) @@ -88,7 +87,7 @@ def _calculate_metrics_from_split( img_widths, img_heights = [], [] for img in imgs: - width, height = img.size + width, height = img.size # type: ignore img_heights.append(height) img_widths.append(width) diff --git a/mteb/abstasks/Image/AbsTaskImageMultilabelClassification.py b/mteb/abstasks/Image/AbsTaskImageMultilabelClassification.py index 1e66e30cdc..3fd285d96a 100644 --- a/mteb/abstasks/Image/AbsTaskImageMultilabelClassification.py +++ b/mteb/abstasks/Image/AbsTaskImageMultilabelClassification.py @@ -132,8 +132,7 @@ def _calculate_metrics_from_split( imgs = self.dataset[hf_subset][split][self.image_column_name] labels = self.dataset[hf_subset][split][self.label_column_name] elif compute_overall: - imgs = [] - labels = [] + imgs, labels = [], [] for hf_subset in self.metadata.eval_langs: imgs.extend(self.dataset[hf_subset][split][self.image_column_name]) labels.extend(self.dataset[hf_subset][split][self.label_column_name]) diff --git a/mteb/abstasks/Image/AbsTaskZeroShotClassification.py b/mteb/abstasks/Image/AbsTaskZeroShotClassification.py index 95a37d21f0..ff6812c2ad 100644 --- a/mteb/abstasks/Image/AbsTaskZeroShotClassification.py +++ b/mteb/abstasks/Image/AbsTaskZeroShotClassification.py @@ -79,8 +79,7 @@ def _calculate_metrics_from_split( imgs = self.dataset[hf_subset][split][self.image_column_name] labels = self.dataset[hf_subset][split][self.label_column_name] elif compute_overall: - imgs = [] - labels = [] + imgs, labels = [], [] for hf_subset in self.metadata.eval_langs: imgs.extend(self.dataset[hf_subset][split][self.image_column_name]) labels.extend(self.dataset[hf_subset][split][self.label_column_name]) @@ -94,12 +93,11 @@ def _calculate_metrics_from_split( img_widths, img_heights = [], [] for img in imgs: - width, height = img.size + width, height = img.size # type: ignore img_heights.append(height) img_widths.append(width) - candidate_labels = self.get_candidate_labels() - candidate_labels_len = [len(c) for c in candidate_labels] + candidate_labels_len = [len(c) for c in self.get_candidate_labels()] return ZeroShotClassificationDescriptiveStatistics( num_samples=num_samples, @@ -131,7 +129,6 @@ def _evaluate_subset( evaluator = ZeroShotClassificationEvaluator( dataset, self.image_column_name, - # dataset[self.image_column_name],#broken into dataset and self.image_column_name dataset[self.label_column_name], candidate_labels, task_name=self.metadata.name,