Merge branch 'EleutherAI:main' into main

lm_eval/tasks/bigbench/multiple_choice/persian_idioms.yaml

 # Generated by utils.py
 dataset_name: persian_idioms_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_persian_idioms_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/phrase_relatedness.yaml

 # Generated by utils.py
 dataset_name: phrase_relatedness_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_phrase_relatedness_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/physical_intuition.yaml

 # Generated by utils.py
 dataset_name: physical_intuition_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_physical_intuition_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/physics.yaml

 # Generated by utils.py
 dataset_name: physics_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_physics_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/physics_questions.yaml

-# Generated by utils.py
-dataset_name: physics_questions_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_physics_questions_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/play_dialog_same_or_different.yaml

 # Generated by utils.py
 dataset_name: play_dialog_same_or_different_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_play_dialog_same_or_different_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/polish_sequence_labeling.yaml

-# Generated by utils.py
-dataset_name: polish_sequence_labeling_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_polish_sequence_labeling_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/presuppositions_as_nli.yaml

 # Generated by utils.py
 dataset_name: presuppositions_as_nli_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_presuppositions_as_nli_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/qa_wikidata.yaml

-# Generated by utils.py
-dataset_name: qa_wikidata_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_qa_wikidata_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/question_selection.yaml

 # Generated by utils.py
 dataset_name: question_selection_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_question_selection_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/real_or_fake_text.yaml

 # Generated by utils.py
 dataset_name: real_or_fake_text_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_real_or_fake_text_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/reasoning_about_colored_objects.yaml

 # Generated by utils.py
 dataset_name: reasoning_about_colored_objects_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_reasoning_about_colored_objects_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/repeat_copy_logic.yaml

-# Generated by utils.py
-dataset_name: repeat_copy_logic_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_repeat_copy_logic_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/rephrase.yaml

-# Generated by utils.py
-dataset_name: rephrase_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_rephrase_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/riddle_sense.yaml

 # Generated by utils.py
 dataset_name: riddle_sense_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_riddle_sense_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/ruin_names.yaml

 # Generated by utils.py
 dataset_name: ruin_names_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_ruin_names_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/salient_translation_error_detection.yaml

 # Generated by utils.py
 dataset_name: salient_translation_error_detection_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_salient_translation_error_detection_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/scientific_press_release.yaml

-# Generated by utils.py
-dataset_name: scientific_press_release_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_scientific_press_release_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/semantic_parsing_in_context_sparc.yaml

-# Generated by utils.py
-dataset_name: semantic_parsing_in_context_sparc_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_semantic_parsing_in_context_sparc_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/semantic_parsing_spider.yaml

-# Generated by utils.py
-dataset_name: semantic_parsing_spider_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_semantic_parsing_spider_multiple_choice