Fix for 0 windows

cvlab-ai · Jan 9, 2023 · 5d90f44 · 5d90f44
1 parent a9c1e8f
commit 5d90f44
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/config_factory.py b/src/config_factory.py
@@ -71,10 +71,11 @@ def config_factory(
     :return:
     """
     layer = get_layer(special_layer, n_windows, window_widths, window_centers)
+    n_channels = 1 if layer is None else n_windows
     if mode == ConfigMode.TRAIN:
         return TrainingConfig(
             custom_layer=layer,
-            n_channels=n_windows,
+            n_channels=n_channels,
             batch_size=batch_size,
             epochs=epochs,
             learning_rate=learning_rate,
@@ -85,7 +86,7 @@ def config_factory(
     elif mode == ConfigMode.TEST:
         return TestingConfig(
             custom_layer=layer,
-            n_channels=n_windows,
+            n_channels=n_channels,
             batch_size=batch_size,
             use_batchnorm=use_batch_norm,
             multiclass=multiclass,

diff --git a/src/process_tensorboard.py b/src/process_tensorboard.py
@@ -11,22 +11,22 @@
     "This notebook requires TensorBoard 2.3 or later."
 print("TensorBoard version: ", tb.__version__)
 
-experiment_id = "85t0twQZQkCp8ahXn60Ubw"
+experiment_id = "OEIe2ae3T7mIdXyuXDE3hg"
 experiment = tb.data.experimental.ExperimentFromDev(experiment_id)
 df = experiment.get_scalars()
 
 last_step = df['step'].max()
 
-df = df[df["step"].eq(last_step) | df["tag"].str.contains("test")]
+df = df[df["run"].str.contains("_single-window") & (df["step"].eq(last_step) | df["tag"].str.contains("test"))]
 
 df = df.loc[
      df["tag"].str.contains("test-dice")
      | df["tag"].str.contains("window")
 ]
 
-ww_regex = re.compile(r"ww-\[(-?\d+)\]")
-wl_regex = re.compile(r"wl-\[(-?\d+)\]")
-fold_regex = re.compile(r"fold-(\d+)")
+ww_regex = re.compile(r"ww-\[(-?(\d+)?)\]")
+wl_regex = re.compile(r"wl-\[(-?(\d+)?)\]")
+fold_regex = re.compile(r"fold-((\d+)?)")
 
 df = df.pivot(index="run", columns="tag", values="value")
 
@@ -35,5 +35,6 @@
 df["fold"] = df.apply(lambda row: fold_regex.search(row.name).group(1), axis=1)
 
 df = df[["fold", "window_width_init", "window_center_init", "test-dice", "test-dice_liver", "test-dice_tumor", "window-0-width", "window-0-center"]]
+# df = df[["fold", "window_width_init", "window_center_init", "test-dice", "test-dice_liver", "test-dice_tumor", "window-0-width", "window-0-center", "window-1-width", "window-1-center", "window-2-width", "window-2-center", "window-3-width", "window-3-center", "window-4-width", "window-4-center"]]
 
 df.to_excel("out.xlsx")