|
42 | 42 | from langcodes import Language as LangCodeLanguage |
43 | 43 | from langcodes import standardize_tag |
44 | 44 |
|
45 | | -from lighteval.metrics.dynamic_metrics import loglikelihood_acc_metric |
| 45 | +from lighteval.metrics.dynamic_metrics import LogLikelihoodAccMetric |
46 | 46 | from lighteval.metrics.metrics import Metrics |
47 | 47 | from lighteval.metrics.normalizations import ( |
48 | 48 | LogProbCharNorm, |
|
87 | 87 | metrics=get_metrics_for_formulation( |
88 | 88 | formulation, |
89 | 89 | [ |
90 | | - loglikelihood_acc_metric(normalization=LogProbTokenNorm()), |
91 | | - loglikelihood_acc_metric(normalization=LogProbCharNorm()), |
| 90 | + LogLikelihoodAccMetric(normalization=LogProbTokenNorm()), |
| 91 | + LogLikelihoodAccMetric(normalization=LogProbCharNorm()), |
92 | 92 | ], |
93 | 93 | ), |
94 | 94 | ) |
|
117 | 117 | metrics=get_metrics_for_formulation( |
118 | 118 | formulation, |
119 | 119 | [ |
120 | | - loglikelihood_acc_metric(normalization=LogProbTokenNorm()), |
121 | | - loglikelihood_acc_metric(normalization=LogProbCharNorm()), |
| 120 | + LogLikelihoodAccMetric(normalization=LogProbTokenNorm()), |
| 121 | + LogLikelihoodAccMetric(normalization=LogProbCharNorm()), |
122 | 122 | ], |
123 | 123 | ), |
124 | 124 | ) |
|
154 | 154 | metrics=get_metrics_for_formulation( |
155 | 155 | formulation, |
156 | 156 | [ |
157 | | - loglikelihood_acc_metric(normalization=LogProbTokenNorm()), |
158 | | - loglikelihood_acc_metric(normalization=LogProbCharNorm()), |
159 | | - loglikelihood_acc_metric(normalization=LogProbPMINorm()), |
| 157 | + LogLikelihoodAccMetric(normalization=LogProbTokenNorm()), |
| 158 | + LogLikelihoodAccMetric(normalization=LogProbCharNorm()), |
| 159 | + LogLikelihoodAccMetric(normalization=LogProbPMINorm()), |
160 | 160 | ], |
161 | 161 | ), |
162 | 162 | version=0, |
|
191 | 191 | metrics=get_metrics_for_formulation( |
192 | 192 | formulation, |
193 | 193 | [ |
194 | | - loglikelihood_acc_metric(normalization=LogProbTokenNorm()), |
195 | | - loglikelihood_acc_metric(normalization=LogProbCharNorm()), |
196 | | - loglikelihood_acc_metric(normalization=LogProbPMINorm()), |
| 194 | + LogLikelihoodAccMetric(normalization=LogProbTokenNorm()), |
| 195 | + LogLikelihoodAccMetric(normalization=LogProbCharNorm()), |
| 196 | + LogLikelihoodAccMetric(normalization=LogProbPMINorm()), |
197 | 197 | ], |
198 | 198 | ), |
199 | 199 | hf_avail_splits=["test"], |
@@ -275,9 +275,9 @@ def filipino_dengue_pfn(line, task_name: str) -> Doc: |
275 | 275 | metrics=get_metrics_for_formulation( |
276 | 276 | formulation, |
277 | 277 | [ |
278 | | - loglikelihood_acc_metric(normalization=LogProbTokenNorm()), |
279 | | - loglikelihood_acc_metric(normalization=LogProbCharNorm()), |
280 | | - loglikelihood_acc_metric(normalization=LogProbPMINorm()), |
| 278 | + LogLikelihoodAccMetric(normalization=LogProbTokenNorm()), |
| 279 | + LogLikelihoodAccMetric(normalization=LogProbCharNorm()), |
| 280 | + LogLikelihoodAccMetric(normalization=LogProbPMINorm()), |
281 | 281 | ], |
282 | 282 | ), |
283 | 283 | hf_avail_splits=["train", "test"], |
@@ -327,9 +327,9 @@ def filipino_dengue_pfn(line, task_name: str) -> Doc: |
327 | 327 | metrics=get_metrics_for_formulation( |
328 | 328 | formulation, |
329 | 329 | [ |
330 | | - loglikelihood_acc_metric(normalization=LogProbTokenNorm()), |
331 | | - loglikelihood_acc_metric(normalization=LogProbCharNorm()), |
332 | | - loglikelihood_acc_metric(normalization=LogProbPMINorm()), |
| 330 | + LogLikelihoodAccMetric(normalization=LogProbTokenNorm()), |
| 331 | + LogLikelihoodAccMetric(normalization=LogProbCharNorm()), |
| 332 | + LogLikelihoodAccMetric(normalization=LogProbPMINorm()), |
333 | 333 | ], |
334 | 334 | ), |
335 | 335 | ) |
@@ -360,9 +360,9 @@ def filipino_dengue_pfn(line, task_name: str) -> Doc: |
360 | 360 | metrics=get_metrics_for_formulation( |
361 | 361 | formulation, |
362 | 362 | [ |
363 | | - loglikelihood_acc_metric(normalization=LogProbTokenNorm()), |
364 | | - loglikelihood_acc_metric(normalization=LogProbCharNorm()), |
365 | | - loglikelihood_acc_metric(normalization=LogProbPMINorm()), |
| 363 | + LogLikelihoodAccMetric(normalization=LogProbTokenNorm()), |
| 364 | + LogLikelihoodAccMetric(normalization=LogProbCharNorm()), |
| 365 | + LogLikelihoodAccMetric(normalization=LogProbPMINorm()), |
366 | 366 | ], |
367 | 367 | ), |
368 | 368 | hf_avail_splits=["test"], |
@@ -396,9 +396,9 @@ def filipino_dengue_pfn(line, task_name: str) -> Doc: |
396 | 396 | hf_subset="default", |
397 | 397 | evaluation_splits=["tl"], |
398 | 398 | metrics=[ |
399 | | - loglikelihood_acc_metric(normalization=None), |
400 | | - loglikelihood_acc_metric(normalization=LogProbTokenNorm()), |
401 | | - loglikelihood_acc_metric(normalization=LogProbCharNorm()), |
| 399 | + LogLikelihoodAccMetric(normalization=None), |
| 400 | + LogLikelihoodAccMetric(normalization=LogProbTokenNorm()), |
| 401 | + LogLikelihoodAccMetric(normalization=LogProbCharNorm()), |
402 | 402 | ], |
403 | 403 | ) |
404 | 404 | for formulation in [HybridFormulation(), MCFFormulation()] |
@@ -427,9 +427,9 @@ def filipino_dengue_pfn(line, task_name: str) -> Doc: |
427 | 427 | metrics=get_metrics_for_formulation( |
428 | 428 | formulation, |
429 | 429 | [ |
430 | | - loglikelihood_acc_metric(normalization=None), |
431 | | - loglikelihood_acc_metric(normalization=LogProbTokenNorm()), |
432 | | - loglikelihood_acc_metric(normalization=LogProbCharNorm()), |
| 430 | + LogLikelihoodAccMetric(normalization=None), |
| 431 | + LogLikelihoodAccMetric(normalization=LogProbTokenNorm()), |
| 432 | + LogLikelihoodAccMetric(normalization=LogProbCharNorm()), |
433 | 433 | ], |
434 | 434 | ), |
435 | 435 | trust_dataset=True, |
@@ -509,9 +509,9 @@ def create_sib200_task(language: Language, formulation): |
509 | 509 | metrics=get_metrics_for_formulation( |
510 | 510 | formulation, |
511 | 511 | [ |
512 | | - loglikelihood_acc_metric(normalization=LogProbTokenNorm()), |
513 | | - loglikelihood_acc_metric(normalization=LogProbCharNorm()), |
514 | | - loglikelihood_acc_metric(normalization=LogProbPMINorm()), |
| 512 | + LogLikelihoodAccMetric(normalization=LogProbTokenNorm()), |
| 513 | + LogLikelihoodAccMetric(normalization=LogProbCharNorm()), |
| 514 | + LogLikelihoodAccMetric(normalization=LogProbPMINorm()), |
515 | 515 | ], |
516 | 516 | ), |
517 | 517 | hf_avail_splits=["test", "validation"], |
@@ -565,9 +565,9 @@ def prepare_stingray_semantic_appropriateness(line: dict[str, str]) -> dict[str, |
565 | 565 | metrics=get_metrics_for_formulation( |
566 | 566 | formulation, |
567 | 567 | [ |
568 | | - loglikelihood_acc_metric(normalization=LogProbTokenNorm()), |
569 | | - loglikelihood_acc_metric(normalization=LogProbCharNorm()), |
570 | | - loglikelihood_acc_metric(normalization=LogProbPMINorm()), |
| 568 | + LogLikelihoodAccMetric(normalization=LogProbTokenNorm()), |
| 569 | + LogLikelihoodAccMetric(normalization=LogProbCharNorm()), |
| 570 | + LogLikelihoodAccMetric(normalization=LogProbPMINorm()), |
571 | 571 | ], |
572 | 572 | ), |
573 | 573 | hf_avail_splits=["test"], |
@@ -595,9 +595,9 @@ def prepare_stingray_semantic_appropriateness(line: dict[str, str]) -> dict[str, |
595 | 595 | metrics=get_metrics_for_formulation( |
596 | 596 | formulation, |
597 | 597 | [ |
598 | | - loglikelihood_acc_metric(normalization=LogProbTokenNorm()), |
599 | | - loglikelihood_acc_metric(normalization=LogProbCharNorm()), |
600 | | - loglikelihood_acc_metric(normalization=LogProbPMINorm()), |
| 598 | + LogLikelihoodAccMetric(normalization=LogProbTokenNorm()), |
| 599 | + LogLikelihoodAccMetric(normalization=LogProbCharNorm()), |
| 600 | + LogLikelihoodAccMetric(normalization=LogProbPMINorm()), |
601 | 601 | ], |
602 | 602 | ), |
603 | 603 | hf_avail_splits=["test"], |
@@ -718,9 +718,9 @@ def prepare_stingray_semantic_appropriateness(line: dict[str, str]) -> dict[str, |
718 | 718 | metrics=get_metrics_for_formulation( |
719 | 719 | formulation, |
720 | 720 | [ |
721 | | - loglikelihood_acc_metric(normalization=LogProbTokenNorm()), |
722 | | - loglikelihood_acc_metric(normalization=LogProbCharNorm()), |
723 | | - loglikelihood_acc_metric(normalization=LogProbPMINorm()), |
| 721 | + LogLikelihoodAccMetric(normalization=LogProbTokenNorm()), |
| 722 | + LogLikelihoodAccMetric(normalization=LogProbCharNorm()), |
| 723 | + LogLikelihoodAccMetric(normalization=LogProbPMINorm()), |
724 | 724 | ], |
725 | 725 | ), |
726 | 726 | version=0, |
@@ -762,9 +762,9 @@ def create_universalner_task(language: Language, formulation): |
762 | 762 | metrics=get_metrics_for_formulation( |
763 | 763 | formulation, |
764 | 764 | [ |
765 | | - loglikelihood_acc_metric(normalization=LogProbTokenNorm()), |
766 | | - loglikelihood_acc_metric(normalization=LogProbCharNorm()), |
767 | | - loglikelihood_acc_metric(normalization=LogProbPMINorm()), |
| 765 | + LogLikelihoodAccMetric(normalization=LogProbTokenNorm()), |
| 766 | + LogLikelihoodAccMetric(normalization=LogProbCharNorm()), |
| 767 | + LogLikelihoodAccMetric(normalization=LogProbPMINorm()), |
768 | 768 | ], |
769 | 769 | ), |
770 | 770 | version=0, |
|
0 commit comments