[HOTFIX][Release1.0] Patches for Geti integration (#1836)

* Fix doc link to stable

* Apply FEATURE_FLAGS mechanism for action tasks

* Fix pre-commit

* Set num_workers=0 for detection

---------

Signed-off-by: Songki Choi <[email protected]>

Author: Songki Choi

CHANGELOG.md

@@ -22,7 +22,7 @@ All notable changes to this project will be documented in this file.
 - Enhance `find` command to find configurations of supported tasks / algorithms / models / backbones
 - Introduce `build` command to customize task or model configurations in isolated workspace
 - Auto-config feature to automatically select the right algorithm and default model for the `train` & `build` command by detecting the task type of given input dataset
-- Improve [documentation](https://openvinotoolkit.github.io/training_extensions/guide/get_started/introduction.html)
+- Improve [documentation](https://openvinotoolkit.github.io/training_extensions/stable/guide/get_started/introduction.html)
 - Improve training performance by introducing enhanced loss for the few-shot transfer
 
 ### Bug fixes

otx/algorithms/action/__init__.py

@@ -2,3 +2,7 @@
 
 # Copyright (C) 2022 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
+
+import os
+
+os.environ["FEATURE_FLAGS_OTX_ACTION_TASKS"] = "1"

otx/algorithms/detection/configs/detection/configuration.yaml

@@ -101,7 +101,7 @@ learning_parameters:
     warning: null
   num_workers:
     affects_outcome_of: NONE
-    default_value: 2
+    default_value: 0
     description:
       Increasing this value might improve training speed however it might
       cause out of memory errors. If the number of workers is set to zero, data loading

otx/api/entities/label.py

@@ -5,6 +5,7 @@
 
 
 import datetime
+import os
 from enum import Enum, auto
 from typing import Optional
 
@@ -25,8 +26,9 @@ class Domain(Enum):
     ANOMALY_SEGMENTATION = auto()
     INSTANCE_SEGMENTATION = auto()
     ROTATED_DETECTION = auto()
-    ACTION_CLASSIFICATION = auto()
-    ACTION_DETECTION = auto()
+    if os.getenv("FEATURE_FLAGS_OTX_ACTION_TASKS", "0") == "1":
+        ACTION_CLASSIFICATION = auto()
+        ACTION_DETECTION = auto()
 
     def __str__(self):
         """Returns Domain name."""

otx/api/entities/model_template.py

@@ -205,16 +205,17 @@ def __new__(cls, *args):
         is_global=False,
         is_local=True,
     )
-    ACTION_CLASSIFICATION = 14, TaskInfo(
-        domain=Domain.ACTION_CLASSIFICATION,
-        is_trainable=True,
-        is_anomaly=False,
-        is_global=False,
-        is_local=True,
-    )
-    ACTION_DETECTION = 15, TaskInfo(
-        domain=Domain.ACTION_DETECTION, is_trainable=True, is_anomaly=False, is_global=False, is_local=True
-    )
+    if os.getenv("FEATURE_FLAGS_OTX_ACTION_TASKS", "0") == "1":
+        ACTION_CLASSIFICATION = 14, TaskInfo(
+            domain=Domain.ACTION_CLASSIFICATION,
+            is_trainable=True,
+            is_anomaly=False,
+            is_global=False,
+            is_local=True,
+        )
+        ACTION_DETECTION = 15, TaskInfo(
+            domain=Domain.ACTION_DETECTION, is_trainable=True, is_anomaly=False, is_global=False, is_local=True
+        )
 
     def __str__(self) -> str:
         """Returns name."""
@@ -246,9 +247,13 @@ def task_type_to_label_domain(task_type: TaskType) -> Domain:
         TaskType.ANOMALY_DETECTION: Domain.ANOMALY_DETECTION,
         TaskType.ANOMALY_SEGMENTATION: Domain.ANOMALY_SEGMENTATION,
         TaskType.ROTATED_DETECTION: Domain.ROTATED_DETECTION,
-        TaskType.ACTION_CLASSIFICATION: Domain.ACTION_CLASSIFICATION,
-        TaskType.ACTION_DETECTION: Domain.ACTION_DETECTION,
     }
+    if os.getenv("FEATURE_FLAGS_OTX_ACTION_TASKS", "0") == "1":
+        mapping = {
+            **mapping,
+            TaskType.ACTION_CLASSIFICATION: Domain.ACTION_CLASSIFICATION,
+            TaskType.ACTION_DETECTION: Domain.ACTION_DETECTION,
+        }
 
     try:
         return mapping[task_type]
@@ -581,9 +586,13 @@ def __init__(self) -> None:
     TaskType.ANOMALY_CLASSIFICATION,
     TaskType.ANOMALY_SEGMENTATION,
     TaskType.ROTATED_DETECTION,
-    TaskType.ACTION_CLASSIFICATION,
-    TaskType.ACTION_DETECTION,
 )
+if os.getenv("FEATURE_FLAGS_OTX_ACTION_TASKS", "0") == "1":
+    TRAINABLE_TASK_TYPES = (
+        *TRAINABLE_TASK_TYPES,
+        TaskType.ACTION_CLASSIFICATION,
+        TaskType.ACTION_DETECTION,
+    )
 
 
 def _parse_model_template_from_omegaconf(config: Union[DictConfig, ListConfig]) -> ModelTemplate:

otx/cli/__init__.py

@@ -1,4 +1,8 @@
 """OTX CLI."""
 
-# Copyright (C) 2021-2022 Intel Corporation
+# Copyright (C) 2021-2023 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
+
+import os
+
+os.environ["FEATURE_FLAGS_OTX_ACTION_TASKS"] = "1"

otx/core/data/adapter/__init__.py

@@ -16,6 +16,7 @@
 
 # pylint: disable=too-many-return-statements
 import importlib
+import os
 
 from otx.algorithms.common.configs.training_base import TrainType
 from otx.api.entities.model_template import TaskType
@@ -55,18 +56,6 @@
             "class": "SelfSLSegmentationDatasetAdapter",
         },
     },
-    TaskType.ACTION_CLASSIFICATION: {
-        "INCREMENTAL": {
-            "module_name": "action_dataset_adapter",
-            "class": "ActionClassificationDatasetAdapter",
-        }
-    },
-    TaskType.ACTION_DETECTION: {
-        "INCREMENTAL": {
-            "module_name": "action_dataset_adapter",
-            "class": "ActionDetectionDatasetAdapter",
-        }
-    },
     TaskType.ANOMALY_CLASSIFICATION: {
         "INCREMENTAL": {
             "module_name": "anomaly_dataset_adapter",
@@ -86,6 +75,23 @@
         }
     },
 }
+if os.getenv("FEATURE_FLAGS_OTX_ACTION_TASKS", "0") == "1":
+    ADAPTERS.update(
+        {
+            TaskType.ACTION_CLASSIFICATION: {
+                "INCREMENTAL": {
+                    "module_name": "action_dataset_adapter",
+                    "class": "ActionClassificationDatasetAdapter",
+                }
+            },
+            TaskType.ACTION_DETECTION: {
+                "INCREMENTAL": {
+                    "module_name": "action_dataset_adapter",
+                    "class": "ActionDetectionDatasetAdapter",
+                }
+            },
+        }
+    )
 
 
 def get_dataset_adapter(

tests/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2022 Intel Corporation
+# Copyright (C) 2022-2023 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,3 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions
 # and limitations under the License.
+
+import os
+
+os.environ["FEATURE_FLAGS_OTX_ACTION_TASKS"] = "1"