resolved merge conflict

9f518392 · lintangsutawika · 37ccb191 · bf26d979 · 9f518392 · 9f518392
Commit 9f518392 authored Nov 28, 2023 by lintangsutawika
20 changed files
--- a/lm_eval/tasks/bbh/flan_zeroshot/navigate.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/navigate.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/object_counting.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/object_counting.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/penguins_in_a_table.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/penguins_in_a_table.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/reasoning_about_colored_objects.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/reasoning_about_colored_objects.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/ruin_names.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/ruin_names.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/salient_translation_error_detection.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/salient_translation_error_detection.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/snarks.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/snarks.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/sports_understanding.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/sports_understanding.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/temporal_sequences.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/temporal_sequences.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/tracking_shuffled_objects_five_objects.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/tracking_shuffled_objects_five_objects.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/tracking_shuffled_objects_seven_objects.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/tracking_shuffled_objects_seven_objects.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/tracking_shuffled_objects_three_objects.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/tracking_shuffled_objects_three_objects.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/web_of_lies.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/web_of_lies.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/word_sorting.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/word_sorting.yaml
--- a/lm_eval/tasks/bigbench/generate_until_template_yaml
+++ b/lm_eval/tasks/bigbench/generate_until_template_yaml
--- a/lm_eval/tasks/bigbench/multiple_choice_template_yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice_template_yaml
--- a/lm_eval/tasks/minerva_math/utils.py
+++ b/lm_eval/tasks/minerva_math/utils.py
--- a/lm_eval/tasks/realtoxicityprompts/metric.py
+++ b/lm_eval/tasks/realtoxicityprompts/metric.py
--- a/lm_eval/tasks/scrolls/README.md
+++ b/lm_eval/tasks/scrolls/README.md
--- a/lm_eval/tasks/scrolls/scrolls.yaml
+++ b/lm_eval/tasks/scrolls/scrolls.yaml