Rename lm_eval.logging -> lm_eval.loggers (EleutherAI#1858)

* rename lm_eval.logging module * fix evaluation tracker args
steven-safeai · May 31, 2024 · 879409a · 879409a
1 parent db2a8f0
commit 879409a
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/lm_eval/__main__.py b/lm_eval/__main__.py
@@ -8,7 +8,7 @@
 
 from lm_eval import evaluator, utils
 from lm_eval.evaluator import request_caching_arg_to_dict
-from lm_eval.logging import EvaluationTracker, WandbLogger
+from lm_eval.loggers import EvaluationTracker, WandbLogger
 from lm_eval.tasks import TaskManager
 from lm_eval.utils import handle_non_serializable, make_table, simple_parse_args_string
 
@@ -255,7 +255,10 @@ def cli_evaluate(args: Union[argparse.Namespace, None] = None) -> None:
     os.environ["TOKENIZERS_PARALLELISM"] = "false"
 
     # update the evaluation tracker args with the output path and the HF token
-    args.hf_hub_log_args = f"output_path={args.output_path},token={os.environ.get('HF_TOKEN')},{args.hf_hub_log_args}"
+    if args.output_path:
+        args.hf_hub_log_args += f",output_path={args.output_path}"
+    if os.environ.get("HF_TOKEN", None):
+        args.hf_hub_log_args += f",token={os.environ.get('HF_TOKEN')}"
     evaluation_tracker_args = simple_parse_args_string(args.hf_hub_log_args)
     evaluation_tracker = EvaluationTracker(**evaluation_tracker_args)
     evaluation_tracker.general_config_tracker.log_experiment_args(

diff --git a/lm_eval/evaluator.py b/lm_eval/evaluator.py
@@ -21,7 +21,7 @@
     print_writeout,
     run_task_tests,
 )
-from lm_eval.logging.utils import add_env_info, get_git_commit_hash
+from lm_eval.loggers.utils import add_env_info, get_git_commit_hash
 from lm_eval.tasks import TaskManager, get_task_dict
 from lm_eval.utils import (
     eval_logger,

diff --git a/lm_eval/logging/__init__.py → lm_eval/loggers/__init__.py b/lm_eval/logging/__init__.py → lm_eval/loggers/__init__.py
diff --git a/lm_eval/logging/evaluation_tracker.py → lm_eval/loggers/evaluation_tracker.py b/lm_eval/logging/evaluation_tracker.py → lm_eval/loggers/evaluation_tracker.py
diff --git a/lm_eval/logging/utils.py → lm_eval/loggers/utils.py b/lm_eval/logging/utils.py → lm_eval/loggers/utils.py
diff --git a/lm_eval/logging/wandb_logger.py → lm_eval/loggers/wandb_logger.py b/lm_eval/logging/wandb_logger.py → lm_eval/loggers/wandb_logger.py
@@ -7,7 +7,7 @@
 import pandas as pd
 from packaging.version import Version
 
-from lm_eval.logging.utils import _handle_non_serializable, remove_none_pattern
+from lm_eval.loggers.utils import _handle_non_serializable, remove_none_pattern
 
 
 logger = logging.getLogger(__name__)