Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support tuple format in combine evaluations #604

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/evaluate/module.py
Original file line number Diff line number Diff line change
Expand Up @@ -874,11 +874,14 @@ def __init__(self, evaluation_modules, force_prefix=False):
from .loading import load # avoid circular imports

self.evaluation_module_names = None
if isinstance(evaluation_modules, list):
if isinstance(evaluation_modules, (list, tuple)):
self.evaluation_modules = evaluation_modules
elif isinstance(evaluation_modules, dict):
self.evaluation_modules = list(evaluation_modules.values())
self.evaluation_module_names = list(evaluation_modules.keys())
else:
raise ValueError("`evaluation_modules` should be a list, tuple or dict")

loaded_modules = []

for module in self.evaluation_modules:
Expand Down
15 changes: 14 additions & 1 deletion tests/test_metric.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import pytest
from datasets.features import Features, Sequence, Value

from evaluate.module import EvaluationModule, EvaluationModuleInfo, combine
from evaluate.module import CombinedEvaluations, EvaluationModule, EvaluationModuleInfo, combine

from .utils import require_tf, require_torch

Expand Down Expand Up @@ -757,3 +757,16 @@ def test_modules_from_string_poslabel(self):
self.assertDictEqual(
expected_result, combined_evaluation.compute(predictions=predictions, references=references, pos_label=0)
)


@pytest.mark.parametrize(
"evaluations,",
(
[DummyMetric(), DummyMetric()],
(DummyMetric(), DummyMetric()),
{"metric1": DummyMetric(), "metric2": DummyMetric()},
),
)
def test_combine_evaluations_in_different_forms(evaluations):
combined_evaluation = combine(evaluations)
assert isinstance(combined_evaluation, CombinedEvaluations)