diff --git a/src/lighteval/logging/evaluation_tracker.py b/src/lighteval/logging/evaluation_tracker.py index 976b21c86..dbddb2a58 100644 --- a/src/lighteval/logging/evaluation_tracker.py +++ b/src/lighteval/logging/evaluation_tracker.py @@ -305,7 +305,7 @@ def save_results(self, date_id: str, results_dict: dict): org = org_model_parts[0] if len(org_model_parts) >= 2 else "" model = org_model_parts[1] if len(org_model_parts) >= 2 else org_model_parts[0] output_dir = self.output_dir - output_dir_results = Path(self.results_path_template.format(output_dir=output_dir, org=org, model=model)) + output_dir_results = Path(self.results_path_template.format(output_dir=output_dir, org=org, model=model)) / "results" else: output_dir_results = Path(self.output_dir) / "results" / self.general_config_logger.model_name.strip("/") self.fs.mkdirs(output_dir_results, exist_ok=True) @@ -315,7 +315,15 @@ def save_results(self, date_id: str, results_dict: dict): f.write(json.dumps(results_dict, cls=EnhancedJSONEncoder, indent=2, ensure_ascii=False)) def _get_details_sub_folder(self, date_id: str): - output_dir_details = Path(self.output_dir) / "details" / self.general_config_logger.model_name.strip("/") + if self.results_path_template is not None: + org_model_parts = self.general_config_logger.model_name.split("/") + org = org_model_parts[0] if len(org_model_parts) >= 2 else "" + model = org_model_parts[1] if len(org_model_parts) >= 2 else org_model_parts[0] + output_dir = self.output_dir + output_dir_details = Path(self.results_path_template.format(output_dir=output_dir, org=org, model=model)) / "details" + else: + output_dir_details = Path(self.output_dir) / "details" / self.general_config_logger.model_name.strip("/") + if date_id in ["first", "last"]: # Get all folders in output_dir_details if not self.fs.exists(output_dir_details): @@ -747,4 +755,4 @@ def push_to_tensorboard( # noqa: C901 logger.info( f"Pushed to tensorboard at https://huggingface.co/{self.tensorboard_repo}/{output_dir_tb}/tensorboard" f" at global_step {global_step}" - ) + ) \ No newline at end of file