Skip to content

Commit 469e0d4

Browse files
committed
Merge branch 'modify-mpa-templates-for-hpo' into develop
2 parents 2ba612e + e79eb08 commit 469e0d4

File tree

45 files changed

+547
-362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+547
-362
lines changed

external/deep-object-reid/torchreid_tasks/utils.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,10 @@ def on_epoch_end(self, epoch, logs=None):
441441
print(f'score = {score} at epoch {self.current_epoch} / {self._num_iters}')
442442
# as a trick, score (at least if it's accuracy not the loss) and iteration number
443443
# could be assembled just using summation and then disassembeled.
444-
score = score + int(self._num_iters)
444+
if 1.0 > score:
445+
score = score + int(self._num_iters)
446+
else:
447+
score = -(score + int(self._num_iters))
445448
self.update_progress_callback(self.get_progress(), score=score)
446449

447450

external/mmdetection/detection_tasks/apis/detection/ote_utils.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,10 @@ def on_epoch_end(self, epoch, logs=None):
126126
print(f'score = {score} at epoch {epoch} / {int(iter_num)}')
127127
# as a trick, score (at least if it's accuracy not the loss) and iteration number
128128
# could be assembled just using summation and then disassembeled.
129-
score = score + int(iter_num)
129+
if 1.0 > score:
130+
score = score + int(iter_num)
131+
else:
132+
score = -(score + int(iter_num))
130133
self.update_progress_callback(self.get_progress(), score=score)
131134

132135

external/mmdetection/detection_tasks/extension/utils/runner.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ def train(self, data_loader: DataLoader, **kwargs):
5757
self.data_loader = data_loader
5858
self._max_iters = self._max_epochs * len(self.data_loader)
5959
self.call_hook('before_train_epoch')
60-
time.sleep(2) # Prevent possible deadlock during epoch transition
60+
# TODO: uncomment below line or resolve root cause of deadlock issue if multi-GPUs need to be supported.
61+
# time.sleep(2) # Prevent possible multi-gpu deadlock during epoch transition
6162
for i, data_batch in enumerate(self.data_loader):
6263
self._inner_iter = i
6364
self.call_hook('before_train_iter')

external/mmsegmentation/segmentation_tasks/apis/segmentation/ote_utils.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,10 @@ def on_epoch_end(self, epoch, logs=None):
7575
print(f'score = {score} at epoch {epoch} / {int(iter_num)}')
7676
# as a trick, score (at least if it's accuracy not the loss) and iteration number
7777
# could be assembled just using summation and then disassembeled.
78-
score = score + int(iter_num)
78+
if 1.0 > score:
79+
score = score + int(iter_num)
80+
else:
81+
score = -(score + int(iter_num))
7982
self.update_progress_callback(self.get_progress(), score=score)
8083

8184

external/mmsegmentation/segmentation_tasks/extension/utils/runner.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ def train(self, data_loader: DataLoader, **kwargs):
6161
self.data_loader = data_loader
6262
self._max_iters = self._max_epochs * len(self.data_loader)
6363
self.call_hook('before_train_epoch')
64-
time.sleep(2) # Prevent possible deadlock during epoch transition
64+
# TODO: uncomment below line or resolve root cause of deadlock issue if multi-GPUs need to be supported.
65+
# time.sleep(2) # Prevent possible multi-gpu deadlock during epoch transition
6566
for i, data_batch in enumerate(self.data_loader):
6667
self._inner_iter = i
6768
self.call_hook('before_train_iter')

external/model-preparation-algorithm/configs/classification/configuration.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ learning_parameters:
2222
warning:
2323
Increasing this value may cause the system to use more memory than available,
2424
potentially causing out of memory errors, please update with caution.
25+
auto_hpo_state: NOT_POSSIBLE
2526
description: Learning Parameters
2627
header: Learning Parameters
2728
learning_rate:
@@ -42,6 +43,7 @@ learning_parameters:
4243
type: UI_RULES
4344
visible_in_ui: true
4445
warning: null
46+
auto_hpo_state: NOT_POSSIBLE
4547
max_num_epochs:
4648
affects_outcome_of: TRAINING
4749
default_value: 200
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
metric: mAP
2-
search_algorithm: smbo
3-
early_stop: median_stop
1+
metric: accuracy_top-1
2+
search_algorithm: asha
43
hp_space:
54
learning_parameters.learning_rate:
6-
param_type: quniform
5+
param_type: qloguniform
76
range:
8-
- 0.001
9-
- 0.01
10-
- 0.001
7+
- 0.0003
8+
- 0.1
9+
- 0.0001
1110
learning_parameters.batch_size:
1211
param_type: qloguniform
1312
range:
14-
- 8
15-
- 64
13+
- 32
14+
- 128
1615
- 2

external/model-preparation-algorithm/configs/classification/efficientnet_b0_cls_incr/template.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ hyper_parameters:
2727
learning_parameters:
2828
batch_size:
2929
default_value: 32
30+
auto_hpo_state: POSSIBLE
3031
num_workers:
3132
default_value: 4
3233
learning_rate:
3334
default_value: 0.007
35+
auto_hpo_state: POSSIBLE
3436
num_iters:
3537
default_value: 20
3638
algo_backend:
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
metric: mAP
2-
search_algorithm: smbo
3-
early_stop: median_stop
1+
metric: accuracy_top-1
2+
search_algorithm: asha
43
hp_space:
54
learning_parameters.learning_rate:
6-
param_type: quniform
5+
param_type: qloguniform
76
range:
8-
- 0.001
9-
- 0.01
10-
- 0.001
7+
- 0.0014
8+
- 0.035
9+
- 0.0001
1110
learning_parameters.batch_size:
1211
param_type: qloguniform
1312
range:
14-
- 8
15-
- 64
13+
- 20
14+
- 48
1615
- 2

external/model-preparation-algorithm/configs/classification/efficientnet_v2_s_cls_incr/template.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ hyper_parameters:
2727
learning_parameters:
2828
batch_size:
2929
default_value: 32
30+
auto_hpo_state: POSSIBLE
3031
num_workers:
3132
default_value: 4
3233
learning_rate:
3334
default_value: 0.007
35+
auto_hpo_state: POSSIBLE
3436
num_iters:
3537
default_value: 20
3638
algo_backend:
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
metric: mAP
2-
search_algorithm: smbo
3-
early_stop: median_stop
1+
metric: accuracy_top-1
2+
search_algorithm: asha
43
hp_space:
54
learning_parameters.learning_rate:
6-
param_type: quniform
5+
param_type: qloguniform
76
range:
8-
- 0.005
9-
- 0.029
10-
- 0.001
7+
- 0.0032
8+
- 0.08
9+
- 0.0001
1110
learning_parameters.batch_size:
1211
param_type: qloguniform
1312
range:
14-
- 8
15-
- 64
13+
- 20
14+
- 48
1615
- 2

external/model-preparation-algorithm/configs/classification/mobilenet_v3_large_075_cls_incr/template_experiment.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ hyper_parameters:
2727
learning_parameters:
2828
batch_size:
2929
default_value: 32
30+
auto_hpo_state: POSSIBLE
3031
num_workers:
3132
default_value: 4
3233
learning_rate:
3334
default_value: 0.016
35+
auto_hpo_state: POSSIBLE
3436
learning_rate_warmup_iters:
3537
default_value: 100
3638
num_iters:
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
metric: mAP
2-
search_algorithm: smbo
3-
early_stop: median_stop
1+
metric: accuracy_top-1
2+
search_algorithm: asha
43
hp_space:
54
learning_parameters.learning_rate:
6-
param_type: quniform
5+
param_type: qloguniform
76
range:
8-
- 0.005
9-
- 0.029
10-
- 0.001
7+
- 0.0032
8+
- 0.08
9+
- 0.0001
1110
learning_parameters.batch_size:
1211
param_type: qloguniform
1312
range:
14-
- 8
15-
- 64
13+
- 20
14+
- 48
1615
- 2

external/model-preparation-algorithm/configs/classification/mobilenet_v3_large_1_cls_incr/template.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ hyper_parameters:
2727
learning_parameters:
2828
batch_size:
2929
default_value: 32
30+
auto_hpo_state: POSSIBLE
3031
num_workers:
3132
default_value: 4
3233
learning_rate:
3334
default_value: 0.016
35+
auto_hpo_state: POSSIBLE
3436
learning_rate_warmup_iters:
3537
default_value: 100
3638
num_iters:
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
metric: mAP
2-
search_algorithm: smbo
3-
early_stop: median_stop
1+
metric: accuracy_top-1
2+
search_algorithm: asha
3+
early_stop: None
44
hp_space:
55
learning_parameters.learning_rate:
6-
param_type: quniform
6+
param_type: qloguniform
77
range:
8-
- 0.005
9-
- 0.029
10-
- 0.001
8+
- 0.0032
9+
- 0.08
10+
- 0.0001
1111
learning_parameters.batch_size:
1212
param_type: qloguniform
1313
range:
14-
- 8
15-
- 64
14+
- 20
15+
- 48
1616
- 2

external/model-preparation-algorithm/configs/classification/mobilenet_v3_small_cls_incr/template_experiment.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ hyper_parameters:
2727
learning_parameters:
2828
batch_size:
2929
default_value: 32
30+
auto_hpo_state: POSSIBLE
3031
num_workers:
3132
default_value: 4
3233
learning_rate:
3334
default_value: 0.016
35+
auto_hpo_state: POSSIBLE
3436
learning_rate_warmup_iters:
3537
default_value: 100
3638
num_iters:

external/model-preparation-algorithm/configs/detection/configuration.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ learning_parameters:
2323
warning:
2424
Increasing this value may cause the system to use more memory than available,
2525
potentially causing out of memory errors, please update with caution.
26+
auto_hpo_state: NOT_POSSIBLE
2627
description: Learning Parameters
2728
header: Learning Parameters
2829
learning_rate:
@@ -44,6 +45,7 @@ learning_parameters:
4445
value: 0.01
4546
visible_in_ui: true
4647
warning: null
48+
auto_hpo_state: NOT_POSSIBLE
4749
learning_rate_warmup_iters:
4850
affects_outcome_of: TRAINING
4951
default_value: 100
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
metric: mAP
2-
search_algorithm: smbo
2+
search_algorithm: asha
33
early_stop: None
44
hp_space:
55
learning_parameters.learning_rate:
6-
param_type: quniform
6+
param_type: qloguniform
77
range:
8-
- 0.001
9-
- 0.1
10-
- 0.001
8+
- 0.00002
9+
- 0.0005
10+
- 0.00001
1111
learning_parameters.batch_size:
1212
param_type: qloguniform
1313
range:
14-
- 4
15-
- 8
14+
- 2
15+
- 16
1616
- 2

external/model-preparation-algorithm/configs/detection/cspdarknet_yolox_cls_incr/template.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ hyper_parameters:
2727
learning_parameters:
2828
batch_size:
2929
default_value: 4
30+
auto_hpo_state: POSSIBLE
3031
learning_rate:
3132
default_value: 0.0001
33+
auto_hpo_state: POSSIBLE
3234
learning_rate_warmup_iters:
3335
default_value: 10
3436
num_iters:
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
metric: mAP
2-
search_algorithm: smbo
2+
search_algorithm: asha
33
early_stop: None
44
hp_space:
55
learning_parameters.learning_rate:
6-
param_type: quniform
6+
param_type: qloguniform
77
range:
8-
- 0.001
9-
- 0.1
10-
- 0.001
8+
- 0.0001
9+
- 0.01
10+
- 0.0001
1111
learning_parameters.batch_size:
1212
param_type: qloguniform
1313
range:
14-
- 4
15-
- 8
14+
- 2
15+
- 16
1616
- 2

external/model-preparation-algorithm/configs/detection/mobilenetv2_atss_cls_incr/template.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ hyper_parameters:
2727
learning_parameters:
2828
batch_size:
2929
default_value: 4
30+
auto_hpo_state: POSSIBLE
3031
learning_rate:
3132
default_value: 0.001
33+
auto_hpo_state: POSSIBLE
3234
learning_rate_warmup_iters:
3335
default_value: 10
3436
num_iters:
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
metric: mAP
2-
search_algorithm: smbo
2+
search_algorithm: asha
33
early_stop: None
44
hp_space:
55
learning_parameters.learning_rate:
6-
param_type: quniform
6+
param_type: qloguniform
77
range:
8-
- 0.001
9-
- 0.1
8+
- 0.0005
9+
- 0.05
1010
- 0.001
1111
learning_parameters.batch_size:
1212
param_type: qloguniform
1313
range:
14-
- 4
15-
- 8
14+
- 2
15+
- 16
1616
- 2

external/model-preparation-algorithm/configs/detection/mobilenetv2_ssd_cls_incr/template.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ hyper_parameters:
2727
learning_parameters:
2828
batch_size:
2929
default_value: 4
30+
auto_hpo_state: POSSIBLE
3031
learning_rate:
3132
default_value: 0.005
33+
auto_hpo_state: POSSIBLE
3234
learning_rate_warmup_iters:
3335
default_value: 10
3436
num_iters:

external/model-preparation-algorithm/configs/instance-segmentation/configuration.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ learning_parameters:
2323
warning:
2424
Increasing this value may cause the system to use more memory than available,
2525
potentially causing out of memory errors, please update with caution.
26+
auto_hpo_state: NOT_POSSIBLE
2627
description: Learning Parameters
2728
header: Learning Parameters
2829
learning_rate:
@@ -44,6 +45,7 @@ learning_parameters:
4445
value: 0.01
4546
visible_in_ui: true
4647
warning: null
48+
auto_hpo_state: NOT_POSSIBLE
4749
learning_rate_warmup_iters:
4850
affects_outcome_of: TRAINING
4951
default_value: 100

0 commit comments

Comments
 (0)