Skip to content

Commit

Permalink
Fix training UI (computational-cell-analytics#763)
Browse files Browse the repository at this point in the history 
Fix training UI
  • Loading branch information
@anwai98 @titusgriebel
anwai98 authored and titusgriebel committed Nov 22, 2024
1 parent e17f77f commit c5f3bf7
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
6 changes: 3 additions & 3 deletions micro_sam/sam_annotator/_widgets.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,20 +145,20 @@ def _add_choice_param(self, name, value, options, title=None, layout=None, updat
layout.addWidget(dropdown)
return dropdown, layout

def _add_shape_param(self, names, values, min_val, max_val, step=1, tooltip=None):
def _add_shape_param(self, names, values, min_val, max_val, step=1, title=None, tooltip=None):
layout = QtWidgets.QHBoxLayout()

x_layout = QtWidgets.QVBoxLayout()
x_param, _ = self._add_int_param(
names[0], values[0], min_val=min_val, max_val=max_val, layout=x_layout, step=step,
tooltip=tooltip
title=title[0] if title is not None else title, tooltip=tooltip
)
layout.addLayout(x_layout)

y_layout = QtWidgets.QVBoxLayout()
y_param, _ = self._add_int_param(
names[1], values[1], min_val=min_val, max_val=max_val, layout=y_layout, step=step,
tooltip=tooltip
title=title[1] if title is not None else title, tooltip=tooltip
)
layout.addLayout(y_layout)

Expand Down
38 changes: 19 additions & 19 deletions micro_sam/sam_annotator/training_ui.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,42 +54,42 @@ def __init__(self, parent=None):
def _create_options(self):
self.raw_path = None
_, layout = self._add_path_param(
"Path to images", self.raw_path, "both", placeholder="/path/to/images",
"raw_path", self.raw_path, "both", placeholder="/path/to/images", title="Path to images",
tooltip=get_tooltip("training", "raw_path")
)
self.layout().addLayout(layout)

self.raw_key = None
_, layout = self._add_string_param(
"Image data key", self.raw_key, placeholder="e.g. \"*.tif\"",
"raw_key", self.raw_key, placeholder="e.g. \"*.tif\"", title="Image data key",
tooltip=get_tooltip("training", "raw_key")
)
self.layout().addLayout(layout)

self.label_path = None
_, layout = self._add_path_param(
"Path to labels", self.label_path, "both", placeholder="/path/to/labels",
"label_path", self.label_path, "both", placeholder="/path/to/labels", title="Path to labels",
tooltip=get_tooltip("training", "label_path")
)
self.layout().addLayout(layout)

self.label_key = None
_, layout = self._add_string_param(
"Label data key", self.label_key, placeholder="e.g. \"*.tif\"",
"label_key", self.label_key, placeholder="e.g. \"*.tif\"", title="Label data key",
tooltip=get_tooltip("training", "label_key")
)
self.layout().addLayout(layout)

self.configuration = _find_best_configuration()
self.setting_dropdown, layout = self._add_choice_param(
"Configuration", self.configuration, list(CONFIGURATIONS.keys()),
"configuration", self.configuration, list(CONFIGURATIONS.keys()), title="Configuration",
tooltip=get_tooltip("training", "configuration")
)
self.layout().addLayout(layout)

self.with_segmentation_decoder = True
self.layout().addWidget(self._add_boolean_param(
"With segmentation decoder", self.with_segmentation_decoder,
"with_segmentation_decoder", self.with_segmentation_decoder, title="With segmentation decoder",
tooltip=get_tooltip("training", "segmentation_decoder")
))

Expand All @@ -102,62 +102,62 @@ def _create_settings(self):
self.device = "auto"
device_options = ["auto"] + util._available_devices()
self.device_dropdown, layout = self._add_choice_param(
"Device", self.device, device_options, tooltip=get_tooltip("training", "device")
"device", self.device, device_options, title="Device", tooltip=get_tooltip("training", "device")
)
setting_values.layout().addLayout(layout)

self.patch_x, self.patch_y = 512, 512
self.patch_x_param, self.patch_y_param, layout = self._add_shape_param(
("Patch size x", "Patch size y"), (self.patch_x, self.patch_y), min_val=0, max_val=2048,
tooltip=get_tooltip("training", "patch")
("patch_x", "patch_y"), (self.patch_x, self.patch_y), min_val=0, max_val=2048,
tooltip=get_tooltip("training", "patch"), title=("Patch size x", "Patch size y")
)
setting_values.layout().addLayout(layout)

# Paths for validation data.
self.raw_path_val = None
_, layout = self._add_path_param(
"Path to validation images", self.raw_path_val, "both", placeholder="/path/to/images",
tooltip=get_tooltip("training", "raw_path_val")
"raw_path_val", self.raw_path_val, "both", placeholder="/path/to/images",
title="Path to validation images", tooltip=get_tooltip("training", "raw_path_val")
)
setting_values.layout().addLayout(layout)

self.label_path_val = None
_, layout = self._add_path_param(
"Path to validation labels", self.label_path_val, "both", placeholder="/path/to/images",
tooltip=get_tooltip("training", "label_path_val")
"label_path_val", self.label_path_val, "both", placeholder="/path/to/images",
title="Path to validation labels", tooltip=get_tooltip("training", "label_path_val")
)
setting_values.layout().addLayout(layout)

# Name of the model to be trained and options to over-ride the initial model
# on top of which the finetuning is run.
self.name = "sam_model"
self.name_param, layout = self._add_string_param(
"Model name", self.name, tooltip=get_tooltip("training", "name")
"name", self.name, title="Model name", tooltip=get_tooltip("training", "name")
)
setting_values.layout().addLayout(layout)

self.initial_model = None
self.initial_model_param, layout = self._add_string_param(
"Initial model", self.initial_model, tooltip=get_tooltip("training", "initial_model")
"initial_model", self.initial_model, title="Initial model", tooltip=get_tooltip("training", "initial_model")
)
setting_values.layout().addLayout(layout)

self.checkpoint = None
self.checkpoint_param, layout = self._add_string_param(
"Checkpoint", self.name, tooltip=get_tooltip("training", "checkpoint")
"checkpoint", self.name, title="Checkpoint", tooltip=get_tooltip("training", "checkpoint")
)
setting_values.layout().addLayout(layout)

self.output_path = None
self.output_path_param, layout = self._add_string_param(
"Output Path", self.output_path, tooltip=get_tooltip("training", "output_path")
"output_path", self.output_path, title="Output Path", tooltip=get_tooltip("training", "output_path")
)
setting_values.layout().addLayout(layout)

self.n_epochs = 100
self.n_epochs_param, layout = self._add_int_param(
"Number of epochs", self.n_epochs, tooltip=get_tooltip("training", "n_epochs"),
min_val=1, max_val=1000,
"n_epochs", self.n_epochs, title="Number of epochs", min_val=1, max_val=1000,
tooltip=get_tooltip("training", "n_epochs"),
)
setting_values.layout().addLayout(layout)

Expand Down

0 comments on commit c5f3bf7

Please sign in to comment.