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/bbh/fewshot/logical_deduction_three_objects.yaml
+++ b/lm_eval/tasks/bbh/fewshot/logical_deduction_three_objects.yaml
--- a/lm_eval/tasks/bbh/fewshot/movie_recommendation.yaml
+++ b/lm_eval/tasks/bbh/fewshot/movie_recommendation.yaml
--- a/lm_eval/tasks/bbh/fewshot/multistep_arithmetic_two.yaml
+++ b/lm_eval/tasks/bbh/fewshot/multistep_arithmetic_two.yaml
--- a/lm_eval/tasks/bbh/fewshot/navigate.yaml
+++ b/lm_eval/tasks/bbh/fewshot/navigate.yaml
--- a/lm_eval/tasks/bbh/fewshot/object_counting.yaml
+++ b/lm_eval/tasks/bbh/fewshot/object_counting.yaml
--- a/lm_eval/tasks/bbh/fewshot/penguins_in_a_table.yaml
+++ b/lm_eval/tasks/bbh/fewshot/penguins_in_a_table.yaml
--- a/lm_eval/tasks/bbh/fewshot/reasoning_about_colored_objects.yaml
+++ b/lm_eval/tasks/bbh/fewshot/reasoning_about_colored_objects.yaml
--- a/lm_eval/tasks/bbh/fewshot/ruin_names.yaml
+++ b/lm_eval/tasks/bbh/fewshot/ruin_names.yaml
--- a/lm_eval/tasks/bbh/fewshot/salient_translation_error_detection.yaml
+++ b/lm_eval/tasks/bbh/fewshot/salient_translation_error_detection.yaml
--- a/lm_eval/tasks/bbh/fewshot/snarks.yaml
+++ b/lm_eval/tasks/bbh/fewshot/snarks.yaml
--- a/lm_eval/tasks/bbh/fewshot/sports_understanding.yaml
+++ b/lm_eval/tasks/bbh/fewshot/sports_understanding.yaml
--- a/lm_eval/tasks/bbh/fewshot/temporal_sequences.yaml
+++ b/lm_eval/tasks/bbh/fewshot/temporal_sequences.yaml
--- a/lm_eval/tasks/bbh/fewshot/tracking_shuffled_objects_five_objects.yaml
+++ b/lm_eval/tasks/bbh/fewshot/tracking_shuffled_objects_five_objects.yaml
--- a/lm_eval/tasks/bbh/fewshot/tracking_shuffled_objects_seven_objects.yaml
+++ b/lm_eval/tasks/bbh/fewshot/tracking_shuffled_objects_seven_objects.yaml
--- a/lm_eval/tasks/bbh/fewshot/tracking_shuffled_objects_three_objects.yaml
+++ b/lm_eval/tasks/bbh/fewshot/tracking_shuffled_objects_three_objects.yaml
--- a/lm_eval/tasks/bbh/fewshot/web_of_lies.yaml
+++ b/lm_eval/tasks/bbh/fewshot/web_of_lies.yaml
--- a/lm_eval/tasks/bbh/fewshot/word_sorting.yaml
+++ b/lm_eval/tasks/bbh/fewshot/word_sorting.yaml
--- a/lm_eval/tasks/bigbench/generate_tasks.py
+++ b/lm_eval/tasks/bigbench/generate_tasks.py
--- a/lm_eval/tasks/bigbench/multiple_choice/abstract_narrative_understanding.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/abstract_narrative_understanding.yaml
 # Generated by utils.py
 dataset_name: abstract_narrative_understanding_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_abstract_narrative_understanding_multiple_choice
--- a/lm_eval/tasks/bigbench/multiple_choice/anachronisms.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/anachronisms.yaml
 # Generated by utils.py
 dataset_name: anachronisms_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_anachronisms_multiple_choice