resolved merge conflict from latest version

3e1301bb · lintangsutawika · fd9cd80f · 070d31df · 3e1301bb · 3e1301bb
Commit 3e1301bb authored Jun 04, 2024 by lintangsutawika
19 changed files
--- a/lm_eval/tasks/unitxt/unitxt_tasks.span_labeling.extraction
+++ b/lm_eval/tasks/unitxt/unitxt_tasks.span_labeling.extraction
--- a/lm_eval/tasks/unitxt/unitxt_tasks.summarization.abstractive
+++ b/lm_eval/tasks/unitxt/unitxt_tasks.summarization.abstractive
--- a/lm_eval/tasks/unitxt/unitxt_wrapper.py
+++ b/lm_eval/tasks/unitxt/unitxt_wrapper.py
--- a/lm_eval/tasks/unitxt/xsum.yaml
+++ b/lm_eval/tasks/unitxt/xsum.yaml
--- a/lm_eval/tasks/unitxt/yahoo_answers_topics.yaml
+++ b/lm_eval/tasks/unitxt/yahoo_answers_topics.yaml
--- a/lm_eval/utils.py
+++ b/lm_eval/utils.py
--- a/pyproject.toml
+++ b/pyproject.toml
--- a/tests/models/test_gguf.py
+++ b/tests/models/test_gguf.py
--- a/tests/models/test_huggingface.py
+++ b/tests/models/test_huggingface.py
--- a/tests/models/test_neuralmagic.py
+++ b/tests/models/test_neuralmagic.py
--- a/tests/models/test_openvino.py
+++ b/tests/models/test_openvino.py
--- a/tests/models/test_vllm.py
+++ b/tests/models/test_vllm.py
--- a/tests/test_evaluator.py
+++ b/tests/test_evaluator.py
--- a/tests/test_janitor.py
+++ b/tests/test_janitor.py
--- a/tests/test_requests_caching.py
+++ b/tests/test_requests_caching.py
--- a/tests/test_tasks.py
+++ b/tests/test_tasks.py
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
--- a/tests/testyamls/test-01.yaml
+++ b/tests/testyamls/test-01.yaml
--- a/tests/utils.py
+++ b/tests/utils.py