fix alllll the merge conflicts

7d09b24c · haileyschoelkopf · 96dfe976 · 6348b947 · 7d09b24c · 7d09b24c
Commit 7d09b24c authored Jul 03, 2024 by haileyschoelkopf
20 changed files
--- a/lm_eval/tasks/cmmlu/cmmlu_marketing.yaml
+++ b/lm_eval/tasks/cmmlu/cmmlu_marketing.yaml
--- a/lm_eval/tasks/cmmlu/cmmlu_marxist_theory.yaml
+++ b/lm_eval/tasks/cmmlu/cmmlu_marxist_theory.yaml
--- a/lm_eval/tasks/cmmlu/cmmlu_modern_chinese.yaml
+++ b/lm_eval/tasks/cmmlu/cmmlu_modern_chinese.yaml
--- a/lm_eval/tasks/cmmlu/cmmlu_nutrition.yaml
+++ b/lm_eval/tasks/cmmlu/cmmlu_nutrition.yaml
--- a/lm_eval/tasks/cmmlu/cmmlu_philosophy.yaml
+++ b/lm_eval/tasks/cmmlu/cmmlu_philosophy.yaml
--- a/lm_eval/tasks/cmmlu/cmmlu_professional_accounting.yaml
+++ b/lm_eval/tasks/cmmlu/cmmlu_professional_accounting.yaml
--- a/lm_eval/tasks/cmmlu/cmmlu_professional_law.yaml
+++ b/lm_eval/tasks/cmmlu/cmmlu_professional_law.yaml
--- a/lm_eval/tasks/cmmlu/cmmlu_professional_medicine.yaml
+++ b/lm_eval/tasks/cmmlu/cmmlu_professional_medicine.yaml
--- a/lm_eval/tasks/cmmlu/cmmlu_professional_psychology.yaml
+++ b/lm_eval/tasks/cmmlu/cmmlu_professional_psychology.yaml
--- a/lm_eval/tasks/cmmlu/cmmlu_public_relations.yaml
+++ b/lm_eval/tasks/cmmlu/cmmlu_public_relations.yaml
--- a/lm_eval/tasks/cmmlu/cmmlu_security_study.yaml
+++ b/lm_eval/tasks/cmmlu/cmmlu_security_study.yaml
--- a/lm_eval/tasks/cmmlu/cmmlu_sociology.yaml
+++ b/lm_eval/tasks/cmmlu/cmmlu_sociology.yaml
--- a/lm_eval/tasks/cmmlu/cmmlu_sports_science.yaml
+++ b/lm_eval/tasks/cmmlu/cmmlu_sports_science.yaml
--- a/lm_eval/tasks/cmmlu/cmmlu_traditional_chinese_medicine.yaml
+++ b/lm_eval/tasks/cmmlu/cmmlu_traditional_chinese_medicine.yaml
--- a/lm_eval/tasks/cmmlu/cmmlu_virology.yaml
+++ b/lm_eval/tasks/cmmlu/cmmlu_virology.yaml
--- a/lm_eval/tasks/cmmlu/cmmlu_world_history.yaml
+++ b/lm_eval/tasks/cmmlu/cmmlu_world_history.yaml
--- a/lm_eval/tasks/cmmlu/cmmlu_world_religions.yaml
+++ b/lm_eval/tasks/cmmlu/cmmlu_world_religions.yaml
--- a/lm_eval/tasks/copal_id/standard.yaml
+++ b/lm_eval/tasks/copal_id/standard.yaml
--- a/lm_eval/tasks/crows_pairs/crows_pairs_english.yaml
+++ b/lm_eval/tasks/crows_pairs/crows_pairs_english.yaml
--- a/lm_eval/tasks/csatqa/_csatqa.yaml
+++ b/lm_eval/tasks/csatqa/_csatqa.yaml