resolved conflict

c0d5a660 · lintangsutawika · f7b81bd4 · 0d1ef037 · c0d5a660 · c0d5a660
Commit c0d5a660 authored Jan 17, 2024 by lintangsutawika
20 changed files
--- a/lm_eval/tasks/arithmetic/alternative_worlds/style_04/arithmetic_3ds.yaml
+++ b/lm_eval/tasks/arithmetic/alternative_worlds/style_04/arithmetic_3ds.yaml
--- a/lm_eval/tasks/arithmetic/alternative_worlds/style_04/arithmetic_4da.yaml
+++ b/lm_eval/tasks/arithmetic/alternative_worlds/style_04/arithmetic_4da.yaml
--- a/lm_eval/tasks/arithmetic/alternative_worlds/style_04/arithmetic_4ds.yaml
+++ b/lm_eval/tasks/arithmetic/alternative_worlds/style_04/arithmetic_4ds.yaml
--- a/lm_eval/tasks/arithmetic/alternative_worlds/style_04/arithmetic_5da.yaml
+++ b/lm_eval/tasks/arithmetic/alternative_worlds/style_04/arithmetic_5da.yaml
--- a/lm_eval/tasks/arithmetic/alternative_worlds/style_04/arithmetic_5ds.yaml
+++ b/lm_eval/tasks/arithmetic/alternative_worlds/style_04/arithmetic_5ds.yaml
--- a/lm_eval/tasks/arithmetic/alternative_worlds/style_05/_template_05_yaml
+++ b/lm_eval/tasks/arithmetic/alternative_worlds/style_05/_template_05_yaml
--- a/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_1dc.yaml
+++ b/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_1dc.yaml
--- a/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_2da.yaml
+++ b/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_2da.yaml
--- a/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_2dm.yaml
+++ b/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_2dm.yaml
--- a/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_2ds.yaml
+++ b/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_2ds.yaml
--- a/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_3da.yaml
+++ b/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_3da.yaml
--- a/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_3ds.yaml
+++ b/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_3ds.yaml
--- a/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_4da.yaml
+++ b/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_4da.yaml
--- a/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_4ds.yaml
+++ b/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_4ds.yaml
--- a/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_5da.yaml
+++ b/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_5da.yaml
--- a/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_5ds.yaml
+++ b/lm_eval/tasks/arithmetic/alternative_worlds/style_05/arithmetic_5ds.yaml
--- a/lm_eval/tasks/arithmetic/alternative_worlds/utils.py
+++ b/lm_eval/tasks/arithmetic/alternative_worlds/utils.py
--- a/lm_eval/tasks/bbh/alternative_worlds/README.md
+++ b/lm_eval/tasks/bbh/alternative_worlds/README.md
--- a/lm_eval/tasks/bbh/alternative_worlds/prompt_variation/bbh_alt_pv_zeroshot.yaml
+++ b/lm_eval/tasks/bbh/alternative_worlds/prompt_variation/bbh_alt_pv_zeroshot.yaml
--- a/lm_eval/tasks/bbh/alternative_worlds/prompt_variation/style_01/zeroshot/_zeroshot_template_yaml
+++ b/lm_eval/tasks/bbh/alternative_worlds/prompt_variation/style_01/zeroshot/_zeroshot_template_yaml