Merge branch 'big-refactor' into verbosity-rework

lm_eval/tasks/mmlu/flan_n_shot/mmlu_gen_public_relations.yaml → lm_eval/tasks/mmlu/flan_n_shot/generative/mmlu_public_relations.yaml

 "dataset_name": "public_relations"
-"description": "The following are multiple choice questions (with answers) about public relations.\n\n"
+"description": "The following are multiple choice questions (with answers) about public\
+  \ relations.\n\n"
+"group": "mmlu_flan_n_shot_generative_social_sciences"
 "include": "_mmlu_flan_generative_template_yaml"
 "task": "mmlu_flan_n_shot_generative_public_relations"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_gen_security_studies.yaml → lm_eval/tasks/mmlu/flan_n_shot/generative/mmlu_security_studies.yaml

 "dataset_name": "security_studies"
-"description": "The following are multiple choice questions (with answers) about security studies.\n\n"
+"description": "The following are multiple choice questions (with answers) about security\
+  \ studies.\n\n"
+"group": "mmlu_flan_n_shot_generative_social_sciences"
 "include": "_mmlu_flan_generative_template_yaml"
 "task": "mmlu_flan_n_shot_generative_security_studies"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_gen_sociology.yaml → lm_eval/tasks/mmlu/flan_n_shot/generative/mmlu_sociology.yaml

 "dataset_name": "sociology"
-"description": "The following are multiple choice questions (with answers) about sociology.\n\n"
+"description": "The following are multiple choice questions (with answers) about sociology.\n\
+  \n"
+"group": "mmlu_flan_n_shot_generative_social_sciences"
 "include": "_mmlu_flan_generative_template_yaml"
 "task": "mmlu_flan_n_shot_generative_sociology"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_gen_us_foreign_policy.yaml → lm_eval/tasks/mmlu/flan_n_shot/generative/mmlu_us_foreign_policy.yaml

 "dataset_name": "us_foreign_policy"
-"description": "The following are multiple choice questions (with answers) about us foreign policy.\n\n"
+"description": "The following are multiple choice questions (with answers) about us\
+  \ foreign policy.\n\n"
+"group": "mmlu_flan_n_shot_generative_social_sciences"
 "include": "_mmlu_flan_generative_template_yaml"
 "task": "mmlu_flan_n_shot_generative_us_foreign_policy"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_gen_virology.yaml → lm_eval/tasks/mmlu/flan_n_shot/generative/mmlu_virology.yaml

 "dataset_name": "virology"
-"description": "The following are multiple choice questions (with answers) about virology.\n\n"
+"description": "The following are multiple choice questions (with answers) about virology.\n\
+  \n"
+"group": "mmlu_flan_n_shot_generative_other"
 "include": "_mmlu_flan_generative_template_yaml"
 "task": "mmlu_flan_n_shot_generative_virology"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_gen_world_religions.yaml → lm_eval/tasks/mmlu/flan_n_shot/generative/mmlu_world_religions.yaml

 "dataset_name": "world_religions"
-"description": "The following are multiple choice questions (with answers) about world religions.\n\n"
+"description": "The following are multiple choice questions (with answers) about world\
+  \ religions.\n\n"
+"group": "mmlu_flan_n_shot_generative_humanities"
 "include": "_mmlu_flan_generative_template_yaml"
 "task": "mmlu_flan_n_shot_generative_world_religions"

lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/_mmlu.yaml

+group: mmlu_flan_n_shot_generative
+task:
+  - mmlu_flan_n_shot_generative_stem
+  - mmlu_flan_n_shot_generative_other
+  - mmlu_flan_n_shot_generative_social_sciences
+  - mmlu_flan_n_shot_generative_humanities

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_abstract_algebra.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_abstract_algebra.yaml

 "dataset_name": "abstract_algebra"
-"description": "The following are multiple choice questions (with answers) about abstract algebra.\n\n"
+"description": "The following are multiple choice questions (with answers) about abstract\
+  \ algebra.\n\n"
+"group": "mmlu_flan_n_shot_generative_stem"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_abstract_algebra"
+"task": "mmlu_flan_n_shot_generative_abstract_algebra"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_anatomy.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_anatomy.yaml

 "dataset_name": "anatomy"
-"description": "The following are multiple choice questions (with answers) about anatomy.\n\n"
+"description": "The following are multiple choice questions (with answers) about anatomy.\n\
+  \n"
+"group": "mmlu_flan_n_shot_generative_stem"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_anatomy"
+"task": "mmlu_flan_n_shot_generative_anatomy"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_astronomy.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_astronomy.yaml

 "dataset_name": "astronomy"
-"description": "The following are multiple choice questions (with answers) about astronomy.\n\n"
+"description": "The following are multiple choice questions (with answers) about astronomy.\n\
+  \n"
+"group": "mmlu_flan_n_shot_generative_stem"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_astronomy"
+"task": "mmlu_flan_n_shot_generative_astronomy"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_business_ethics.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_business_ethics.yaml

 "dataset_name": "business_ethics"
-"description": "The following are multiple choice questions (with answers) about business ethics.\n\n"
+"description": "The following are multiple choice questions (with answers) about business\
+  \ ethics.\n\n"
+"group": "mmlu_flan_n_shot_generative_other"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_business_ethics"
+"task": "mmlu_flan_n_shot_generative_business_ethics"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_clinical_knowledge.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_clinical_knowledge.yaml

 "dataset_name": "clinical_knowledge"
-"description": "The following are multiple choice questions (with answers) about clinical knowledge.\n\n"
+"description": "The following are multiple choice questions (with answers) about clinical\
+  \ knowledge.\n\n"
+"group": "mmlu_flan_n_shot_generative_other"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_clinical_knowledge"
+"task": "mmlu_flan_n_shot_generative_clinical_knowledge"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_college_biology.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_college_biology.yaml

 "dataset_name": "college_biology"
-"description": "The following are multiple choice questions (with answers) about college biology.\n\n"
+"description": "The following are multiple choice questions (with answers) about college\
+  \ biology.\n\n"
+"group": "mmlu_flan_n_shot_generative_stem"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_college_biology"
+"task": "mmlu_flan_n_shot_generative_college_biology"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_college_chemistry.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_college_chemistry.yaml

 "dataset_name": "college_chemistry"
-"description": "The following are multiple choice questions (with answers) about college chemistry.\n\n"
+"description": "The following are multiple choice questions (with answers) about college\
+  \ chemistry.\n\n"
+"group": "mmlu_flan_n_shot_generative_stem"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_college_chemistry"
+"task": "mmlu_flan_n_shot_generative_college_chemistry"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_college_computer_science.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_college_computer_science.yaml

 "dataset_name": "college_computer_science"
-"description": "The following are multiple choice questions (with answers) about college computer science.\n\n"
+"description": "The following are multiple choice questions (with answers) about college\
+  \ computer science.\n\n"
+"group": "mmlu_flan_n_shot_generative_stem"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_college_computer_science"
+"task": "mmlu_flan_n_shot_generative_college_computer_science"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_college_mathematics.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_college_mathematics.yaml

 "dataset_name": "college_mathematics"
-"description": "The following are multiple choice questions (with answers) about college mathematics.\n\n"
+"description": "The following are multiple choice questions (with answers) about college\
+  \ mathematics.\n\n"
+"group": "mmlu_flan_n_shot_generative_stem"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_college_mathematics"
+"task": "mmlu_flan_n_shot_generative_college_mathematics"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_college_medicine.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_college_medicine.yaml

 "dataset_name": "college_medicine"
-"description": "The following are multiple choice questions (with answers) about college medicine.\n\n"
+"description": "The following are multiple choice questions (with answers) about college\
+  \ medicine.\n\n"
+"group": "mmlu_flan_n_shot_generative_other"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_college_medicine"
+"task": "mmlu_flan_n_shot_generative_college_medicine"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_college_physics.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_college_physics.yaml

 "dataset_name": "college_physics"
-"description": "The following are multiple choice questions (with answers) about college physics.\n\n"
+"description": "The following are multiple choice questions (with answers) about college\
+  \ physics.\n\n"
+"group": "mmlu_flan_n_shot_generative_stem"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_college_physics"
+"task": "mmlu_flan_n_shot_generative_college_physics"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_computer_security.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_computer_security.yaml

 "dataset_name": "computer_security"
-"description": "The following are multiple choice questions (with answers) about computer security.\n\n"
+"description": "The following are multiple choice questions (with answers) about computer\
+  \ security.\n\n"
+"group": "mmlu_flan_n_shot_generative_stem"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_computer_security"
+"task": "mmlu_flan_n_shot_generative_computer_security"