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/nonsense_words_grammar.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/nonsense_words_grammar.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/novel_concepts.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/novel_concepts.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/object_counting.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/object_counting.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/odd_one_out.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/odd_one_out.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/operators.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/operators.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/paragraph_segmentation.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/paragraph_segmentation.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/parsinlu_qa.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/parsinlu_qa.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/parsinlu_reading_comprehension.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/parsinlu_reading_comprehension.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/penguins_in_a_table.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/penguins_in_a_table.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/periodic_elements.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/periodic_elements.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/persian_idioms.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/persian_idioms.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/phrase_relatedness.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/phrase_relatedness.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/physical_intuition.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/physical_intuition.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/physics.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/physics.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/physics_questions.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/physics_questions.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/play_dialog_same_or_different.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/play_dialog_same_or_different.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/polish_sequence_labeling.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/polish_sequence_labeling.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/presuppositions_as_nli.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/presuppositions_as_nli.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/qa_wikidata.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/qa_wikidata.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/question_selection.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/question_selection.yaml