Merge branch 'big-refactor' into verbosity-rework

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_conceptual_physics.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_conceptual_physics.yaml

 "dataset_name": "conceptual_physics"
-"description": "The following are multiple choice questions (with answers) about conceptual physics.\n\n"
+"description": "The following are multiple choice questions (with answers) about conceptual\
+  \ physics.\n\n"
+"group": "mmlu_flan_n_shot_generative_stem"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_conceptual_physics"
+"task": "mmlu_flan_n_shot_generative_conceptual_physics"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_econometrics.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_econometrics.yaml

 "dataset_name": "econometrics"
-"description": "The following are multiple choice questions (with answers) about econometrics.\n\n"
+"description": "The following are multiple choice questions (with answers) about econometrics.\n\
+  \n"
+"group": "mmlu_flan_n_shot_generative_social_sciences"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_econometrics"
+"task": "mmlu_flan_n_shot_generative_econometrics"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_electrical_engineering.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_electrical_engineering.yaml

 "dataset_name": "electrical_engineering"
-"description": "The following are multiple choice questions (with answers) about electrical engineering.\n\n"
+"description": "The following are multiple choice questions (with answers) about electrical\
+  \ engineering.\n\n"
+"group": "mmlu_flan_n_shot_generative_stem"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_electrical_engineering"
+"task": "mmlu_flan_n_shot_generative_electrical_engineering"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_elementary_mathematics.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_elementary_mathematics.yaml

 "dataset_name": "elementary_mathematics"
-"description": "The following are multiple choice questions (with answers) about elementary mathematics.\n\n"
+"description": "The following are multiple choice questions (with answers) about elementary\
+  \ mathematics.\n\n"
+"group": "mmlu_flan_n_shot_generative_stem"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_elementary_mathematics"
+"task": "mmlu_flan_n_shot_generative_elementary_mathematics"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_formal_logic.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_formal_logic.yaml

 "dataset_name": "formal_logic"
-"description": "The following are multiple choice questions (with answers) about formal logic.\n\n"
+"description": "The following are multiple choice questions (with answers) about formal\
+  \ logic.\n\n"
+"group": "mmlu_flan_n_shot_generative_humanities"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_formal_logic"
+"task": "mmlu_flan_n_shot_generative_formal_logic"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_global_facts.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_global_facts.yaml

 "dataset_name": "global_facts"
-"description": "The following are multiple choice questions (with answers) about global facts.\n\n"
+"description": "The following are multiple choice questions (with answers) about global\
+  \ facts.\n\n"
+"group": "mmlu_flan_n_shot_generative_other"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_global_facts"
+"task": "mmlu_flan_n_shot_generative_global_facts"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_high_school_biology.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_high_school_biology.yaml

 "dataset_name": "high_school_biology"
-"description": "The following are multiple choice questions (with answers) about high school biology.\n\n"
+"description": "The following are multiple choice questions (with answers) about high\
+  \ school biology.\n\n"
+"group": "mmlu_flan_n_shot_generative_stem"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_high_school_biology"
+"task": "mmlu_flan_n_shot_generative_high_school_biology"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_high_school_chemistry.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_high_school_chemistry.yaml

 "dataset_name": "high_school_chemistry"
-"description": "The following are multiple choice questions (with answers) about high school chemistry.\n\n"
+"description": "The following are multiple choice questions (with answers) about high\
+  \ school chemistry.\n\n"
+"group": "mmlu_flan_n_shot_generative_stem"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_high_school_chemistry"
+"task": "mmlu_flan_n_shot_generative_high_school_chemistry"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_high_school_computer_science.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_high_school_computer_science.yaml

 "dataset_name": "high_school_computer_science"
-"description": "The following are multiple choice questions (with answers) about high school computer science.\n\n"
+"description": "The following are multiple choice questions (with answers) about high\
+  \ school computer science.\n\n"
+"group": "mmlu_flan_n_shot_generative_stem"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_high_school_computer_science"
+"task": "mmlu_flan_n_shot_generative_high_school_computer_science"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_high_school_european_history.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_high_school_european_history.yaml

 "dataset_name": "high_school_european_history"
-"description": "The following are multiple choice questions (with answers) about high school european history.\n\n"
+"description": "The following are multiple choice questions (with answers) about high\
+  \ school european history.\n\n"
+"group": "mmlu_flan_n_shot_generative_humanities"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_high_school_european_history"
+"task": "mmlu_flan_n_shot_generative_high_school_european_history"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_high_school_geography.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_high_school_geography.yaml

 "dataset_name": "high_school_geography"
-"description": "The following are multiple choice questions (with answers) about high school geography.\n\n"
+"description": "The following are multiple choice questions (with answers) about high\
+  \ school geography.\n\n"
+"group": "mmlu_flan_n_shot_generative_social_sciences"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_high_school_geography"
+"task": "mmlu_flan_n_shot_generative_high_school_geography"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_high_school_government_and_politics.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_high_school_government_and_politics.yaml

 "dataset_name": "high_school_government_and_politics"
-"description": "The following are multiple choice questions (with answers) about high school government and politics.\n\n"
+"description": "The following are multiple choice questions (with answers) about high\
+  \ school government and politics.\n\n"
+"group": "mmlu_flan_n_shot_generative_social_sciences"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_high_school_government_and_politics"
+"task": "mmlu_flan_n_shot_generative_high_school_government_and_politics"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_high_school_macroeconomics.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_high_school_macroeconomics.yaml

 "dataset_name": "high_school_macroeconomics"
-"description": "The following are multiple choice questions (with answers) about high school macroeconomics.\n\n"
+"description": "The following are multiple choice questions (with answers) about high\
+  \ school macroeconomics.\n\n"
+"group": "mmlu_flan_n_shot_generative_social_sciences"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_high_school_macroeconomics"
+"task": "mmlu_flan_n_shot_generative_high_school_macroeconomics"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_high_school_mathematics.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_high_school_mathematics.yaml

 "dataset_name": "high_school_mathematics"
-"description": "The following are multiple choice questions (with answers) about high school mathematics.\n\n"
+"description": "The following are multiple choice questions (with answers) about high\
+  \ school mathematics.\n\n"
+"group": "mmlu_flan_n_shot_generative_stem"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_high_school_mathematics"
+"task": "mmlu_flan_n_shot_generative_high_school_mathematics"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_high_school_microeconomics.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_high_school_microeconomics.yaml

 "dataset_name": "high_school_microeconomics"
-"description": "The following are multiple choice questions (with answers) about high school microeconomics.\n\n"
+"description": "The following are multiple choice questions (with answers) about high\
+  \ school microeconomics.\n\n"
+"group": "mmlu_flan_n_shot_generative_social_sciences"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_high_school_microeconomics"
+"task": "mmlu_flan_n_shot_generative_high_school_microeconomics"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_high_school_physics.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_high_school_physics.yaml

 "dataset_name": "high_school_physics"
-"description": "The following are multiple choice questions (with answers) about high school physics.\n\n"
+"description": "The following are multiple choice questions (with answers) about high\
+  \ school physics.\n\n"
+"group": "mmlu_flan_n_shot_generative_stem"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_high_school_physics"
+"task": "mmlu_flan_n_shot_generative_high_school_physics"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_high_school_psychology.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_high_school_psychology.yaml

 "dataset_name": "high_school_psychology"
-"description": "The following are multiple choice questions (with answers) about high school psychology.\n\n"
+"description": "The following are multiple choice questions (with answers) about high\
+  \ school psychology.\n\n"
+"group": "mmlu_flan_n_shot_generative_social_sciences"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_high_school_psychology"
+"task": "mmlu_flan_n_shot_generative_high_school_psychology"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_high_school_statistics.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_high_school_statistics.yaml

 "dataset_name": "high_school_statistics"
-"description": "The following are multiple choice questions (with answers) about high school statistics.\n\n"
+"description": "The following are multiple choice questions (with answers) about high\
+  \ school statistics.\n\n"
+"group": "mmlu_flan_n_shot_generative_stem"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_high_school_statistics"
+"task": "mmlu_flan_n_shot_generative_high_school_statistics"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_high_school_us_history.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_high_school_us_history.yaml

 "dataset_name": "high_school_us_history"
-"description": "The following are multiple choice questions (with answers) about high school us history.\n\n"
+"description": "The following are multiple choice questions (with answers) about high\
+  \ school us history.\n\n"
+"group": "mmlu_flan_n_shot_generative_humanities"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_high_school_us_history"
+"task": "mmlu_flan_n_shot_generative_high_school_us_history"

lm_eval/tasks/mmlu/flan_n_shot/mmlu_log_high_school_world_history.yaml → lm_eval/tasks/mmlu/flan_n_shot/loglikelihood/mmlu_high_school_world_history.yaml

 "dataset_name": "high_school_world_history"
-"description": "The following are multiple choice questions (with answers) about high school world history.\n\n"
+"description": "The following are multiple choice questions (with answers) about high\
+  \ school world history.\n\n"
+"group": "mmlu_flan_n_shot_generative_humanities"
 "include": "_mmlu_flan_loglikelihood_template_yaml"
-"task": "mmlu_flan_n_shot_loglikelihood_high_school_world_history"
+"task": "mmlu_flan_n_shot_generative_high_school_world_history"