From 621fafda97452a0e35d3066101eed8fbceb3482d Mon Sep 17 00:00:00 2001 From: Mingxin Zheng <18563433+mingxin-zheng@users.noreply.github.com> Date: Wed, 7 Dec 2022 01:01:02 +0800 Subject: [PATCH 1/2] fix 5665 Signed-off-by: Mingxin Zheng <18563433+mingxin-zheng@users.noreply.github.com> --- monai/apps/auto3dseg/auto_runner.py | 12 ++++++++++-- tests/test_integration_autorunner.py | 10 ++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/monai/apps/auto3dseg/auto_runner.py b/monai/apps/auto3dseg/auto_runner.py index 8fe9fd3a758..6bb9182924e 100644 --- a/monai/apps/auto3dseg/auto_runner.py +++ b/monai/apps/auto3dseg/auto_runner.py @@ -265,14 +265,16 @@ def __init__( self.ensemble = ensemble # last step, no need to check # intermediate variables - self.set_num_fold(num_fold=5) + self.num_fold = 5 + self.ensemble_method_name = "AlgoEnsembleBestN" self.set_training_params() self.set_prediction_params() self.set_analyze_params() self.save_image = self.set_image_save_transform(kwargs) self.ensemble_method: AlgoEnsemble - self.set_ensemble_method() + self.set_ensemble_method(self.ensemble_method_name) + self.set_num_fold(num_fold=self.num_fold) # hpo if hpo_backend.lower() != "nni": @@ -334,10 +336,16 @@ def set_num_fold(self, num_fold: int = 5): Args: num_fold: a positive integer to define the number of folds. + + Notes: + If the ensemble method is ``AlgoEnsembleBestByFold``, this function automatically updates the ``n_fold`` + parameter in the ``ensemble_method`` to avoid inconsistency between the training and the ensemble. """ if num_fold <= 0: raise ValueError(f"num_fold is expected to be an integer greater than zero. Now it gets {num_fold}") self.num_fold = num_fold + if self.ensemble_method_name == "AlgoEnsembleBestByFold": + self.ensemble_method.n_fold = self.num_fold def set_training_params(self, params: Optional[Dict[str, Any]] = None): """ diff --git a/tests/test_integration_autorunner.py b/tests/test_integration_autorunner.py index f62a8563b90..7e7f2bf35fc 100644 --- a/tests/test_integration_autorunner.py +++ b/tests/test_integration_autorunner.py @@ -107,6 +107,16 @@ def test_autorunner(self) -> None: with skip_if_downloading_fails(): runner.run() + @skip_if_no_cuda + def test_autorunner_ensemble(self) -> None: + work_dir = os.path.join(self.test_path, "work_dir") + runner = AutoRunner(work_dir=work_dir, input=self.data_src_cfg) + runner.set_training_params(train_param) # 2 epochs + runner.set_ensemble_method("AlgoEnsembleBestByFold") + runner.set_num_fold(1) + with skip_if_downloading_fails(): + runner.run() + @skip_if_no_cuda @unittest.skipIf(not has_nni, "nni required") def test_autorunner_hpo(self) -> None: From b3d833bb7a8e8cae89befeafe8b01f89d4885efb Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Tue, 6 Dec 2022 20:29:16 +0000 Subject: [PATCH 2/2] fixes #5669 Signed-off-by: Wenqi Li --- monai/apps/auto3dseg/auto_runner.py | 2 +- setup.cfg | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/monai/apps/auto3dseg/auto_runner.py b/monai/apps/auto3dseg/auto_runner.py index 6bb9182924e..86e3197e73b 100644 --- a/monai/apps/auto3dseg/auto_runner.py +++ b/monai/apps/auto3dseg/auto_runner.py @@ -345,7 +345,7 @@ def set_num_fold(self, num_fold: int = 5): raise ValueError(f"num_fold is expected to be an integer greater than zero. Now it gets {num_fold}") self.num_fold = num_fold if self.ensemble_method_name == "AlgoEnsembleBestByFold": - self.ensemble_method.n_fold = self.num_fold + self.ensemble_method.n_fold = self.num_fold # type: ignore def set_training_params(self, params: Optional[Dict[str, Any]] = None): """ diff --git a/setup.cfg b/setup.cfg index 0addf8ad0a9..df8526e2da6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -132,6 +132,7 @@ ignore = C408 N812 B023 + B905 per_file_ignores = __init__.py: F401, __main__.py: F401 exclude = *.pyi,.git,.eggs,monai/_version.py,versioneer.py,venv,.venv,_version.py