Merge pull request #1029 from EleutherAI/bbh-fixup

[Refactor] BBH fixup

lm_eval/tasks/bbh/flan_zeroshot/navigate.yaml → lm_eval/tasks/bbh/zeroshot/navigate.yaml

 "dataset_name": "navigate"
 "description": "Given a series of navigation instructions, determine whether one would end up back at the starting point.\n\n"
 "doc_to_text": "Q: {{input}}\nA:"
-"include": "_flan_zeroshot_template_yaml"
-"task": "bbh_flan_zeroshot_navigate"
+"include": "_zeroshot_template_yaml"
+"task": "bbh_zeroshot_navigate"

lm_eval/tasks/bbh/flan_zeroshot/object_counting.yaml → lm_eval/tasks/bbh/zeroshot/object_counting.yaml

 "dataset_name": "object_counting"
 "description": "Questions that involve enumerating objects and asking the model to count them.\n\n"
 "doc_to_text": "Q: {{input}}\nA:"
-"include": "_flan_zeroshot_template_yaml"
-"task": "bbh_flan_zeroshot_object_counting"
+"include": "_zeroshot_template_yaml"
+"task": "bbh_zeroshot_object_counting"

lm_eval/tasks/bbh/flan_zeroshot/penguins_in_a_table.yaml → lm_eval/tasks/bbh/zeroshot/penguins_in_a_table.yaml

 "dataset_name": "penguins_in_a_table"
 "description": "Answer questions about a table of penguins and their attributes.\n\n"
 "doc_to_text": "Q: {{input}}\nA:"
-"include": "_flan_zeroshot_template_yaml"
-"task": "bbh_flan_zeroshot_penguins_in_a_table"
+"include": "_zeroshot_template_yaml"
+"task": "bbh_zeroshot_penguins_in_a_table"

lm_eval/tasks/bbh/flan_zeroshot/reasoning_about_colored_objects.yaml → lm_eval/tasks/bbh/zeroshot/reasoning_about_colored_objects.yaml

 "dataset_name": "reasoning_about_colored_objects"
 "description": "Answer extremely simple questions about the colors of objects on a surface.\n\n"
 "doc_to_text": "Q: {{input}}\nA:"
-"include": "_flan_zeroshot_template_yaml"
-"task": "bbh_flan_zeroshot_reasoning_about_colored_objects"
+"include": "_zeroshot_template_yaml"
+"task": "bbh_zeroshot_reasoning_about_colored_objects"

lm_eval/tasks/bbh/flan_zeroshot/ruin_names.yaml → lm_eval/tasks/bbh/zeroshot/ruin_names.yaml

 "dataset_name": "ruin_names"
 "description": "Select the humorous edit that 'ruins' the input movie or musical artist name.\n\n"
 "doc_to_text": "Q: {{input}}\nA:"
-"include": "_flan_zeroshot_template_yaml"
-"task": "bbh_flan_zeroshot_ruin_names"
+"include": "_zeroshot_template_yaml"
+"task": "bbh_zeroshot_ruin_names"

lm_eval/tasks/bbh/flan_zeroshot/salient_translation_error_detection.yaml → lm_eval/tasks/bbh/zeroshot/salient_translation_error_detection.yaml

 "dataset_name": "salient_translation_error_detection"
 "description": "Detect the type of error in an English translation of a German source sentence.\n\n"
 "doc_to_text": "Q: {{input}}\nA:"
-"include": "_flan_zeroshot_template_yaml"
-"task": "bbh_flan_zeroshot_salient_translation_error_detection"
+"include": "_zeroshot_template_yaml"
+"task": "bbh_zeroshot_salient_translation_error_detection"

lm_eval/tasks/bbh/flan_zeroshot/snarks.yaml → lm_eval/tasks/bbh/zeroshot/snarks.yaml

 "dataset_name": "snarks"
 "description": "Determine which of two sentences is sarcastic.\n\nAccording to Cambridge University Dictionary, sarcasm is \"the use of remarks that clearly mean the opposite of what they say, made in order to hurt someone's feelings or to criticize something in a humorous way.\" Sarcastic sentences often contain satirical or ironic utterances, hyperboles, ambivalent or witty remarks.\n\n"
 "doc_to_text": "Q: {{input}}\nA:"
-"include": "_flan_zeroshot_template_yaml"
-"task": "bbh_flan_zeroshot_snarks"
+"include": "_zeroshot_template_yaml"
+"task": "bbh_zeroshot_snarks"

lm_eval/tasks/bbh/flan_zeroshot/sports_understanding.yaml → lm_eval/tasks/bbh/zeroshot/sports_understanding.yaml

 "dataset_name": "sports_understanding"
 "description": "Determine whether an artificially constructed sentence relating to sports is plausible or not.\n\n"
 "doc_to_text": "Q: {{input}}\nA:"
-"include": "_flan_zeroshot_template_yaml"
-"task": "bbh_flan_zeroshot_sports_understanding"
+"include": "_zeroshot_template_yaml"
+"task": "bbh_zeroshot_sports_understanding"

lm_eval/tasks/bbh/flan_zeroshot/temporal_sequences.yaml → lm_eval/tasks/bbh/zeroshot/temporal_sequences.yaml

 "dataset_name": "temporal_sequences"
 "description": "Task description: Answer questions about which times certain events could have occurred.\n\n"
 "doc_to_text": "Q: {{input}}\nA:"
-"include": "_flan_zeroshot_template_yaml"
-"task": "bbh_flan_zeroshot_temporal_sequences"
+"include": "_zeroshot_template_yaml"
+"task": "bbh_zeroshot_temporal_sequences"

lm_eval/tasks/bbh/flan_zeroshot/tracking_shuffled_objects_five_objects.yaml → lm_eval/tasks/bbh/zeroshot/tracking_shuffled_objects_five_objects.yaml

 "dataset_name": "tracking_shuffled_objects_five_objects"
 "description": "A task requiring determining the final positions of a set of objects given their initial positions and a description of a sequence of swaps.\n\n"
 "doc_to_text": "Q: {{input}}\nA:"
-"include": "_flan_zeroshot_template_yaml"
-"task": "bbh_flan_zeroshot_tracking_shuffled_objects_five_objects"
+"include": "_zeroshot_template_yaml"
+"task": "bbh_zeroshot_tracking_shuffled_objects_five_objects"

lm_eval/tasks/bbh/flan_zeroshot/tracking_shuffled_objects_seven_objects.yaml → lm_eval/tasks/bbh/zeroshot/tracking_shuffled_objects_seven_objects.yaml

 "dataset_name": "tracking_shuffled_objects_seven_objects"
 "description": "A task requiring determining the final positions of a set of objects given their initial positions and a description of a sequence of swaps.\n\n"
 "doc_to_text": "Q: {{input}}\nA:"
-"include": "_flan_zeroshot_template_yaml"
-"task": "bbh_flan_zeroshot_tracking_shuffled_objects_seven_objects"
+"include": "_zeroshot_template_yaml"
+"task": "bbh_zeroshot_tracking_shuffled_objects_seven_objects"

lm_eval/tasks/bbh/flan_zeroshot/tracking_shuffled_objects_three_objects.yaml → lm_eval/tasks/bbh/zeroshot/tracking_shuffled_objects_three_objects.yaml

 "dataset_name": "tracking_shuffled_objects_three_objects"
 "description": "A task requiring determining the final positions of a set of objects given their initial positions and a description of a sequence of swaps.\n\n"
 "doc_to_text": "Q: {{input}}\nA:"
-"include": "_flan_zeroshot_template_yaml"
-"task": "bbh_flan_zeroshot_tracking_shuffled_objects_three_objects"
+"include": "_zeroshot_template_yaml"
+"task": "bbh_zeroshot_tracking_shuffled_objects_three_objects"

lm_eval/tasks/bbh/flan_zeroshot/web_of_lies.yaml → lm_eval/tasks/bbh/zeroshot/web_of_lies.yaml

 "dataset_name": "web_of_lies"
 "description": "Evaluate a random boolean function expressed as a word problem.\n\n"
 "doc_to_text": "Q: {{input}}\nA:"
-"include": "_flan_zeroshot_template_yaml"
-"task": "bbh_flan_zeroshot_web_of_lies"
+"include": "_zeroshot_template_yaml"
+"task": "bbh_zeroshot_web_of_lies"

lm_eval/tasks/bbh/flan_zeroshot/word_sorting.yaml → lm_eval/tasks/bbh/zeroshot/word_sorting.yaml

 "dataset_name": "word_sorting"
 "description": "Sort a list of words.\n\n"
 "doc_to_text": "Q: {{input}}\nA:"
-"include": "_flan_zeroshot_template_yaml"
-"task": "bbh_flan_zeroshot_word_sorting"
+"include": "_zeroshot_template_yaml"
+"task": "bbh_zeroshot_word_sorting"