Revert "Enhance training schedule for multi-label classification (#1212…

…)" This reverts commit 3dd9207.
openvinotoolkit · Aug 25, 2022 · 5f036ac · 5f036ac
1 parent 3dd9207
commit 5f036ac
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 61 deletions.
diff --git a/...rnal/model-preparation-algorithm/configs/classification/efficientnet_b0_cls_incr/model.py b/...rnal/model-preparation-algorithm/configs/classification/efficientnet_b0_cls_incr/model.py
@@ -1,6 +1,4 @@
 _base_ = [
   '../../../submodule/models/classification/ote_efficientnet_b0.yaml',
 ]
-
-runner = dict(max_epochs=20)
 fp16 = dict(loss_scale=512.)
diff --git a/...preparation-algorithm/configs/classification/efficientnet_b0_cls_incr/model_multilabel.py b/...preparation-algorithm/configs/classification/efficientnet_b0_cls_incr/model_multilabel.py
@@ -1,17 +1,4 @@
 _base_ = [
   '../../../submodule/models/classification/ote_efficientnet_b0_multilabel.yaml',
 ]
-
 fp16 = dict(loss_scale=512.)
-
-custom_hooks = [
-    dict(
-        type='LazyEarlyStoppingHook',
-        start=0,
-        patience=10,
-        iteration_patience=0,
-        metric='mAP',
-        interval=1,
-        priority=75,
-    ),
-]
diff --git a/...model-preparation-algorithm/configs/classification/efficientnet_b0_cls_incr/template.yaml b/...model-preparation-algorithm/configs/classification/efficientnet_b0_cls_incr/template.yaml
@@ -34,10 +34,8 @@ hyper_parameters:
       learning_rate:
         default_value: 0.007
         auto_hpo_state: POSSIBLE
-      learning_rate_warmup_iters:
-        default_value: 0
       num_iters:
-        default_value: 90
+        default_value: 20
     algo_backend:
       train_type:
         default_value: Incremental

diff --git a/...al/model-preparation-algorithm/configs/classification/efficientnet_v2_s_cls_incr/model.py b/...al/model-preparation-algorithm/configs/classification/efficientnet_v2_s_cls_incr/model.py
@@ -1,6 +1,4 @@
 _base_ = [
   '../../../submodule/models/classification/ote_efficientnet_v2_s.yaml',
 ]
-
-runner = dict(max_epochs=20)
 fp16 = dict(loss_scale=512.)
diff --git a/...eparation-algorithm/configs/classification/efficientnet_v2_s_cls_incr/model_multilabel.py b/...eparation-algorithm/configs/classification/efficientnet_v2_s_cls_incr/model_multilabel.py
@@ -1,17 +1,4 @@
 _base_ = [
   '../../../submodule/models/classification/ote_efficientnet_v2_s_multilabel.yaml',
 ]
-
 fp16 = dict(loss_scale=512.)
-
-custom_hooks = [
-    dict(
-        type='LazyEarlyStoppingHook',
-        start=0,
-        patience=10,
-        iteration_patience=0,
-        metric='mAP',
-        interval=1,
-        priority=75,
-    ),
-]
diff --git a/...del-preparation-algorithm/configs/classification/efficientnet_v2_s_cls_incr/template.yaml b/...del-preparation-algorithm/configs/classification/efficientnet_v2_s_cls_incr/template.yaml
@@ -34,10 +34,8 @@ hyper_parameters:
       learning_rate:
         default_value: 0.007
         auto_hpo_state: POSSIBLE
-      learning_rate_warmup_iters:
-        default_value: 0
       num_iters:
-        default_value: 90
+        default_value: 20
     algo_backend:
       train_type:
         default_value: Incremental

diff --git a/...model-preparation-algorithm/configs/classification/mobilenet_v3_large_1_cls_incr/model.py b/...model-preparation-algorithm/configs/classification/mobilenet_v3_large_1_cls_incr/model.py
@@ -1,6 +1,4 @@
 _base_ = [
   '../../../submodule/models/classification/ote_mobilenet_v3_large.yaml',
 ]
-
-runner = dict(max_epochs=20)
 fp16 = dict(loss_scale=512.)
diff --git a/...ration-algorithm/configs/classification/mobilenet_v3_large_1_cls_incr/model_multilabel.py b/...ration-algorithm/configs/classification/mobilenet_v3_large_1_cls_incr/model_multilabel.py
@@ -1,17 +1,4 @@
 _base_ = [
   '../../../submodule/models/classification/ote_mobilenet_v3_large_multilabel.yaml',
 ]
-
 fp16 = dict(loss_scale=512.)
-
-custom_hooks = [
-    dict(
-        type='LazyEarlyStoppingHook',
-        start=0,
-        patience=10,
-        iteration_patience=0,
-        metric='mAP',
-        interval=1,
-        priority=75,
-    ),
-]
diff --git a/...-preparation-algorithm/configs/classification/mobilenet_v3_large_1_cls_incr/template.yaml b/...-preparation-algorithm/configs/classification/mobilenet_v3_large_1_cls_incr/template.yaml
@@ -37,7 +37,7 @@ hyper_parameters:
       learning_rate_warmup_iters:
         default_value: 100
       num_iters:
-        default_value: 90
+        default_value: 20
     algo_backend:
       train_type:
         default_value: Incremental

diff --git a/external/model-preparation-algorithm/mpa_tasks/apis/classification/task.py b/external/model-preparation-algorithm/mpa_tasks/apis/classification/task.py
@@ -300,15 +300,6 @@ def _init_model_cfg(self):
         else:
             cfg_path = os.path.join(base_dir, 'model.py')
         cfg = MPAConfig.fromfile(cfg_path)
-
-        # To initialize different HP according to task / Support HP change via CLI & UI
-        if not self._multilabel:
-            template = MPAConfig.fromfile(self.template_file_path)
-            template_params = template.hyper_parameters.parameter_overrides.learning_parameters
-            incoming_params = self._hyperparams.learning_parameters
-            if cfg.get('runner', False) and (template_params.num_iters.default_value != incoming_params.num_iters):
-                cfg.runner.max_epochs = incoming_params.num_iters
-
         cfg.model.multilabel = self._multilabel
         cfg.model.hierarchical = self._hierarchical
         if self._hierarchical: