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/real_or_fake_text.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/real_or_fake_text.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/reasoning_about_colored_objects.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/reasoning_about_colored_objects.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/repeat_copy_logic.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/repeat_copy_logic.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/rephrase.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/rephrase.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/riddle_sense.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/riddle_sense.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/ruin_names.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/ruin_names.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/salient_translation_error_detection.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/salient_translation_error_detection.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/scientific_press_release.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/scientific_press_release.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/semantic_parsing_in_context_sparc.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/semantic_parsing_in_context_sparc.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/semantic_parsing_spider.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/semantic_parsing_spider.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/sentence_ambiguity.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/sentence_ambiguity.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/similarities_abstraction.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/similarities_abstraction.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/simp_turing_concept.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/simp_turing_concept.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/simple_arithmetic_json.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/simple_arithmetic_json.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/simple_arithmetic_json_multiple_choice.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/simple_arithmetic_json_multiple_choice.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/simple_arithmetic_json_subtasks.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/simple_arithmetic_json_subtasks.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/simple_arithmetic_multiple_targets_json.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/simple_arithmetic_multiple_targets_json.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/simple_ethical_questions.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/simple_ethical_questions.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/simple_text_editing.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/simple_text_editing.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/snarks.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/snarks.yaml