From 2a602f6a67558795335ff9fa0b7a88534d122543 Mon Sep 17 00:00:00 2001 From: Mingxin Zheng <18563433+mingxin-zheng@users.noreply.github.com> Date: Wed, 14 Dec 2022 15:08:05 +0800 Subject: [PATCH 1/4] remove hardcode signmoid for vote ensemble Signed-off-by: Mingxin Zheng <18563433+mingxin-zheng@users.noreply.github.com> --- monai/apps/auto3dseg/ensemble_builder.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/monai/apps/auto3dseg/ensemble_builder.py b/monai/apps/auto3dseg/ensemble_builder.py index 766dda41196..e3171c615ec 100644 --- a/monai/apps/auto3dseg/ensemble_builder.py +++ b/monai/apps/auto3dseg/ensemble_builder.py @@ -37,7 +37,7 @@ class AlgoEnsemble(ABC): def __init__(self): self.algos = [] - self.mode = "mean" + self.mode = "vote" self.infer_files = [] self.algo_ensemble = [] @@ -107,8 +107,11 @@ def ensemble_pred(self, preds, sigmoid=False): prob = MeanEnsemble()(preds) return prob2class(prob, dim=0, keepdim=True, sigmoid=sigmoid) elif self.mode == "vote": - classes = [prob2class(p, dim=0, keepdim=True, sigmoid=False) for p in preds] - return VoteEnsemble(num_classes=preds[0].shape[0])(classes) + classes = [prob2class(p, dim=0, keepdim=True, sigmoid=sigmoid) for p in preds] + if sigmoid: + return VoteEnsemble()(classes) # do not specify num_classes for one-hot encoding + else: + return VoteEnsemble(num_classes=preds[0].shape[0])(classes) def __call__(self, pred_param: Optional[Dict[str, Any]] = None): """ From 7f4270ec64a8929959ee72cbd17237e698d28b64 Mon Sep 17 00:00:00 2001 From: Mingxin Zheng <18563433+mingxin-zheng@users.noreply.github.com> Date: Wed, 14 Dec 2022 15:38:53 +0800 Subject: [PATCH 2/4] fix Signed-off-by: Mingxin Zheng <18563433+mingxin-zheng@users.noreply.github.com> --- monai/apps/auto3dseg/ensemble_builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monai/apps/auto3dseg/ensemble_builder.py b/monai/apps/auto3dseg/ensemble_builder.py index e3171c615ec..66497750ccc 100644 --- a/monai/apps/auto3dseg/ensemble_builder.py +++ b/monai/apps/auto3dseg/ensemble_builder.py @@ -37,7 +37,7 @@ class AlgoEnsemble(ABC): def __init__(self): self.algos = [] - self.mode = "vote" + self.mode = "mean" self.infer_files = [] self.algo_ensemble = [] From 6cabe9af398fa75b428caf48a9652e9dcdd45f88 Mon Sep 17 00:00:00 2001 From: Mingxin Zheng <18563433+mingxin-zheng@users.noreply.github.com> Date: Wed, 14 Dec 2022 17:35:18 +0800 Subject: [PATCH 3/4] fix comment 5 Signed-off-by: Mingxin Zheng <18563433+mingxin-zheng@users.noreply.github.com> --- monai/apps/auto3dseg/ensemble_builder.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/monai/apps/auto3dseg/ensemble_builder.py b/monai/apps/auto3dseg/ensemble_builder.py index 66497750ccc..12f64fbc5ef 100644 --- a/monai/apps/auto3dseg/ensemble_builder.py +++ b/monai/apps/auto3dseg/ensemble_builder.py @@ -197,7 +197,8 @@ def collect_algos(self, n_best: int = -1): ranks = self.sort_score() if len(ranks) < n_best: - raise ValueError("Number of available algos is less than user-defined N") + warn(f"Found {len(ranks)} available algos (pre-defined n_best={n_best}). All {n_available} will be used.") + n_best = len(ranks) # get the indices that the rank is larger than N indices = [i for (i, r) in enumerate(ranks) if r >= n_best] From d16116638e2aac9d248e485bdf1dc2b5761a6a95 Mon Sep 17 00:00:00 2001 From: Mingxin Zheng <18563433+mingxin-zheng@users.noreply.github.com> Date: Wed, 14 Dec 2022 17:36:27 +0800 Subject: [PATCH 4/4] fix Signed-off-by: Mingxin Zheng <18563433+mingxin-zheng@users.noreply.github.com> --- monai/apps/auto3dseg/ensemble_builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monai/apps/auto3dseg/ensemble_builder.py b/monai/apps/auto3dseg/ensemble_builder.py index 12f64fbc5ef..c63658789b8 100644 --- a/monai/apps/auto3dseg/ensemble_builder.py +++ b/monai/apps/auto3dseg/ensemble_builder.py @@ -197,7 +197,7 @@ def collect_algos(self, n_best: int = -1): ranks = self.sort_score() if len(ranks) < n_best: - warn(f"Found {len(ranks)} available algos (pre-defined n_best={n_best}). All {n_available} will be used.") + warn(f"Found {len(ranks)} available algos (pre-defined n_best={n_best}). All {len(ranks)} will be used.") n_best = len(ranks) # get the indices that the rank is larger than N