fix tests + update config names

Signed-off-by: Ashwin Vaidya <ashwinnitinvaidya@gmail.com>
openvinotoolkit · Mar 14, 2024 · 11b2661 · 11b2661
1 parent 7cb76e9
commit 11b2661
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/src/otx/engine/utils/auto_configurator.py b/src/otx/engine/utils/auto_configurator.py
@@ -81,6 +81,9 @@
     OTXTaskType.VISUAL_PROMPTING: "otx.core.model.entity.visual_prompting.OVVisualPromptingModel",
     OTXTaskType.ZERO_SHOT_VISUAL_PROMPTING: "otx.core.model.entity.visual_prompting.OVZeroShotVisualPromptingModel",
     OTXTaskType.ACTION_CLASSIFICATION: "otx.core.model.entity.action_classification.OVActionClsModel",
+    OTXTaskType.ANOMALY_CLASSIFICATION: "otx.algo.anomaly.anomaly_openvino.AnomalyOpenVINO",
+    OTXTaskType.ANOMALY_DETECTION: "otx.algo.anomaly.anomaly_openvino.AnomalyOpenVINO",
+    OTXTaskType.ANOMALY_SEGMENTATION: "otx.algo.anomaly.anomaly_openvino.AnomalyOpenVINO",
 }
 
 

diff --git a/...cipe/anomaly_classification/openvino.yaml → ...nomaly_classification/openvino_model.yaml b/...cipe/anomaly_classification/openvino.yaml → ...nomaly_classification/openvino_model.yaml
diff --git a/...tx/recipe/anomaly_detection/openvino.yaml → ...ipe/anomaly_detection/openvino_model.yaml b/...tx/recipe/anomaly_detection/openvino.yaml → ...ipe/anomaly_detection/openvino_model.yaml
diff --git a/...recipe/anomaly_segmentation/openvino.yaml → .../anomaly_segmentation/openvino_model.yaml b/...recipe/anomaly_segmentation/openvino.yaml → .../anomaly_segmentation/openvino_model.yaml
diff --git a/tests/integration/cli/test_cli.py b/tests/integration/cli/test_cli.py
@@ -7,8 +7,8 @@
 import numpy as np
 import pytest
 import yaml
-from otx.engine.utils.auto_configurator import DEFAULT_CONFIG_PER_TASK
 
+from otx.engine.utils.auto_configurator import DEFAULT_CONFIG_PER_TASK
 from tests.integration.cli.utils import run_main
 
 
@@ -129,9 +129,6 @@ def test_otx_e2e(
             "dino_v2",
             "instance_segmentation",
             "action",
-            "anomaly_classification",
-            "anomaly_detection",
-            "anomaly_segmentation",
         ]
     ):
         return
@@ -149,6 +146,10 @@ def test_otx_e2e(
             "EXPORTABLE_CODE": "exportable_code.zip",
         }
 
+    overrides = fxt_cli_override_command_per_task[task]
+    if "anomaly" in task:
+        overrides = {}  # Overrides are not needed in export
+
     tmp_path_test = tmp_path / f"otx_test_{model_name}"
     for fmt in format_to_file:
         command_cfg = [
@@ -160,7 +161,7 @@ def test_otx_e2e(
             fxt_target_dataset_per_task[task],
             "--work_dir",
             str(tmp_path_test / "outputs" / fmt),
-            *fxt_cli_override_command_per_task[task],
+            *overrides,
             "--checkpoint",
             str(ckpt_files[-1]),
             "--export_format",
@@ -185,6 +186,10 @@ def test_otx_e2e(
     )
     exported_model_path = str(ov_latest_dir / "exported_model.xml")
 
+    overrides = fxt_cli_override_command_per_task[task]
+    if "anomaly" in task:
+        overrides = {}  # Overrides are not needed in infer
+
     command_cfg = [
         "otx",
         "test",
@@ -196,7 +201,7 @@ def test_otx_e2e(
         str(tmp_path_test / "outputs"),
         "--engine.device",
         "cpu",
-        *fxt_cli_override_command_per_task[task],
+        *overrides,
         "--checkpoint",
         exported_model_path,
     ]

diff --git a/tests/integration/cli/test_export_inference.py b/tests/integration/cli/test_export_inference.py
@@ -38,6 +38,9 @@ def fxt_local_seed() -> int:
 
 
 TASK_NAME_TO_MAIN_METRIC_NAME = {
+    "anomaly_classification": "test/accuracy",
+    "anomaly_segmentation": "test/accuracy",
+    "anomaly_detection": "test/accuracy",
     "semantic_segmentation": "test/Dice",
     "multi_label_cls": "test/accuracy",
     "multi_class_cls": "test/accuracy",