[Anomaly Task] Move to learning parameters (#1152)

* Move to learning paramters * Remove opencv constraints * Remove nncf constraints * Fix key Co-authored-by: Ashwin Vaidya <ashwinitinvaidya@gmail.com>
openvinotoolkit · Jul 12, 2022 · fdbba29 · fdbba29
1 parent ace7a78
commit fdbba29
Show file tree

Hide file tree

Showing 20 changed files with 600 additions and 600 deletions.
diff --git a/external/anomaly/configs/anomaly_classification/padim/configuration.yaml b/external/anomaly/configs/anomaly_classification/padim/configuration.yaml
@@ -23,36 +23,12 @@ dataset:
     value: 8
     visible_in_ui: true
     warning: null
-  train_batch_size:
-    affects_outcome_of: TRAINING
-    auto_hpo_state: not_possible
-    auto_hpo_value: null
-    default_value: 32
-    description:
-      The number of training samples seen in each iteration of training.
-      Increasing this value improves training time and may make the training more
-      stable. A larger batch size has higher memory requirements.
-    editable: true
-    header: Batch size
-    max_value: 512
-    min_value: 1
-    type: INTEGER
-    ui_rules:
-      action: DISABLE_EDITING
-      operator: AND
-      rules: []
-      type: UI_RULES
-    value: 32
-    visible_in_ui: true
-    warning:
-      Increasing this value may cause the system to use more memory than available,
-      potentially causing out of memory errors, please update with caution.
   type: PARAMETER_GROUP
   visible_in_ui: true
 description: Configuration for Padim
 header: Configuration for Padim
 id: ""
-model:
+learning_parameters:
   backbone:
     affects_outcome_of: NONE
     auto_hpo_state: not_possible
@@ -74,8 +50,32 @@ model:
     value: resnet18
     visible_in_ui: true
     warning: null
-  description: Model Parameters
-  header: Model Parameters
+  description: Learning Parameters
+  header: Learning Parameters
+  train_batch_size:
+    affects_outcome_of: TRAINING
+    auto_hpo_state: not_possible
+    auto_hpo_value: null
+    default_value: 32
+    description:
+      The number of training samples seen in each iteration of training.
+      Increasing this value improves training time and may make the training more
+      stable. A larger batch size has higher memory requirements.
+    editable: true
+    header: Batch size
+    max_value: 512
+    min_value: 1
+    type: INTEGER
+    ui_rules:
+      action: DISABLE_EDITING
+      operator: AND
+      rules: []
+      type: UI_RULES
+    value: 32
+    visible_in_ui: true
+    warning:
+      Increasing this value may cause the system to use more memory than available,
+      potentially causing out of memory errors, please update with caution.
   type: PARAMETER_GROUP
   visible_in_ui: true
 nncf_optimization:

diff --git a/external/anomaly/configs/anomaly_classification/stfpm/configuration.yaml b/external/anomaly/configs/anomaly_classification/stfpm/configuration.yaml
@@ -23,36 +23,12 @@ dataset:
     value: 8
     visible_in_ui: true
     warning: null
-  train_batch_size:
-    affects_outcome_of: TRAINING
-    auto_hpo_state: not_possible
-    auto_hpo_value: null
-    default_value: 32
-    description:
-      The number of training samples seen in each iteration of training.
-      Increasing this value improves training time and may make the training more
-      stable. A larger batch size has higher memory requirements.
-    editable: true
-    header: Batch size
-    max_value: 512
-    min_value: 1
-    type: INTEGER
-    ui_rules:
-      action: DISABLE_EDITING
-      operator: AND
-      rules: []
-      type: UI_RULES
-    value: 32
-    visible_in_ui: true
-    warning:
-      Increasing this value may cause the system to use more memory than available,
-      potentially causing out of memory errors, please update with caution.
   type: PARAMETER_GROUP
   visible_in_ui: true
 description: Configuration for STFPM
 header: Configuration for STFPM
 id: ""
-model:
+learning_parameters:
   backbone:
     affects_outcome_of: NONE
     auto_hpo_state: not_possible
@@ -74,7 +50,7 @@ model:
     value: resnet18
     visible_in_ui: true
     warning: null
-  description: Model Parameters
+  description: Learning Parameters
   early_stopping:
     description: Early Stopping Parameters
     header: Early Stopping Parameters
@@ -125,7 +101,7 @@ model:
         value too high will increase the training time and might lead to overfitting.
     type: PARAMETER_GROUP
     visible_in_ui: true
-  header: Model Parameters
+  header: Learning Parameters
   lr:
     affects_outcome_of: NONE
     auto_hpo_state: not_possible
@@ -145,6 +121,28 @@ model:
     value: 0.4
     visible_in_ui: true
     warning: null
+  max_epochs:
+    affects_outcome_of: TRAINING
+    auto_hpo_state: not_possible
+    auto_hpo_value: null
+    default_value: 100
+    description: Maximum number of epochs to train the model for.
+    editable: true
+    header: Max Epochs
+    max_value: 500
+    min_value: 1
+    type: INTEGER
+    ui_rules:
+      action: DISABLE_EDITING
+      operator: AND
+      rules: []
+      type: UI_RULES
+    value: 100
+    visible_in_ui: true
+    warning:
+      Training for very few epochs might lead to poor performance. If Early
+      Stopping is enabled then increasing the value of max epochs might not lead to
+      desired result.
   momentum:
     affects_outcome_of: NONE
     auto_hpo_state: not_possible
@@ -164,6 +162,30 @@ model:
     value: 0.9
     visible_in_ui: true
     warning: null
+  train_batch_size:
+    affects_outcome_of: TRAINING
+    auto_hpo_state: not_possible
+    auto_hpo_value: null
+    default_value: 32
+    description:
+      The number of training samples seen in each iteration of training.
+      Increasing this value improves training time and may make the training more
+      stable. A larger batch size has higher memory requirements.
+    editable: true
+    header: Batch size
+    max_value: 512
+    min_value: 1
+    type: INTEGER
+    ui_rules:
+      action: DISABLE_EDITING
+      operator: AND
+      rules: []
+      type: UI_RULES
+    value: 32
+    visible_in_ui: true
+    warning:
+      Increasing this value may cause the system to use more memory than available,
+      potentially causing out of memory errors, please update with caution.
   type: PARAMETER_GROUP
   visible_in_ui: true
   weight_decay:
@@ -286,32 +308,5 @@ pot_parameters:
     warning: null
   type: PARAMETER_GROUP
   visible_in_ui: false
-trainer:
-  description: Trainer Parameters
-  header: Trainer Parameters
-  max_epochs:
-    affects_outcome_of: TRAINING
-    auto_hpo_state: not_possible
-    auto_hpo_value: null
-    default_value: 100
-    description: Maximum number of epochs to train the model for.
-    editable: true
-    header: Max Epochs
-    max_value: 500
-    min_value: 1
-    type: INTEGER
-    ui_rules:
-      action: DISABLE_EDITING
-      operator: AND
-      rules: []
-      type: UI_RULES
-    value: 100
-    visible_in_ui: true
-    warning:
-      Training for very few epochs might lead to poor performance. If Early
-      Stopping is enabled then increasing the value of max epochs might not lead to
-      desired result.
-  type: PARAMETER_GROUP
-  visible_in_ui: true
 type: CONFIGURABLE_PARAMETERS
 visible_in_ui: true
diff --git a/external/anomaly/configs/anomaly_classification/stfpm/hpo_config.yaml b/external/anomaly/configs/anomaly_classification/stfpm/hpo_config.yaml
@@ -4,13 +4,13 @@ mode: max
 search_algorithm: asha
 early_stop: None
 hp_space:
-  model.lr:
+  learning_parameters.lr:
     param_type: qloguniform
     range:
       - 0.04
       - 0.8
       - 0.01
-  dataset.train_batch_size:
+  learning_parameters.train_batch_size:
     param_type: qloguniform
     range:
       - 16

diff --git a/external/anomaly/configs/anomaly_classification/stfpm/template.yaml b/external/anomaly/configs/anomaly_classification/stfpm/template.yaml
@@ -20,10 +20,9 @@ entrypoints:
 hyper_parameters:
   base_path: ./configuration.yaml
   parameter_overrides:
-    dataset:
+    learning_parameters:
       train_batch_size:
         auto_hpo_state: POSSIBLE
-    model:
       lr:
         auto_hpo_state: POSSIBLE
 

diff --git a/external/anomaly/configs/anomaly_detection/padim/configuration.yaml b/external/anomaly/configs/anomaly_detection/padim/configuration.yaml
@@ -23,36 +23,12 @@ dataset:
     value: 8
     visible_in_ui: true
     warning: null
-  train_batch_size:
-    affects_outcome_of: TRAINING
-    auto_hpo_state: not_possible
-    auto_hpo_value: null
-    default_value: 32
-    description:
-      The number of training samples seen in each iteration of training.
-      Increasing this value improves training time and may make the training more
-      stable. A larger batch size has higher memory requirements.
-    editable: true
-    header: Batch size
-    max_value: 512
-    min_value: 1
-    type: INTEGER
-    ui_rules:
-      action: DISABLE_EDITING
-      operator: AND
-      rules: []
-      type: UI_RULES
-    value: 32
-    visible_in_ui: true
-    warning:
-      Increasing this value may cause the system to use more memory than available,
-      potentially causing out of memory errors, please update with caution.
   type: PARAMETER_GROUP
   visible_in_ui: true
 description: Configuration for Padim
 header: Configuration for Padim
 id: ""
-model:
+learning_parameters:
   backbone:
     affects_outcome_of: NONE
     auto_hpo_state: not_possible
@@ -74,8 +50,32 @@ model:
     value: resnet18
     visible_in_ui: true
     warning: null
-  description: Model Parameters
-  header: Model Parameters
+  description: Learning Parameters
+  header: Learning Parameters
+  train_batch_size:
+    affects_outcome_of: TRAINING
+    auto_hpo_state: not_possible
+    auto_hpo_value: null
+    default_value: 32
+    description:
+      The number of training samples seen in each iteration of training.
+      Increasing this value improves training time and may make the training more
+      stable. A larger batch size has higher memory requirements.
+    editable: true
+    header: Batch size
+    max_value: 512
+    min_value: 1
+    type: INTEGER
+    ui_rules:
+      action: DISABLE_EDITING
+      operator: AND
+      rules: []
+      type: UI_RULES
+    value: 32
+    visible_in_ui: true
+    warning:
+      Increasing this value may cause the system to use more memory than available,
+      potentially causing out of memory errors, please update with caution.
   type: PARAMETER_GROUP
   visible_in_ui: true
 nncf_optimization: