Enable hierarchical classification in MPA

data/classification/hierarchical/hierarchical_IL.json

@@ -0,0 +1,45 @@
+{"images": [["Slide18.PNG", ["car"]], 
+            ["Slide19.PNG", ["tree"]], 
+            ["Slide16.PNG", ["car", "tree"]],
+            ["Slide10.PNG", ["tree", "car", "bug"]], 
+            ["Slide12.PNG", ["bug", "car", "tree"]], 
+            ["Slide14.PNG", ["tree", "bug", "car"]], 
+            ["Slide9.PNG", ["bug", "car", "tree"]], 
+            ["Slide11.PNG", ["car", "tree", "bug"]], 
+            ["Slide17.PNG", ["bug", "tree"]], 
+            ["Slide7.PNG", ["tree", "car", "bug"]], 
+            ["Slide6.PNG", ["car", "tree", "bug"]], 
+            ["Slide4.PNG", ["bug", "tree", "car"]], 
+            ["Slide20.PNG", ["bug"]], 
+            ["Slide5.PNG", ["bug", "tree", "car"]], 
+            ["Slide1.PNG", ["car", "bug", "tree"]], 
+            ["Slide3.PNG", ["car", "tree", "bug"]], 
+            ["Slide13.PNG", ["bug", "car", "tree"]], 
+            ["Slide2.PNG", ["bug", "car", "tree"]], 
+            ["Slide8.PNG", ["car", "tree", "bug"]], 
+            ["Slide15.PNG", ["bug", "car"]],
+            ["intel_1.jpg", ["intel"]],
+            ["intel_2.jpg", ["intel"]],
+            ["openvino_1.jpg", ["openvino"]],
+            ["openvino_2.jpg", ["openvino"]],
+            ["openvino_3.jpg", ["openvino"]],
+            ["openvino_4.jpg", ["openvino"]],
+            ["opencv_1.jpg", ["opencv"]],
+            ["opencv_2.jpg", ["opencv"]]
+            ],
+ "hierarchy":
+            [
+                {
+                "parent": "self",
+                "group": "car_tree_bug",
+                "labels": ["car", "tree", "bug"],
+                "task_type": "multi-label"
+                },
+                {
+                "parent": "self",
+                "group": "text_recognition",
+                "labels": ["intel", "openvino", "opencv"],
+                "task_type": "single-label"
+                }
+            ]
+}

data/classification/hierarchical/hierarchical_initial.json

@@ -0,0 +1,25 @@
+{"images": [["Slide18.PNG", ["car"]], 
+            ["Slide19.PNG", ["tree"]], 
+            ["Slide16.PNG", ["car", "tree"]],
+            ["intel_1.jpg", ["intel"]],
+            ["intel_2.jpg", ["intel"]],
+            ["openvino_1.jpg", ["openvino"]],
+            ["openvino_2.jpg", ["openvino"]],
+            ["openvino_3.jpg", ["openvino"]]
+            ],
+ "hierarchy":
+            [
+                {
+                "parent": "self",
+                "group": "car_tree_bug",
+                "labels": ["car", "tree"],
+                "task_type": "multi-label"
+                },
+                {
+                "parent": "self",
+                "group": "text_recognition",
+                "labels": ["intel", "openvino"],
+                "task_type": "single-label"
+                }
+            ]
+}

data/classification/multilabel/multilabel_car_tree.json

@@ -0,0 +1,6 @@
+{"images": [["Slide18.PNG", ["car"]],
+            ["Slide19.PNG", ["tree"]], 
+            ["Slide16.PNG", ["car", "tree"]]
+            ], 
+ "classes": ["car", "tree"]
+}

data/classification/multilabel/multilabel_default.json

@@ -0,0 +1,20 @@
+{"images": [["Slide10.PNG", ["tree", "car", "bug"]], 
+            ["Slide12.PNG", ["bug", "car", "tree"]], 
+            ["Slide14.PNG", ["tree", "bug", "car"]], 
+            ["Slide9.PNG", ["bug", "car", "tree"]], 
+            ["Slide11.PNG", ["car", "tree", "bug"]], 
+            ["Slide17.PNG", ["bug", "tree"]], 
+            ["Slide7.PNG", ["tree", "car", "bug"]], 
+            ["Slide6.PNG", ["car", "tree", "bug"]], 
+            ["Slide4.PNG", ["bug", "tree", "car"]], 
+            ["Slide20.PNG", ["bug"]], 
+            ["Slide5.PNG", ["bug", "tree", "car"]], 
+            ["Slide1.PNG", ["car", "bug", "tree"]], 
+            ["Slide3.PNG", ["car", "tree", "bug"]], 
+            ["Slide13.PNG", ["bug", "car", "tree"]], 
+            ["Slide2.PNG", ["bug", "car", "tree"]], 
+            ["Slide8.PNG", ["car", "tree", "bug"]], 
+            ["Slide15.PNG", ["bug", "car"]]
+            ], 
+"classes": ["car", "tree", "bug"]
+}

external/deep-object-reid/configs/ote_custom_classification/mobilenet_v3_large_1/main_model_multihead.yaml

@@ -11,7 +11,7 @@ lr_finder:
   n_trials: 15
 
 model:
-  name: 'mobilenetv3_large_21k'
+  name: 'mobilenetv3_large'
   type: 'multihead'
   pretrained: True
   save_all_chkpts: False
@@ -26,8 +26,8 @@ data:
   root: './'
   height: 224
   width: 224
-  norm_mean: [0, 0, 0]
-  norm_std: [1, 1, 1]
+  norm_mean: [0.485, 0.456, 0.406]
+  norm_std: [0.229, 0.224, 0.225]
   save_dir: 'output/mulitihead/mobilenetv3_large_1'
   workers: 6
   transforms:

external/deep-object-reid/configs/ote_custom_classification/mobilenet_v3_large_1/main_model_multilabel.yaml

@@ -26,8 +26,8 @@ data:
   root: './'
   height: 224
   width: 224
-  norm_mean: [0, 0, 0]
-  norm_std: [1, 1, 1]
+  norm_mean: [0.485, 0.456, 0.406]
+  norm_std: [0.229, 0.224, 0.225]
   save_dir: 'output/mulitilabel/mobilenetv3_large'
   workers: 6
   transforms:

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

@@ -54,6 +54,7 @@
 
 from torchreid.utils import set_model_attr, get_model_attr
 
+
 class ClassificationType(Enum):
     MULTICLASS = auto()
     MULTILABEL = auto()
@@ -121,16 +122,32 @@ def _load_text_annotation(annot_path, data_dir):
         out_data = []
         with open(annot_path) as f:
             annotation = json.load(f)
-            if not 'label_groups' in annotation:
+            if 'hierarchy' not in annotation:
                 all_classes = sorted(annotation['classes'])
                 annotation_type = ClassificationType.MULTILABEL
                 groups = [[c] for c in all_classes]
-            else: # load multihead
-                groups = annotation['label_groups']
+            else:  # load multihead
                 all_classes = []
-                for g in groups:
-                    for c in g:
-                        all_classes.append(c)
+                groups = annotation['hierarchy']
+
+                def add_subtask_labels(group):
+                    if isinstance(group, dict) and 'subtask' in group:
+                        subtask = group['subtask']
+                        if isinstance(subtask, list):
+                            for task in subtask:
+                                for task_label in task['labels']:
+                                    all_classes.append(task_label)
+                        elif isinstance(subtask, dict):
+                            for task_label in subtask['labels']:
+                                all_classes.append(task_label)
+                        add_subtask_labels(subtask)
+                    elif isinstance(group, list):
+                        for task in group:
+                            add_subtask_labels(task)
+                for group in groups:
+                    for label in group['labels']:
+                        all_classes.append(label)
+                    add_subtask_labels(group)
                 annotation_type = ClassificationType.MULTIHEAD
 
             images_info = annotation['images']
@@ -258,7 +275,7 @@ def get_multihead_class_info(label_schema: LabelSchemaEntity):
         head_idx_to_logits_range[i] = (last_logits_pos, last_logits_pos + len(g))
         last_logits_pos += len(g)
         for j, c in enumerate(g):
-            class_to_idx[c] = (i, j) # group idx and idx inside group
+            class_to_idx[c] = (i, j)  # group idx and idx inside group
             num_single_label_classes += 1
 
     # other labels are in multilabel group
@@ -302,7 +319,7 @@ def __init__(self, ote_dataset: DatasetEntity, labels: List[LabelEntity], multil
             if item_labels:
                 if not self.hierarchical:
                     for ote_lbl in item_labels:
-                        if not ote_lbl in ignored_labels:
+                        if ote_lbl not in ignored_labels:
                             class_indices.append(self.label_names.index(ote_lbl.name))
                         else:
                             class_indices.append(-1)
@@ -318,12 +335,12 @@ def __init__(self, ote_dataset: DatasetEntity, labels: List[LabelEntity], multil
                         if group_idx < num_cls_heads:
                             class_indices[group_idx] = in_group_idx
                         else:
-                            if not ote_lbl in ignored_labels:
+                            if ote_lbl not in ignored_labels:
                                 class_indices[num_cls_heads + in_group_idx] = 1
                             else:
                                 class_indices[num_cls_heads + in_group_idx] = -1
 
-            else: # this supposed to happen only on inference stage or if we have a negative in multilabel data
+            else:  # this supposed to happen only on inference stage or if we have a negative in multilabel data
                 if self.mixed_cls_heads_info:
                     class_indices = [-1]*(self.mixed_cls_heads_info['num_multiclass_heads'] + \
                                           self.mixed_cls_heads_info['num_multilabel_classes'])

external/model-preparation-algorithm/configs/classification/efficientnet_b0_cls_incr/model_hierarchical.py

@@ -0,0 +1,3 @@
+_base_ = [
+  '../../../submodule/models/classification/ote_efficientnet_b0_hierarchical.yaml',
+]

external/model-preparation-algorithm/configs/classification/efficientnet_v2_s_cls_incr/model_hierarchical.py

@@ -0,0 +1,3 @@
+_base_ = [
+  '../../../submodule/models/classification/ote_efficientnet_v2_s_hierarchical.yaml',
+]

external/model-preparation-algorithm/configs/classification/mobilenet_v3_large_075_cls_incr/model_hierarchical.py

@@ -0,0 +1,3 @@
+_base_ = [
+  '../../../submodule/models/classification/ote_mobilenet_v3_large_075_hierarchical.yaml',
+]

external/model-preparation-algorithm/configs/classification/mobilenet_v3_large_1_cls_incr/model_hierarchical.py

@@ -0,0 +1,3 @@
+_base_ = [
+  '../../../submodule/models/classification/ote_mobilenet_v3_large_hierarchical.yaml',
+]

external/model-preparation-algorithm/configs/classification/mobilenet_v3_small_cls_incr/model_hierarchical.py

@@ -0,0 +1,3 @@
+_base_ = [
+  '../../../submodule/models/classification/ote_mobilenet_v3_small_hierarchical.yaml',
+]