optima-ml 0.3.2a5.dev1__tar.gz → 0.3.3a1__tar.gz

{optima_ml-0.3.2a5.dev1 → optima_ml-0.3.3a1}/OPTIMA/builtin/evaluation.py

@@ -111,10 +111,10 @@ def evaluate(
 
     # create the output folders if they do not exist
     if not os.path.exists(fig_dir):
-        os.makedirs(fig_dir)
+        os.makedirs(fig_dir, exist_ok=True)
     if results_dir is not None:
         if not os.path.exists(results_dir):
-            os.makedirs(results_dir)
+            os.makedirs(results_dir, exist_ok=True)
 
     # load the model and get the model predictions
     model = OPTIMA.core.model.load_model(run_config, model_path, cpus)

{optima_ml-0.3.2a5.dev1 → optima_ml-0.3.3a1}/OPTIMA/builtin/inputs.py

@@ -755,7 +755,7 @@ def plot_input_data(
         ax.set_xlabel(var)
         ax.legend()
         if not os.path.exists(outdir):
-            os.makedirs(outdir)
+            os.makedirs(outdir, exist_ok=True)
         fig.savefig(os.path.join(outdir, "inputs_{}.pdf".format(var)))
         plt.close()
 

{optima_ml-0.3.2a5.dev1 → optima_ml-0.3.3a1}/OPTIMA/core/evaluation.py

@@ -216,7 +216,7 @@ def evaluate_experiment(
     if not os.path.isfile(os.path.join(results_dir, "evaluation.pickle")):
         # create the results directory if not present
         if not os.path.exists(results_dir):
-            os.makedirs(results_dir)
+            os.makedirs(results_dir, exist_ok=True)
 
         # build a list containing the names of all metrics, grouped together like [[train_loss, val_loss], [train_accuracy, val_accuracy], ...]
         metric_names = []
@@ -364,17 +364,18 @@ def evaluate_experiment(
                     break
             model_configs_to_evaluate.append(model_config_to_evaluate)
 
-            # round the config where necessary (in the same way as during the optimization), and add the hyperparameters to
-            # the dataframe containing the configs of the best trials
+            # Add the hyperparameters to the dataframe containing the configs of the best trials. For hierarchical
+            # search spaces, not all hyperparameters must have a value, so insert "-" for those
             model_config = model_configs_to_evaluate[-1]
             for hp in model_configs_df.index:
-                model_configs_df.loc[hp, metric] = model_config[hp]
+                hp_value = model_config.get(hp)
+                model_configs_df.loc[hp, metric] = hp_value if hp_value is not None else "-"
 
             # create the target folder for the following crossvalidation
             target_folder = os.path.join(results_dir, metric if len(best_trials.index) > 1 else "", "best_value")
             dirs_to_evaluate.append(target_folder)  # mark target_folder to be evaluated later
             if not os.path.exists(target_folder):
-                os.makedirs(target_folder)
+                os.makedirs(target_folder, exist_ok=True)
 
         # then the results from the fit
         if not skip_fit_evaluation:
@@ -394,11 +395,12 @@ def evaluate_experiment(
                 model_configs_to_evaluate.append(model_config_to_evaluate)
                 model_config = model_configs_to_evaluate[-1]
                 for hp in model_configs_df.index:
-                    model_configs_df.loc[hp, f"{metric} fit"] = model_config[hp]
+                    hp_value = model_config.get(hp)
+                    model_configs_df.loc[hp, f"{metric} fit"] = hp_value if hp_value is not None else "-"
                 target_folder = os.path.join(results_dir, metric if len(best_trials_fit.index) > 1 else "", "best_fit")
                 dirs_to_evaluate.append(target_folder)  # mark target_folder to be evaluated later
                 if not os.path.exists(target_folder):
-                    os.makedirs(target_folder)
+                    os.makedirs(target_folder, exist_ok=True)
 
         optimization_results_string += tabulate.tabulate(
             model_configs_df,
@@ -915,7 +917,7 @@ def draw_total_progress(dfs, optimize_name, optimize_op, metric_names, figs_dir=
         plt.tight_layout()
         if figs_dir is not None:
             if not os.path.exists(os.path.join(figs_dir, "overview_plots")):
-                os.makedirs(os.path.join(figs_dir, "overview_plots"))
+                os.makedirs(os.path.join(figs_dir, "overview_plots"), exist_ok=True)
             plt.savefig(os.path.join(figs_dir, "overview_plots", "{}.png".format("+".join(metric_group))), dpi=600)
         else:
             plt.show()
@@ -956,7 +958,7 @@ def draw_total_progress(dfs, optimize_name, optimize_op, metric_names, figs_dir=
             plt.tight_layout()
             if figs_dir is not None:
                 if not os.path.exists(os.path.join(figs_dir, "progress_plots")):
-                    os.makedirs(os.path.join(figs_dir, "progress_plots"))
+                    os.makedirs(os.path.join(figs_dir, "progress_plots"), exist_ok=True)
                 plt.savefig(
                     os.path.join(
                         figs_dir,
@@ -1088,7 +1090,8 @@ def get_best_trials(dfs, optimize_name, optimize_op, metric_names, figs_dir=None
                             "best_value",
                             "plots",
                             "optimization",
-                        )
+                        ),
+                        exist_ok=True,
                     )
                 plt.savefig(
                     os.path.join(
@@ -1663,7 +1666,7 @@ def get_best_trials_from_fit(
 
                 if figs_dir is not None:
                     if not os.path.exists(figs_dir):
-                        os.makedirs(figs_dir)
+                        os.makedirs(figs_dir, exist_ok=True)
                     plt.gcf().set_figheight(6)
                     plt.gcf().set_figwidth(8)
                     plt.tight_layout()
@@ -1704,7 +1707,7 @@ def get_best_trials_from_fit(
 
                 if figs_dir is not None:
                     if not os.path.exists(figs_dir):
-                        os.makedirs(figs_dir)
+                        os.makedirs(figs_dir, exist_ok=True)
                     plt.gcf().set_figheight(6)
                     plt.gcf().set_figwidth(8)
                     plt.tight_layout()
@@ -1809,7 +1812,8 @@ def get_best_trials_from_fit(
                             "best_fit",
                             "plots",
                             "optimization",
-                        )
+                        ),
+                        exist_ok=True,
                     )
                 plt.savefig(
                     os.path.join(