resolved merge conflict from latest version

3e1301bb · lintangsutawika · fd9cd80f · 070d31df · 3e1301bb · 3e1301bb
Commit 3e1301bb authored Jun 04, 2024 by lintangsutawika
20 changed files
--- a/lm_eval/tasks/bigbench/multiple_choice/analogical_similarity.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/analogical_similarity.yaml
 # Generated by utils.py
 dataset_name: analogical_similarity_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_analogical_similarity_multiple_choice
--- a/lm_eval/tasks/bigbench/multiple_choice/analytic_entailment.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/analytic_entailment.yaml
 # Generated by utils.py
 dataset_name: analytic_entailment_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_analytic_entailment_multiple_choice
--- a/lm_eval/tasks/bigbench/multiple_choice/arithmetic.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/arithmetic.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/ascii_word_recognition.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/ascii_word_recognition.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/authorship_verification.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/authorship_verification.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/auto_categorization.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/auto_categorization.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/auto_debugging.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/auto_debugging.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/bbq_lite_json.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/bbq_lite_json.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/bridging_anaphora_resolution_barqa.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/bridging_anaphora_resolution_barqa.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/causal_judgement.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/causal_judgement.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/causal_judgment.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/causal_judgment.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/cause_and_effect.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/cause_and_effect.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/checkmate_in_one.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/checkmate_in_one.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/chess_state_tracking.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/chess_state_tracking.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/chinese_remainder_theorem.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/chinese_remainder_theorem.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/cifar10_classification.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/cifar10_classification.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/code_line_description.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/code_line_description.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/codenames.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/codenames.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/color.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/color.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/common_morpheme.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/common_morpheme.yaml