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_fewshot/temporal_sequences.yaml
+++ b/lm_eval/tasks/bbh/flan_fewshot/temporal_sequences.yaml
--- a/lm_eval/tasks/bbh/flan_fewshot/tracking_shuffled_objects_five_objects.yaml
+++ b/lm_eval/tasks/bbh/flan_fewshot/tracking_shuffled_objects_five_objects.yaml
--- a/lm_eval/tasks/bbh/flan_fewshot/tracking_shuffled_objects_seven_objects.yaml
+++ b/lm_eval/tasks/bbh/flan_fewshot/tracking_shuffled_objects_seven_objects.yaml
--- a/lm_eval/tasks/bbh/flan_fewshot/tracking_shuffled_objects_three_objects.yaml
+++ b/lm_eval/tasks/bbh/flan_fewshot/tracking_shuffled_objects_three_objects.yaml
--- a/lm_eval/tasks/bbh/flan_fewshot/web_of_lies.yaml
+++ b/lm_eval/tasks/bbh/flan_fewshot/web_of_lies.yaml
--- a/lm_eval/tasks/bbh/flan_fewshot/word_sorting.yaml
+++ b/lm_eval/tasks/bbh/flan_fewshot/word_sorting.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/_flan_zeroshot_template_yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/_flan_zeroshot_template_yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/boolean_expressions.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/boolean_expressions.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/causal_judgement.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/causal_judgement.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/date_understanding.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/date_understanding.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/disambiguation_qa.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/disambiguation_qa.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/dyck_languages.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/dyck_languages.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/formal_fallacies.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/formal_fallacies.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/geometric_shapes.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/geometric_shapes.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/hyperbaton.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/hyperbaton.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/logical_deduction_five_objects.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/logical_deduction_five_objects.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/logical_deduction_seven_objects.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/logical_deduction_seven_objects.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/logical_deduction_three_objects.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/logical_deduction_three_objects.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/movie_recommendation.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/movie_recommendation.yaml
--- a/lm_eval/tasks/bbh/flan_zeroshot/multistep_arithmetic_two.yaml
+++ b/lm_eval/tasks/bbh/flan_zeroshot/multistep_arithmetic_two.yaml