resolved merge conflict from latest version

3e1301bb · lintangsutawika · fd9cd80f · 070d31df · 3e1301bb · 3e1301bb
Commit 3e1301bb authored Jun 04, 2024 by lintangsutawika
20 changed files
--- a/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_marketing.yaml
+++ b/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_marketing.yaml
--- a/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_medical_genetics.yaml
+++ b/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_medical_genetics.yaml
--- a/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_miscellaneous.yaml
+++ b/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_miscellaneous.yaml
--- a/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_moral_disputes.yaml
+++ b/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_moral_disputes.yaml
--- a/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_moral_scenarios.yaml
+++ b/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_moral_scenarios.yaml
--- a/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_nutrition.yaml
+++ b/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_nutrition.yaml
--- a/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_philosophy.yaml
+++ b/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_philosophy.yaml
--- a/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_prehistory.yaml
+++ b/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_prehistory.yaml
--- a/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_professional_accounting.yaml
+++ b/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_professional_accounting.yaml
--- a/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_professional_law.yaml
+++ b/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_professional_law.yaml
--- a/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_professional_medicine.yaml
+++ b/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_professional_medicine.yaml
--- a/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_professional_psychology.yaml
+++ b/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_professional_psychology.yaml
--- a/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_public_relations.yaml
+++ b/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_public_relations.yaml
--- a/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_security_studies.yaml
+++ b/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_security_studies.yaml
--- a/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_sociology.yaml
+++ b/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_sociology.yaml
--- a/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_us_foreign_policy.yaml
+++ b/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_us_foreign_policy.yaml
--- a/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_virology.yaml
+++ b/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_virology.yaml
--- a/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_world_religions.yaml
+++ b/lm_eval/tasks/mmlu/flan_cot_fewshot/mmlu_world_religions.yaml
--- a/lm_eval/tasks/mmlu/flan_cot_zeroshot/_mmlu_flan_cot_zeroshot_template_yaml
+++ b/lm_eval/tasks/mmlu/flan_cot_zeroshot/_mmlu_flan_cot_zeroshot_template_yaml
--- a/lm_eval/tasks/mmlu/flan_n_shot/generative/_mmlu_flan_generative_template_yaml
+++ b/lm_eval/tasks/mmlu/flan_n_shot/generative/_mmlu_flan_generative_template_yaml