Fix tiling IS tests

openvinotoolkit · May 17, 2023 · e6ae9f2 · e6ae9f2
1 parent b1760f8
commit e6ae9f2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,11 +16,8 @@ All notable changes to this project will be documented in this file.
 
 - Make semantic segmentation OpenVINO models compatible with ModelAPI (<https://github.com/openvinotoolkit/training_extensions/pull/2029>).
 - Support label hierarchy through LabelTree in LabelSchema for classification task (<https://github.com/openvinotoolkit/training_extensions/pull/2149>, <https://github.com/openvinotoolkit/training_extensions/pull/2152>).
-<<<<<<< HEAD
 - Enhance exportable code file structure, video inference and default value for demo (<https://github.com/openvinotoolkit/training_extensions/pull/2051>).
-=======
 - Refactoring of ONNX export functionality (<https://github.com/openvinotoolkit/training_extensions/pull/2155>).
->>>>>>> 81db95455 (Update changelog)
 
 ### Bug fixes
 

diff --git a/otx/algorithms/common/adapters/mmdeploy/apis.py b/otx/algorithms/common/adapters/mmdeploy/apis.py
@@ -226,6 +226,7 @@ def helper(*args, **kwargs):
                     input_data,
                     cfg,
                     deploy_cfg,
+                    export_type,
                     model_name=model_name,
                 )
 
@@ -255,6 +256,7 @@ def extract_partition(
             input_data: Any,
             cfg: mmcv.Config,
             deploy_cfg: mmcv.Config,
+            export_type: str,
             *,
             model_name: str = "model",
         ):
@@ -276,15 +278,16 @@ def extract_partition(
                 partition_cfgs,
             )
 
-            deploy_cfg_ = deepcopy(deploy_cfg)
-            update_deploy_cfg(partition_onnx[0], deploy_cfg_)
-            MMdeployExporter.onnx2openvino(
-                output_dir,
-                partition_onnx[0],
-                deploy_cfg_,
-            )
-            deploy_cfg["partition_config"]["apply_marks"] = False
-            reset_mark_function_count()
+            if "ONNX" not in export_type:
+                deploy_cfg_ = deepcopy(deploy_cfg)
+                update_deploy_cfg(partition_onnx[0], deploy_cfg_)
+                MMdeployExporter.onnx2openvino(
+                    output_dir,
+                    partition_onnx[0],
+                    deploy_cfg_,
+                )
+                deploy_cfg["partition_config"]["apply_marks"] = False
+                reset_mark_function_count()
 
         @staticmethod
         def torch2onnx(