Skip to content

Commit 8037fcd

Browse files
dongyang0122dongymingxin-zheng
authored
[Auto3DSeg] Update ALGO_BASH for support num_worker and test cases to reflect unification of epoch-based training (#5763)
Signed-off-by: dongy <[email protected]> ### Description - Update ALGO_HASH to support `num_workers` override - Update test cases. ### Types of changes <!--- Put an `x` in all the boxes that apply, and remove the not applicable items --> - [x] Non-breaking change (fix or new feature that would not break existing functionality). - [x] New tests added to cover the changes. - [x] Integration tests passed locally by running `./runtests.sh -f -u --net --coverage`. - [x] Quick tests passed locally by running `./runtests.sh --quick --unittests --disttests`. Signed-off-by: dongy <[email protected]> Co-authored-by: dongy <[email protected]> Co-authored-by: Mingxin Zheng <[email protected]>
1 parent a068209 commit 8037fcd

6 files changed

+19
-28
lines changed

CITATION.cff

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ preferred-citation:
4848
family-names: "Xu"
4949
- given-names: "Ali"
5050
family-names: "Hatamizadeh"
51-
- given-names: "Andriy"
52-
family-names: "Myronenko"
5351
- given-names: "Wentao"
5452
family-names: "Zhu"
5553
- given-names: "Yun"

monai/apps/auto3dseg/bundle_gen.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
from monai.utils import ensure_tuple
3333

3434
logger = get_logger(module_name=__name__)
35-
ALGO_HASH = os.environ.get("MONAI_ALGO_HASH", "c812e5f")
35+
ALGO_HASH = os.environ.get("MONAI_ALGO_HASH", "1dde7a1")
3636

3737
__all__ = ["BundleAlgo", "BundleGen"]
3838

tests/test_auto3dseg_ensemble.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,10 @@
4949
train_param = (
5050
{
5151
"CUDA_VISIBLE_DEVICES": list(range(num_gpus)),
52-
"num_iterations": int(4 / num_gpus),
53-
"num_iterations_per_validation": int(4 / num_gpus),
5452
"num_images_per_batch": 2,
55-
"num_epochs": 1,
56-
"num_warmup_iterations": int(4 / num_gpus),
53+
"num_epochs": 2,
54+
"num_epochs_per_validation": 1,
55+
"num_warmup_epochs": 1,
5756
"use_pretrain": False,
5857
"pretrained_path": "",
5958
}

tests/test_auto3dseg_hpo.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,10 @@
3333
override_param = (
3434
{
3535
"CUDA_VISIBLE_DEVICES": list(range(num_gpus)),
36-
"num_iterations": int(4 / num_gpus),
37-
"num_iterations_per_validation": int(4 / num_gpus),
3836
"num_images_per_batch": 2,
39-
"num_epochs": 1,
40-
"num_warmup_iterations": int(4 / num_gpus),
37+
"num_epochs": 2,
38+
"num_epochs_per_validation": 1,
39+
"num_warmup_epochs": 1,
4140
"use_pretrain": False,
4241
"pretrained_path": "",
4342
}

tests/test_integration_autorunner.py

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,10 @@
4949
train_param = (
5050
{
5151
"CUDA_VISIBLE_DEVICES": list(range(num_gpus)),
52-
"num_iterations": int(4 / num_gpus),
53-
"num_iterations_per_validation": int(4 / num_gpus),
5452
"num_images_per_batch": 2,
55-
"num_epochs": 1,
56-
"num_warmup_iterations": int(4 / num_gpus),
53+
"num_epochs": 2,
54+
"num_epochs_per_validation": 1,
55+
"num_warmup_epochs": 1,
5756
"use_pretrain": False,
5857
"pretrained_path": "",
5958
}
@@ -145,24 +144,21 @@ def test_autorunner_hpo(self) -> None:
145144
runner = AutoRunner(work_dir=work_dir, input=self.data_src_cfg, hpo=True, ensemble=False)
146145
hpo_param = {
147146
"CUDA_VISIBLE_DEVICES": train_param["CUDA_VISIBLE_DEVICES"],
148-
"num_iterations": train_param["num_iterations"],
149-
"num_iterations_per_validation": train_param["num_iterations_per_validation"],
147+
"num_epochs_per_validation": train_param["num_epochs_per_validation"],
150148
"num_images_per_batch": train_param["num_images_per_batch"],
151149
"num_epochs": train_param["num_epochs"],
152-
"num_warmup_iterations": train_param["num_warmup_iterations"],
150+
"num_warmup_epochs": train_param["num_warmup_epochs"],
153151
"use_pretrain": train_param["use_pretrain"],
154152
"pretrained_path": train_param["pretrained_path"],
155153
# below are to shorten the time for dints
156-
"training#num_iterations": train_param["num_iterations"],
157-
"training#num_iterations_per_validation": train_param["num_iterations_per_validation"],
154+
"training#num_epochs_per_validation": train_param["num_epochs_per_validation"],
158155
"training#num_images_per_batch": train_param["num_images_per_batch"],
159156
"training#num_epochs": train_param["num_epochs"],
160-
"training#num_warmup_iterations": train_param["num_warmup_iterations"],
161-
"searching#num_iterations": train_param["num_iterations"],
162-
"searching#num_iterations_per_validation": train_param["num_iterations_per_validation"],
157+
"training#num_warmup_epochs": train_param["num_warmup_epochs"],
158+
"searching#num_epochs_per_validation": train_param["num_epochs_per_validation"],
163159
"searching#num_images_per_batch": train_param["num_images_per_batch"],
164160
"searching#num_epochs": train_param["num_epochs"],
165-
"searching#num_warmup_iterations": train_param["num_warmup_iterations"],
161+
"searching#num_warmup_epochs": train_param["num_warmup_epochs"],
166162
"nni_dry_run": True,
167163
}
168164
search_space = {"learning_rate": {"_type": "choice", "_value": [0.0001, 0.001, 0.01, 0.1]}}

tests/test_integration_gpu_customization.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,10 @@
4949
train_param = (
5050
{
5151
"CUDA_VISIBLE_DEVICES": list(range(num_gpus)),
52-
"num_iterations": int(4 / num_gpus),
53-
"num_iterations_per_validation": int(4 / num_gpus),
5452
"num_images_per_batch": 2,
55-
"num_epochs": 1,
56-
"num_warmup_iterations": int(4 / num_gpus),
53+
"num_epochs": 2,
54+
"num_epochs_per_validation": 1,
55+
"num_warmup_epochs": 1,
5756
"use_pretrain": False,
5857
"pretrained_path": "",
5958
}

0 commit comments

Comments
 (0)