fixed mistake while mergeing back 1.4.4

Author: yunchu

requirements/base.txt

@@ -4,7 +4,7 @@ natsort==8.1.*
 prettytable==3.9.*
 protobuf==3.20.*
 pyyaml
-datumaro~=1.5.0
+datumaro==1.5.1rc3
 psutil==5.9.*
 scipy==1.10.*
 bayesian-optimization==1.4.*

tests/assets/datumaro_h-label/annotations/train.json

@@ -4,7 +4,7 @@
     "label": {
       "label_groups": [
         {
-          "name": "blue",
+          "name": "shape",
           "group_type": "exclusive",
           "labels": ["blue", "green"]
         },

tests/integration/cli/anomaly/test_anomaly_classification.py

@@ -11,7 +11,6 @@
 from otx.cli.registry import Registry
 from tests.test_suite.e2e_test_system import e2e_pytest_component
 from tests.test_suite.run_test_command import (
-    generate_model_template_testing,
     nncf_optimize_testing,
     otx_deploy_openvino_testing,
     otx_eval_deployment_testing,

tests/integration/cli/anomaly/test_anomaly_detection.py

@@ -11,7 +11,6 @@
 from otx.cli.registry import Registry
 from tests.test_suite.e2e_test_system import e2e_pytest_component
 from tests.test_suite.run_test_command import (
-    generate_model_template_testing,
     nncf_optimize_testing,
     otx_deploy_openvino_testing,
     otx_eval_deployment_testing,

tests/integration/cli/anomaly/test_anomaly_segmentation.py

@@ -11,7 +11,6 @@
 from otx.cli.registry import Registry
 from tests.test_suite.e2e_test_system import e2e_pytest_component
 from tests.test_suite.run_test_command import (
-    generate_model_template_testing,
     nncf_optimize_testing,
     otx_deploy_openvino_testing,
     otx_eval_deployment_testing,

tests/integration/cli/instance_segmentation/test_instance_segmentation.py

@@ -90,9 +90,6 @@
 TestInstanceSegmentationModelTemplates = generate_model_template_testing(templates)
 
 
-TestInstanceSegmentationModelTemplates = generate_model_template_testing(templates)
-
-
 class TestInstanceSegmentationCLI:
     @e2e_pytest_component
     @pytest.mark.parametrize("template", templates_with_experimental, ids=templates_ids_with_experimental)

tests/integration/cli/instance_segmentation/test_rotated_detection.py

@@ -33,6 +33,7 @@
 
 TestRotatedDetectionModelTemplates = generate_model_template_testing(templates)
 
+
 # NOTE: Most of implementation parts are same with the ISeg tasks.
 # So, currently just added the `test_otx_train` function to check
 # Whether further modifications make Rotated detection fails or not

tests/integration/cli/semantic_segmentation/test_segmentation.py

@@ -99,9 +99,6 @@
 TestSemanticSegmentationModelTemplates = generate_model_template_testing(templates)
 
 
-TestSemanticSegmentationModelTemplates = generate_model_template_testing(templates)
-
-
 class TestSegmentationCLI:
     @e2e_pytest_component
     @pytest.mark.parametrize("template", default_templates, ids=default_templates_ids)
@@ -246,5 +243,5 @@ def test_otx_train_auto_adapt_batch_size(self, template, tmp_dir_path, bs_adapt_
     def test_otx_train_auto_adapt_num_workers(self, template, tmp_dir_path):
         adapting_num_workers_args = copy.deepcopy(args)
         adapting_num_workers_args["train_params"].extend(["--learning_parameters.auto_num_workers", "True"])
-        tmp_dir_path = tmp_dir_path / f"segmentation_auto_adapt_num_workers"
+        tmp_dir_path = tmp_dir_path / "segmentation_auto_adapt_num_workers"
         otx_train_testing(template, tmp_dir_path, otx_dir, adapting_num_workers_args)

tests/unit/algorithms/classification/adapters/mmcls/test_configurer.py

@@ -47,11 +47,6 @@ def setup(self) -> None:
             os.path.join(DEFAULT_CLS_TEMPLATE_DIR, "model_hierarchical.py")
         )
 
-        self.multilabel_model_cfg = MPAConfig.fromfile(os.path.join(DEFAULT_CLS_TEMPLATE_DIR, "model_multilabel.py"))
-        self.hierarchical_model_cfg = MPAConfig.fromfile(
-            os.path.join(DEFAULT_CLS_TEMPLATE_DIR, "model_hierarchical.py")
-        )
-
     @e2e_pytest_unit
     def test_configure(self, mocker):
         mock_cfg_merge = mocker.patch.object(ClassificationConfigurer, "merge_configs")