Use model_api action classification model wrapper class (#3610)

* implement draft * revert debug code * update model api version --------- Co-authored-by: Vladislav Sovrasov <[email protected]>
openvinotoolkit · Jul 2, 2024 · 3a44e46 · 3a44e46
1 parent 4a6d427
commit 3a44e46
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 113 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -96,7 +96,7 @@ base = [
     "timm",
     "openvino==2024.0",
     "openvino-dev==2024.0",
-    "openvino-model-api==0.2.0",
+    "openvino-model-api==0.2.1",
     "onnx==1.16.1",
     "onnxconverter-common==1.14.0",
     "nncf==2.9.0",

diff --git a/src/otx/algo/action_classification/__init__.py b/src/otx/algo/action_classification/__init__.py
@@ -5,11 +5,9 @@
 
 from .backbones import MoViNetBackbone, X3DBackbone
 from .heads import MoViNetHead, X3DHead
-from .openvino_model import OTXOVActionCls
 from .recognizers import BaseRecognizer, MoViNetRecognizer
 
 __all__ = [
-    "OTXOVActionCls",
     "BaseRecognizer",
     "MoViNetBackbone",
     "MoViNetHead",

diff --git a/src/otx/algo/action_classification/openvino_model.py b/src/otx/algo/action_classification/openvino_model.py
diff --git a/src/otx/core/model/action_classification.py b/src/otx/core/model/action_classification.py
@@ -355,4 +355,4 @@ def transform_fn(self, data_batch: ActionClsBatchDataEntity) -> np.array:
     @property
     def model_adapter_parameters(self) -> dict:
         """Model parameters for export."""
-        return {"input_layouts": "?NCTHW"}
+        return {"input_layouts": "NSCTHW"}
diff --git a/tests/unit/core/utils/test_tile.py b/tests/unit/core/utils/test_tile.py
@@ -28,6 +28,7 @@ def test_tile_transform_consistency(mocker):
     mocker.patch.multiple(Tiler, __abstractmethods__=set())
 
     tiler = Tiler(model=mock_model)
+    tiler.tile_with_full_img = True
     tiler.tile_size = rnd_tile_size
     tiler.tiles_overlap = rnd_tile_overlap