Merge branch 'EleutherAI:main' into main

lm_eval/tasks/bigbench/multiple_choice/kanji_ascii.yaml

 # Generated by utils.py
 dataset_name: kanji_ascii_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_kanji_ascii_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/kannada.yaml

 # Generated by utils.py
 dataset_name: kannada_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_kannada_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/key_value_maps.yaml

 # Generated by utils.py
 dataset_name: key_value_maps_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_key_value_maps_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/known_unknowns.yaml

 # Generated by utils.py
 dataset_name: known_unknowns_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_known_unknowns_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/language_games.yaml

-# Generated by utils.py
-dataset_name: language_games_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_language_games_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/language_identification.yaml

 # Generated by utils.py
 dataset_name: language_identification_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_language_identification_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/linguistic_mappings.yaml

-# Generated by utils.py
-dataset_name: linguistic_mappings_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_linguistic_mappings_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/linguistics_puzzles.yaml

-# Generated by utils.py
-dataset_name: linguistics_puzzles_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_linguistics_puzzles_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/list_functions.yaml

-# Generated by utils.py
-dataset_name: list_functions_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_list_functions_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/logic_grid_puzzle.yaml

 # Generated by utils.py
 dataset_name: logic_grid_puzzle_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_logic_grid_puzzle_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/logical_args.yaml

 # Generated by utils.py
 dataset_name: logical_args_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_logical_args_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/logical_deduction.yaml

 # Generated by utils.py
 dataset_name: logical_deduction_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_logical_deduction_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/logical_fallacy_detection.yaml

 # Generated by utils.py
 dataset_name: logical_fallacy_detection_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_logical_fallacy_detection_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/logical_sequence.yaml

 # Generated by utils.py
 dataset_name: logical_sequence_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_logical_sequence_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/mathematical_induction.yaml

 # Generated by utils.py
 dataset_name: mathematical_induction_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_mathematical_induction_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/matrixshapes.yaml

-# Generated by utils.py
-dataset_name: matrixshapes_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_matrixshapes_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/metaphor_boolean.yaml

 # Generated by utils.py
 dataset_name: metaphor_boolean_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_metaphor_boolean_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/metaphor_understanding.yaml

 # Generated by utils.py
 dataset_name: metaphor_understanding_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_metaphor_understanding_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/minute_mysteries_qa.yaml

-# Generated by utils.py
-dataset_name: minute_mysteries_qa_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_minute_mysteries_qa_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/misconceptions.yaml

 # Generated by utils.py
 dataset_name: misconceptions_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_misconceptions_multiple_choice