Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mvafin committed Jul 12, 2021
1 parent 49bf172 commit 5f4b211
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions model-optimizer/mo/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

import numpy as np

try:
import openvino_telemetry as tm
except ImportError:
import mo.utils.telemetry_stub as tm
# try:
# import openvino_telemetry as tm
# except ImportError:
import mo.utils.telemetry_stub as tm

from extensions.back.SpecialNodesFinalization import RemoveConstOps, CreateConstNodesReplacement, NormalizeTI
from mo.back.ie_ir_ver_2.emitter import append_ir_info
Expand All @@ -44,7 +44,7 @@
from mo.utils.versions_checker import check_requirements # pylint: disable=no-name-in-module

# pylint: disable=no-name-in-module,import-error
from ngraph.frontend import FrontEndManager
# from ngraph.frontend import FrontEndManager


def replace_ext(name: str, old: str, new: str):
Expand Down Expand Up @@ -157,15 +157,15 @@ def prepare_ir(argv: argparse.Namespace):

# This try-except is additional reinsurance that the IE
# dependency search does not break the MO pipeline
def raise_ie_not_found():
raise Error("Could not find the Inference Engine or nGraph Python API.\n"
"Consider building the Inference Engine and nGraph Python APIs from sources or try to install OpenVINO (TM) Toolkit using \"install_prerequisites.{}\"".format(
"bat" if sys.platform == "windows" else "sh"))
try:
if not find_ie_version(silent=argv.silent):
raise_ie_not_found()
except Exception as e:
raise_ie_not_found()
# def raise_ie_not_found():
# raise Error("Could not find the Inference Engine or nGraph Python API.\n"
# "Consider building the Inference Engine and nGraph Python APIs from sources or try to install OpenVINO (TM) Toolkit using \"install_prerequisites.{}\"".format(
# "bat" if sys.platform == "windows" else "sh"))
# try:
# if not find_ie_version(silent=argv.silent):
# raise_ie_not_found()
# except Exception as e:
# raise_ie_not_found()

# This is just to check that transform key is valid and transformations are available
check_available_transforms(parse_transform(argv.transform))
Expand Down

0 comments on commit 5f4b211

Please sign in to comment.