From 57542d1acf535bc81f3ca5b7182b2e01a2b66499 Mon Sep 17 00:00:00 2001 From: kprokofi Date: Thu, 2 May 2024 21:12:29 +0900 Subject: [PATCH] fix nerge problems --- src/otx/core/exporter/base.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/otx/core/exporter/base.py b/src/otx/core/exporter/base.py index b29e5090c88..2f7a828d7ed 100644 --- a/src/otx/core/exporter/base.py +++ b/src/otx/core/exporter/base.py @@ -284,17 +284,13 @@ def _postprocess_openvino_model(self, exported_model: openvino.Model) -> openvin # name assignment process is similar to torch onnx export if self.output_names is not None: - if len(exported_model.outputs) >= len(self.output_names): -<<<<<<< HEAD - for i, name in enumerate(self.output_names): -======= - if len(exported_model.outputs) != len(self.output_names): - msg = ( - "Number of model outputs is greater than the number" - " of output names to assign. Please check output_names" - " argument of the exporter's constructor." - ) - log.warning(msg) + if len(exported_model.outputs) != len(self.output_names): + msg = ( + "Number of model outputs is greater than the number" + " of output names to assign. Please check output_names" + " argument of the exporter's constructor." + ) + log.warning(msg) for i, name in enumerate(self.output_names): traced_names = exported_model.outputs[i].get_names() @@ -312,7 +308,6 @@ def _postprocess_openvino_model(self, exported_model: openvino.Model) -> openvin ) log.warning(msg) ->>>>>>> develop exported_model.outputs[i].tensor.set_names({name}) else: msg = (