Adjusts to new namespaces (openvinotoolkit#3916)

* Adjusts to new namespaces

Ticket 110661

* serialize->save_model

Author: Wovchena

demos/3d_segmentation_demo/python/3d_segmentation_demo.py

@@ -28,7 +28,7 @@
 from fnmatch import fnmatch
 from scipy.ndimage import zoom
 
-from openvino.runtime import Core, get_version, PartialShape
+from openvino import Core, get_version, PartialShape
 
 
 log.basicConfig(format='[ %(levelname)s ] %(message)s', level=log.DEBUG, stream=sys.stdout)

demos/action_recognition_demo/python/action_recognition_demo.py

@@ -20,7 +20,7 @@
 from argparse import ArgumentParser, SUPPRESS
 from os import path
 
-from openvino.runtime import Core, get_version
+from openvino import Core, get_version
 
 from action_recognition_demo.models import IEModel, DummyDecoder
 from action_recognition_demo.result_renderer import ResultRenderer

demos/action_recognition_demo/python/action_recognition_demo/models.py

@@ -22,7 +22,7 @@
 import cv2
 import numpy as np
 
-from openvino.runtime import AsyncInferQueue
+from openvino import AsyncInferQueue
 
 
 def center_crop(frame, crop_size):

demos/colorization_demo/python/colorization_demo.py

@@ -15,7 +15,7 @@
  limitations under the License.
 """
 
-from openvino.runtime import Core, get_version
+from openvino import Core, get_version
 import cv2 as cv
 import numpy as np
 import logging as log

demos/common/python/model_zoo/model_api/adapters/openvino_adapter.py

@@ -18,7 +18,7 @@
 from pathlib import Path
 
 try:
-    from openvino.runtime import AsyncInferQueue, Core, PartialShape, layout_helpers, get_version, Dimension
+    from openvino import AsyncInferQueue, Core, PartialShape, layout_helpers, get_version, Dimension
     openvino_absent = False
 except ImportError:
     openvino_absent = True

demos/common/python/model_zoo/model_api/adapters/utils.py

@@ -15,7 +15,7 @@
 """
 
 from typing import Optional
-from openvino.runtime import layout_helpers
+from openvino import layout_helpers
 
 
 class Layout:

demos/common/python/model_zoo/model_api/models/open_pose.py

@@ -20,7 +20,7 @@
     from numpy.core.umath import clip
 except ImportError:
     from numpy import clip
-import openvino.runtime.opset8 as opset8
+import openvino.opset8 as opset8
 
 from .image_model import ImageModel
 from .types import NumericalValue

demos/face_recognition_demo/python/face_detector.py

@@ -19,7 +19,7 @@
 from ie_module import Module
 from utils import resize_input
 
-from openvino.runtime import PartialShape
+from openvino import PartialShape
 
 
 class FaceDetector(Module):

demos/face_recognition_demo/python/face_recognition_demo.py

@@ -23,7 +23,7 @@
 
 import cv2
 import numpy as np
-from openvino.runtime import Core, get_version
+from openvino import Core, get_version
 
 sys.path.append(str(Path(__file__).resolve().parents[2] / 'common/python'))
 sys.path.append(str(Path(__file__).resolve().parents[2] / 'common/python/model_zoo'))

demos/face_recognition_demo/python/ie_module.py

@@ -15,7 +15,7 @@
 """
 
 import logging as log
-from openvino.runtime import AsyncInferQueue
+from openvino import AsyncInferQueue
 
 
 class Module:

demos/formula_recognition_demo/python/utils.py

@@ -28,7 +28,7 @@
 import cv2 as cv
 import numpy as np
 import sympy
-from openvino.runtime import Core, get_version
+from openvino import Core, get_version
 from tqdm import tqdm
 
 START_TOKEN = 0

demos/gesture_recognition_demo/python/gesture_recognition_demo/common.py

@@ -15,7 +15,7 @@
 """
 
 import logging as log
-from openvino.runtime import Core, get_version, AsyncInferQueue
+from openvino import Core, get_version, AsyncInferQueue
 
 
 def load_core():

demos/gpt2_text_prediction_demo/python/gpt2_text_prediction_demo.py

@@ -23,7 +23,7 @@
 from pathlib import Path
 
 import numpy as np
-from openvino.runtime import Core, get_version, PartialShape, Dimension
+from openvino import Core, get_version, PartialShape, Dimension
 from tokenizers import Tokenizer, pre_tokenizers, decoders
 from tokenizers.models import BPE
 

demos/handwritten_text_recognition_demo/python/handwritten_text_recognition_demo.py

@@ -22,7 +22,7 @@
 import cv2
 import numpy as np
 
-from openvino.runtime import Core, get_version
+from openvino import Core, get_version
 from utils.codec import CTCCodec
 
 log.basicConfig(format='[ %(levelname)s ] %(message)s', level=log.DEBUG, stream=sys.stdout)

demos/human_pose_estimation_3d_demo/python/modules/inference_engine.py

@@ -14,7 +14,7 @@
 import logging as log
 import numpy as np
 
-from openvino.runtime import Core, get_version, PartialShape
+from openvino import Core, get_version, PartialShape
 
 
 class InferenceEngine:

demos/image_inpainting_demo/python/image_inpainting_demo.py

@@ -20,7 +20,7 @@
 
 import numpy as np
 import cv2
-from openvino.runtime import Core, get_version
+from openvino import Core, get_version
 
 from inpainting_gui import InpaintingGUI
 from inpainting import ImageInpainting

demos/image_retrieval_demo/python/image_retrieval_demo/image_retrieval.py

@@ -23,7 +23,7 @@
 
 from image_retrieval_demo.common import from_list, crop_resize
 
-from openvino.runtime import Core, get_version
+from openvino import Core, get_version
 
 
 class IEModel(): # pylint: disable=too-few-public-methods

demos/image_translation_demo/python/image_translation_demo.py

@@ -18,7 +18,7 @@
 
 import cv2
 import numpy as np
-from openvino.runtime import Core, get_version
+from openvino import Core, get_version
 
 from image_translation_demo.models import CocosnetModel, SegmentationModel
 from image_translation_demo.preprocessing import (

demos/machine_translation_demo/python/machine_translation_demo.py

@@ -20,7 +20,7 @@
 from pathlib import Path
 
 import numpy as np
-from openvino.runtime import Core, get_version
+from openvino import Core, get_version
 from tokenizers import SentencePieceBPETokenizer
 
 log.basicConfig(format='[ %(levelname)s ] %(message)s', level=log.DEBUG, stream=sys.stdout)

demos/mri_reconstruction_demo/python/mri_reconstruction_demo.py

@@ -8,7 +8,7 @@
 
 import numpy as np
 import cv2 as cv
-from openvino.runtime import Core
+from openvino import Core
 
 logging.basicConfig(format='[ %(levelname)s ] %(message)s', level=logging.INFO, stream=sys.stdout)
 logger = logging.getLogger('mri_reconstruction_demo')

demos/multi_camera_multi_target_tracking_demo/python/multi_camera_multi_target_tracking_demo.py

@@ -32,7 +32,7 @@
 from utils.misc import read_py_config, check_pressed_keys
 from utils.video import MulticamCapture, NormalizerCLAHE
 from utils.visualization import visualize_multicam_detections, get_target_size
-from openvino.runtime import Core, get_version
+from openvino import Core, get_version
 
 sys.path.append(str(Path(__file__).resolve().parents[2] / 'common/python'))
 sys.path.append(str(Path(__file__).resolve().parents[2] / 'common/python/model_zoo'))

demos/multi_camera_multi_target_tracking_demo/python/utils/ie_tools.py

@@ -16,7 +16,7 @@
 import numpy as np
 import cv2
 
-from openvino.runtime import AsyncInferQueue
+from openvino import AsyncInferQueue
 
 
 class IEModel:

demos/noise_suppression_demo/python/noise_suppression_demo.py

@@ -14,7 +14,7 @@
 import numpy as np
 import wave
 
-from openvino.runtime import Core, get_version
+from openvino import Core, get_version
 
 log.basicConfig(format='[ %(levelname)s ] %(message)s', level=log.DEBUG, stream=sys.stdout)
 

demos/place_recognition_demo/python/place_recognition_demo/place_recognition.py

@@ -22,7 +22,7 @@
 
 from place_recognition_demo.common import crop_resize
 
-from openvino.runtime import Core, get_version
+from openvino import Core, get_version
 
 
 class IEModel: # pylint: disable=too-few-public-methods

demos/single_human_pose_estimation_demo/python/single_human_pose_estimation_demo.py

@@ -7,7 +7,7 @@
 from time import perf_counter
 import cv2
 
-from openvino.runtime import Core, get_version
+from openvino import Core, get_version
 
 from detector import Detector
 from estimator import HumanPoseEstimator

demos/smartlab_demo/python/smartlab_demo.py

@@ -22,7 +22,7 @@
 
 from display import Display
 from evaluator import Evaluator
-from openvino.runtime import Core
+from openvino import Core
 from argparse import ArgumentParser, SUPPRESS
 from segmentor import Segmentor, SegmentorMstcn
 from object_detection.detector import Detector

demos/sound_classification_demo/python/sound_classification_demo.py

@@ -22,7 +22,7 @@
 import wave
 
 import numpy as np
-from openvino.runtime import Core, get_version
+from openvino import Core, get_version
 
 log.basicConfig(format='[ %(levelname)s ] %(message)s', level=log.DEBUG, stream=sys.stdout)
 

demos/speech_recognition_deepspeech_demo/python/speech_recognition_deepspeech_demo.py

@@ -16,7 +16,7 @@
 import yaml
 import numpy as np
 from tqdm import tqdm
-from openvino.runtime import Core, get_version
+from openvino import Core, get_version
 
 from asr_utils.profiles import PROFILES
 from asr_utils.deep_speech_seq_pipeline import DeepSpeechSeqPipeline

demos/speech_recognition_quartznet_demo/python/speech_recognition_quartznet_demo.py

@@ -32,7 +32,7 @@
 import scipy
 import wave
 
-from openvino.runtime import Core, get_version, PartialShape
+from openvino import Core, get_version, PartialShape
 
 log.basicConfig(format='[ %(levelname)s ] %(message)s', level=log.DEBUG, stream=sys.stdout)
 

demos/speech_recognition_wav2vec_demo/python/speech_recognition_wav2vec_demo.py

@@ -26,7 +26,7 @@
 import numpy as np
 import wave
 
-from openvino.runtime import Core, get_version, PartialShape
+from openvino import Core, get_version, PartialShape
 
 log.basicConfig(format='[ %(levelname)s ] %(message)s', level=log.DEBUG, stream=sys.stdout)
 

demos/text_spotting_demo/python/text_spotting_demo.py

@@ -24,7 +24,7 @@
 import cv2
 import numpy as np
 from scipy.special import softmax
-from openvino.runtime import Core, get_version
+from openvino import Core, get_version
 
 from text_spotting_demo.tracker import StaticIOUTracker
 

demos/text_to_speech_demo/python/models/mel2wave_ie.py

@@ -18,7 +18,7 @@
 
 import numpy as np
 
-from openvino.runtime import PartialShape, set_batch, Layout
+from openvino import PartialShape, set_batch, Layout
 from utils.wav_processing import (
     fold_with_overlap, infer_from_discretized_mix_logistic, pad_tensor, xfade_and_unfold,
 )

demos/text_to_speech_demo/python/text_to_speech_demo.py

@@ -24,7 +24,7 @@
 from tqdm import tqdm
 import numpy as np
 import wave
-from openvino.runtime import Core, get_version
+from openvino import Core, get_version
 
 from models.forward_tacotron_ie import ForwardTacotronIE
 from models.mel2wave_ie import WaveRNNIE, MelGANIE

demos/time_series_forecasting_demo/python/time_series_forecasting_demo.py

@@ -20,7 +20,7 @@
 
 import matplotlib.pyplot as plt
 import matplotlib.animation as animation
-from openvino.runtime import Core, get_version
+from openvino import Core, get_version
 from accuracy_checker.dataset import read_annotation
 
 

demos/whiteboard_inpainting_demo/python/whiteboard_inpainting_demo.py

@@ -20,7 +20,7 @@
 import sys
 from pathlib import Path
 
-from openvino.runtime import Core, get_version
+from openvino import Core, get_version
 
 from utils.network_wrappers import MaskRCNN, SemanticSegmentation
 from utils.misc import MouseClick, check_pressed_keys

tools/accuracy_checker/.pylintrc

@@ -25,7 +25,7 @@ disable = C0103,
 max-line-length = 120
 ignore-docstrings = yes
 extension-pkg-whitelist=inference_engine,cv2,numpy,mxnet,tensorflow,pycocotools,onnxruntime,kenlm,paddle,torchvision
-ignored-modules = numpy,cv2,openvino.inference_engine,caffe,mxnet,tensorflow,pycocotools,onnxruntime,torch,kenlm,paddle.fluid.core,torchvision,openvino.runtime.impl,openvino.runtime
+ignored-modules = numpy,cv2,openvino.inference_engine,caffe,mxnet,tensorflow,pycocotools,onnxruntime,torch,kenlm,paddle.fluid.core,torchvision,openvino.impl,openvino
 load-plugins = pylint_checkers
 ignored-classes = pathlib.PurePath
 jobs=0

tools/accuracy_checker/accuracy_checker/launcher/openvino_launcher.py

@@ -21,7 +21,7 @@
 from pathlib import Path
 import re
 import numpy as np
-from openvino.runtime import Core, AsyncInferQueue, get_version, PartialShape, Type, Dimension
+from openvino import Core, AsyncInferQueue, get_version, PartialShape, Type, Dimension
 from openvino.preprocess import PrePostProcessor
 from .dlsdk_launcher_config import (
     HETERO_KEYWORD, MULTI_DEVICE_KEYWORD, NIREQ_REGEX, VPU_PLUGINS, AUTO_DEVICE_KEYWORD, AUTO_SINGLE_DEVICE_KEYWORD,

tools/accuracy_checker/accuracy_checker/utils.py

@@ -977,7 +977,7 @@ def ov_new_api_available():
     except ImportError:
         return None
     try:
-        from openvino.runtime import Core # noqa: F401
+        from openvino import Core # noqa: F401
         return True
     except ImportError:
         return False

tools/accuracy_checker/tests/test_dlsdk_launcher.py

@@ -40,7 +40,7 @@ def no_available_myriad():
 
 
 def no_available_gpu():
-    from openvino.runtime import Core
+    from openvino import Core
     return 'GPU' not in Core().available_devices
 
 

tools/model_tools/src/omz_tools/_common.py

@@ -136,7 +136,7 @@ def get_package_path(python_executable, package_name):
 
 def get_version():
     try:
-        from openvino.runtime import get_version as ov_get_version
+        from openvino import get_version as ov_get_version
         ov_version = ov_get_version()
         version_match = re.match(r"^([0-9]+).([0-9]+)*", ov_version)
         return f"{version_match.group(0)}-{__version__}"

tools/model_tools/src/omz_tools/models.py

@@ -170,7 +170,7 @@ def inputs(self):
                 self.model = self.ie.read_model(self.model_path)
             except AttributeError:
                 raise TypeError('ie is not specified or is of the wrong type.'
-                                'Please check ie is of openvino.runtime.Core type.')
+                                'Please check ie is of openvino.Core type.')
 
         return self.model.inputs
 

tools/model_tools/src/omz_tools/omz_converter.py

@@ -20,7 +20,7 @@
 import string
 import sys
 
-from openvino.runtime import Core, serialize
+from openvino import Core, save_model
 from pathlib import Path
 
 from omz_tools import (
@@ -193,7 +193,7 @@ def convert(reporter, model, output_dir, args, mo_props, requested_precisions):
             rt_model.set_rt_info(val, ['model_info', 'labels'])
         except KeyError:
             pass
-        serialize(rt_model, str(mo_output_dir / model.name) + '.xml')
+        save_model(rt_model, str(mo_output_dir / model.name) + '.xml', "FP16" == data_type)
     return True
 
 def num_jobs_arg(value_str):