From 6f1f1a1231134b7a3ea32fd235787d7040ae66b6 Mon Sep 17 00:00:00 2001 From: bokajgd Date: Tue, 5 Sep 2023 16:00:27 +0200 Subject: [PATCH] fix: eval paths --- .../forced_admission_inpatient/model_eval/config.py | 6 +++--- .../forced_admission_inpatient/model_evaluation/config.py | 2 +- .../model_training/config/data/default_data.yaml | 2 +- .../model_training/config/project/default_project.yaml | 2 +- .../projects/forced_admission_inpatient/utils/best_runs.py | 2 +- .../forced_admission_inpatient/utils/pipeline_objects.py | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/psycop/projects/forced_admission_inpatient/model_eval/config.py b/psycop/projects/forced_admission_inpatient/model_eval/config.py index 8c96d6c50..1d68bc6a1 100644 --- a/psycop/projects/forced_admission_inpatient/model_eval/config.py +++ b/psycop/projects/forced_admission_inpatient/model_eval/config.py @@ -9,17 +9,17 @@ ######################################## # UPDATE THESE TO SELECT MODEL OUTPUTS # ######################################## -MODEL_NAME = "full_model_with_sentence_transformer_and_tfidf_all_sfis_ngram_range_12_max_df_095_min_df_2_max_features_750_embeddings" +MODEL_NAME = "full_model_without_text_features" PROJECT_MODEL_DIR = Path( f"E:/shared_resources/forced_admissions_inpatient/models/{MODEL_NAME}/pipeline_eval", ) -DEV_GROUP_NAME = "gainset-imbitterment" +DEV_GROUP_NAME = "gavial-foresaid" DEVELOPMENT_GROUP = RunGroup(model_name=MODEL_NAME, group_name=DEV_GROUP_NAME) BEST_POS_RATE = 0.05 EVAL_GROUP_NAME = f"{DEV_GROUP_NAME}-eval-on-test" -EVAL_GROUP = RunGroup(model_name=MODEL_NAME, group_name=DEV_GROUP_NAME) +EVAL_GROUP = RunGroup(model_name=MODEL_NAME, group_name=EVAL_GROUP_NAME) ################ # OUTPUT PATHS # diff --git a/psycop/projects/forced_admission_inpatient/model_evaluation/config.py b/psycop/projects/forced_admission_inpatient/model_evaluation/config.py index b065bacc3..81173d9b0 100644 --- a/psycop/projects/forced_admission_inpatient/model_evaluation/config.py +++ b/psycop/projects/forced_admission_inpatient/model_evaluation/config.py @@ -19,7 +19,7 @@ class BestRun: POS_RATE = 0.05 -DEV_GROUP_NAME = "ventripyramid-ampullulae" +DEV_GROUP_NAME = "gavial-foresaid" DEVELOPMENT_GROUP = RunGroup(name=DEV_GROUP_NAME) diff --git a/psycop/projects/forced_admission_inpatient/model_training/config/data/default_data.yaml b/psycop/projects/forced_admission_inpatient/model_training/config/data/default_data.yaml index 51efb2e86..8334211e7 100644 --- a/psycop/projects/forced_admission_inpatient/model_training/config/data/default_data.yaml +++ b/psycop/projects/forced_admission_inpatient/model_training/config/data/default_data.yaml @@ -1,7 +1,7 @@ # @package _global_ data: # General config - dir: E:\shared_resources\forced_admissions_inpatient\flattened_datasets\full_feature_set_with_sent_transformer_and_tfidf_all_sfis_ngram_range_12_max_df_095_min_df_2_max_features_750_embeddings\ + dir: E:\shared_resources\forced_admissions_inpatient\flattened_datasets\full_feature_set_without_text\ suffix: parquet splits_for_training: ["train"] splits_for_evaluation: null diff --git a/psycop/projects/forced_admission_inpatient/model_training/config/project/default_project.yaml b/psycop/projects/forced_admission_inpatient/model_training/config/project/default_project.yaml index e8317ccac..719d6a43f 100644 --- a/psycop/projects/forced_admission_inpatient/model_training/config/project/default_project.yaml +++ b/psycop/projects/forced_admission_inpatient/model_training/config/project/default_project.yaml @@ -1,5 +1,5 @@ name: forced_admissions_inpatient -project_path: E:\shared_resources\forced_admissions_inpatient\full_model_with_sentence_transformer_and_tfidf_all_sfis_ngram_range_12_max_df_095_min_df_2_max_features_750_embeddings +project_path: E:\shared_resources\forced_admissions_inpatient\models\full_model_without_text_features seed: 42 wandb: diff --git a/psycop/projects/forced_admission_inpatient/utils/best_runs.py b/psycop/projects/forced_admission_inpatient/utils/best_runs.py index 4df4b3d71..2903d875a 100644 --- a/psycop/projects/forced_admission_inpatient/utils/best_runs.py +++ b/psycop/projects/forced_admission_inpatient/utils/best_runs.py @@ -20,7 +20,7 @@ class RunGroup: @property def group_dir(self) -> Path: return Path( - f"E:/shared_resources/forced_admissions_inpatient/full_model_with_sentence_transformer_and_tfidf_all_sfis_ngram_range_12_max_df_095_min_df_2_max_features_750_embeddings/pipeline_eval/{self.name}", + f"E:/shared_resources/forced_admissions_inpatient/models/full_model_without_text_features/pipeline_eval/{self.name}", ) @property diff --git a/psycop/projects/forced_admission_inpatient/utils/pipeline_objects.py b/psycop/projects/forced_admission_inpatient/utils/pipeline_objects.py index abf52e12b..f4284f916 100644 --- a/psycop/projects/forced_admission_inpatient/utils/pipeline_objects.py +++ b/psycop/projects/forced_admission_inpatient/utils/pipeline_objects.py @@ -152,7 +152,7 @@ def __init__(self, artifact_path: Path, create_output_paths_on_init: bool = True if create_output_paths_on_init: for path in [self.artifact, self.tables, self.figures, self.estimates]: - path.mkdir(parents=False, exist_ok=True) + path.mkdir(parents=True, exist_ok=True) class PaperOutputSettings: