diff --git a/tests/e2e_oss/collect_refs.py b/tests/e2e_oss/collect_refs.py index d874807f30fb63..b74ca82c846a1e 100644 --- a/tests/e2e_oss/collect_refs.py +++ b/tests/e2e_oss/collect_refs.py @@ -14,8 +14,8 @@ import numpy as np import logging as log import os -from tests.e2e_oss.common_utils.parsers import pipeline_cfg_to_string -from tests.utils.e2e.common.pipeline import Pipeline +from e2e_oss.common_utils.parsers import pipeline_cfg_to_string +from utils.e2e.common.pipeline import Pipeline pytest_plugins = ('e2e_oss.plugins.ref_collect.conftest', ) diff --git a/tests/e2e_oss/common_utils/e2e_wrapper.py b/tests/e2e_oss/common_utils/e2e_wrapper.py index 60bd655ba13d74..c86747ea187517 100644 --- a/tests/e2e_oss/common_utils/e2e_wrapper.py +++ b/tests/e2e_oss/common_utils/e2e_wrapper.py @@ -41,7 +41,7 @@ # pylint: disable=wrong-import-position,wrong-import-order,import-error,unused-import,no-name-in-module -from tests.utils.e2e.env_tools import Environment -from tests.utils.e2e.ir_provider.model_optimizer_runner import MORunner -from tests.utils.e2e.ref_collector.score_pytorch_onnx_runtime import PytorchPretrainedToONNXRunner,\ +from utils.e2e.env_tools import Environment +from utils.e2e.ir_provider.model_optimizer_runner import MORunner +from utils.e2e.ref_collector.score_pytorch_onnx_runtime import PytorchPretrainedToONNXRunner,\ PytorchTorchvisionToONNXRunner diff --git a/tests/e2e_oss/common_utils/hook_utils.py b/tests/e2e_oss/common_utils/hook_utils.py index d91d9831272be6..c5450591e36ca6 100644 --- a/tests/e2e_oss/common_utils/hook_utils.py +++ b/tests/e2e_oss/common_utils/hook_utils.py @@ -21,8 +21,7 @@ from _pytest.python import Function from . import config -from .config import bug_ids, components_ids, req_ids, test_run_id, test_session_build_number -from .environment_info import EnvironmentInfo +from .config import bug_ids, components_ids, req_ids from .logger import get_logger from .marks import MarkGeneral, MarkRunType diff --git a/tests/e2e_oss/common_utils/logger.py b/tests/e2e_oss/common_utils/logger.py index 0f94452d6a3ee7..367bb5e255be30 100644 --- a/tests/e2e_oss/common_utils/logger.py +++ b/tests/e2e_oss/common_utils/logger.py @@ -27,7 +27,7 @@ from datetime import datetime from typing import cast, List, Union, Tuple, Generator -from tests.e2e_oss.common_utils import config +from e2e_oss.common_utils import config SEPARATOR = "=" * 20 FIXTURE_SEPARATOR = "*" * 20 diff --git a/tests/e2e_oss/common_utils/multiprocessing_utils.py b/tests/e2e_oss/common_utils/multiprocessing_utils.py new file mode 100644 index 00000000000000..0fc340cac83eb2 --- /dev/null +++ b/tests/e2e_oss/common_utils/multiprocessing_utils.py @@ -0,0 +1,101 @@ +import logging as log +import os +import platform +import signal +import sys +import traceback +from logging.handlers import QueueHandler +from multiprocessing import Process, Queue, TimeoutError, ProcessError +from queue import Empty as QueueEmpty +from typing import Callable, Union + +if platform.system() == "Darwin": + # Fix for MacOS + import multiprocessing + multiprocessing.set_start_method("forkserver", True) + + +def _mp_wrapped_func(func: Callable, func_args: list, queue: Queue, logger_queue: Queue): + """ + Wraps callable object with exception handling. Current wrapper is a target for + `multiprocessing_run` function + :param func: see `multiprocessing_run` + :param func_args: see `multiprocessing_run` + :param queue: multiprocessing.Queue(). Used for getting callable object return values + :param logger_queue: multiprocessing.Queue(). Used for getting logs from child process in parent process + :return: + """ + + # Remove all handlers from root logger in child process in favor of `QueueHandler` + # to prevent double console logs in stdout + log.getLogger().handlers = [QueueHandler(logger_queue)] + + error_message = "" + res = None + try: + res = func(*func_args) + except: + ex_type, ex_value, tb = sys.exc_info() + error_message = "{tb}\n{ex_type}: {ex_value}".format(tb=''.join(traceback.format_tb(tb)), + ex_type=ex_type.__name__, ex_value=ex_value) + queue.put((error_message, res)) + + +def multiprocessing_run(func: Callable, func_args: list, func_log_name: str, timeout: Union[int, None] = None): + """ + Wraps callable object to a separate process using multiprocessing module + :param func: callable object + :param func_args: list of arguments for callable + :param func_log_name: name of callable used for logging + :param timeout: positive int to limit execution time + :return: return value (or values) from callable object + """ + queue = Queue() + logger_queue = Queue(-1) + process = Process(target=_mp_wrapped_func, args=(func, func_args, queue, logger_queue)) + process.start() + try: + error_message, *ret_args = queue.get(timeout=timeout) + except QueueEmpty: + raise TimeoutError("{func} running timed out!".format(func=func_log_name)) + finally: + queue.close() + + # Extract logs from Queue and pass to root logger + while not logger_queue.empty(): + rec = logger_queue.get() + log.getLogger().handle(rec) + logger_queue.close() + + if process.is_alive(): + process.terminate() + process.join() + else: + exit_signal = multiprocessing_exitcode_to_signal(process.exitcode) + if exit_signal: + raise ProcessError( + "{func} was killed with a signal {signal}".format(func=func_log_name, signal=exit_signal)) + + if error_message: + raise ProcessError("\n{func} running failed: \n{msg}".format(func=func_log_name, msg=error_message)) + + ret_args = ret_args[0] if len(ret_args) == 1 else ret_args # unwrap from list if only 1 item is returned + return ret_args + + +def multiprocessing_exitcode_to_signal(exitcode): + """ + Map multiprocessing exitcode to signals from "signal" module + :param exitcode: multiprocessing exitcode + :return: signal from "signal" if exitcode mapped on signal or None + """ + # Multiprocessing return negative values of signal of the process, but on Win they are positive. + # Bring the value to the positive format. + exit_code = exitcode if os.name == "nt" else -exitcode + if exit_code > 0: + code_map = {int(getattr(signal, sig)): str(getattr(signal, sig)) + for sig in dir(signal) if sig.startswith("SIG")} + exit_signal = code_map[exit_code] if exit_code in code_map else exit_code + else: + exit_signal = None + return exit_signal diff --git a/tests/e2e_oss/common_utils/openvino_resources.py b/tests/e2e_oss/common_utils/openvino_resources.py index 817231b4a562bb..8ce8d93a69ac96 100644 --- a/tests/e2e_oss/common_utils/openvino_resources.py +++ b/tests/e2e_oss/common_utils/openvino_resources.py @@ -32,8 +32,8 @@ from pathlib import Path from distutils import spawn -from tests.e2e_oss.common_utils.config import openvino_root_dir -from tests.e2e_oss.common_utils.sys_info_utils import os_type_is_windows +from e2e_oss.common_utils.config import openvino_root_dir +from e2e_oss.common_utils.sys_info_utils import os_type_is_windows class OpenVINOResourceNotFound(Exception): diff --git a/tests/e2e_oss/conftest.py b/tests/e2e_oss/conftest.py index 71a0fd73f9df09..6545e92caa5436 100644 --- a/tests/e2e_oss/conftest.py +++ b/tests/e2e_oss/conftest.py @@ -23,7 +23,7 @@ from cpuinfo import get_cpu_info -from .common_utils.logger import get_logger +from e2e_oss.common_utils.logger import get_logger from .common_utils.sys_info_utils import get_sys_info from .common_utils.tf_helper import TFVersionHelper diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/common_base_class.py b/tests/e2e_oss/pipelines/pipeline_base_classes/common_base_class.py index 062d77c1505c35..debaaa35d3035e 100644 --- a/tests/e2e_oss/pipelines/pipeline_base_classes/common_base_class.py +++ b/tests/e2e_oss/pipelines/pipeline_base_classes/common_base_class.py @@ -8,12 +8,12 @@ import numpy as np import pytest -from tests.e2e_oss._utils.path_utils import resolve_file_path +from e2e_oss._utils.path_utils import resolve_file_path # import local modules: -from tests.e2e_oss._utils.test_utils import align_output_name -from tests.e2e_oss.common_utils.parsers import mapping_parser as mapping -from tests.utils.e2e.common.e2e_utils import get_tensor_names_dict -from tests.utils.e2e.env_tools import Environment +from e2e_oss._utils.test_utils import align_output_name +from e2e_oss.common_utils.parsers import mapping_parser as mapping +from utils.e2e.common.e2e_utils import get_tensor_names_dict +from utils.e2e.env_tools import Environment log = getLogger(__name__) diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/dummy_comparator.py b/tests/e2e_oss/pipelines/pipeline_base_classes/dummy_comparator.py index 0ac73fb6fc792a..23de7a84d13188 100644 --- a/tests/e2e_oss/pipelines/pipeline_base_classes/dummy_comparator.py +++ b/tests/e2e_oss/pipelines/pipeline_base_classes/dummy_comparator.py @@ -1,13 +1,13 @@ from collections import OrderedDict -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import dummy_comparators -from tests.e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation -from tests.e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc -from tests.e2e_oss._utils.path_utils import prepend_with_env_path, resolve_file_path -from tests.e2e_oss.common_utils.pytest_utils import mark +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.comparators_template import dummy_comparators +from e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation +from e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc +from e2e_oss._utils.path_utils import prepend_with_env_path, resolve_file_path +from e2e_oss.common_utils.pytest_utils import mark class IE_Infer_Only_Base(CommonConfig): diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/onnx_precollected.py b/tests/e2e_oss/pipelines/pipeline_base_classes/onnx_precollected.py index 75d37f236d29d5..9b29be873fc982 100644 --- a/tests/e2e_oss/pipelines/pipeline_base_classes/onnx_precollected.py +++ b/tests/e2e_oss/pipelines/pipeline_base_classes/onnx_precollected.py @@ -1,13 +1,13 @@ import os from collections import OrderedDict -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators -from tests.e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_pb_input, read_npy_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation -from tests.e2e_oss._utils.path_utils import prepend_with_env_path -from tests.e2e_oss.common_utils.pytest_utils import mark +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators +from e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step +from e2e_oss.pipelines.pipeline_templates.input_templates import read_pb_input, read_npy_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation +from e2e_oss._utils.path_utils import prepend_with_env_path +from e2e_oss.common_utils.pytest_utils import mark class ONNXPrecollectedProtobufBaseClass(CommonConfig): diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/onnx_runtime.py b/tests/e2e_oss/pipelines/pipeline_base_classes/onnx_runtime.py index 35bffd2186b708..599a7750ef0119 100644 --- a/tests/e2e_oss/pipelines/pipeline_base_classes/onnx_runtime.py +++ b/tests/e2e_oss/pipelines/pipeline_base_classes/onnx_runtime.py @@ -1,18 +1,18 @@ import os from collections import OrderedDict -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.collect_reference_templates import get_refs_onnx_runtime -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import classification_comparators, eltwise_comparators, \ +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.collect_reference_templates import get_refs_onnx_runtime +from e2e_oss.pipelines.pipeline_templates.comparators_template import classification_comparators, eltwise_comparators, \ dummy_comparators, object_detection_comparators, ssim_comparators -from tests.e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation -from tests.e2e_oss.pipelines.pipeline_templates.postproc_template import parse_classification, parse_object_detection, \ +from e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation +from e2e_oss.pipelines.pipeline_templates.postproc_template import parse_classification, parse_object_detection, \ parse_image_modification -from tests.e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc -from tests.e2e_oss._utils.path_utils import prepend_with_env_path, resolve_file_path -from tests.e2e_oss.common_utils.pytest_utils import mark +from e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc +from e2e_oss._utils.path_utils import prepend_with_env_path, resolve_file_path +from e2e_oss.common_utils.pytest_utils import mark class ONNXRuntimeEltwiseBaseClass(CommonConfig): diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/paddlepaddle.py b/tests/e2e_oss/pipelines/pipeline_base_classes/paddlepaddle.py index fa7c1185b41f90..0f63c7885a91c0 100644 --- a/tests/e2e_oss/pipelines/pipeline_base_classes/paddlepaddle.py +++ b/tests/e2e_oss/pipelines/pipeline_base_classes/paddlepaddle.py @@ -1,16 +1,16 @@ from collections import OrderedDict -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.collect_reference_templates import read_refs_pipeline, \ +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.collect_reference_templates import read_refs_pipeline, \ collect_paddlepaddle_refs -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators, \ +from e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators, \ object_detection_comparators, segmentation_comparators -from tests.e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation -from tests.e2e_oss.pipelines.pipeline_templates.postproc_template import paddlepaddle_od_postproc -from tests.e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc -from tests.e2e_oss._utils.path_utils import prepend_with_env_path, ref_from_model, resolve_file_path +from e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation +from e2e_oss.pipelines.pipeline_templates.postproc_template import paddlepaddle_od_postproc +from e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc +from e2e_oss._utils.path_utils import prepend_with_env_path, ref_from_model, resolve_file_path class PaddlePaddleEltwise(CommonConfig): diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/pregen_classification.py b/tests/e2e_oss/pipelines/pipeline_base_classes/pregen_classification.py index 9d30df7adcfaab..04b34701fcaeb9 100644 --- a/tests/e2e_oss/pipelines/pipeline_base_classes/pregen_classification.py +++ b/tests/e2e_oss/pipelines/pipeline_base_classes/pregen_classification.py @@ -1,16 +1,16 @@ import os from collections import OrderedDict -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.collect_reference_templates import read_refs_pipeline -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import classification_comparators -from tests.e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import ir_pregenerated -from tests.e2e_oss.pipelines.pipeline_templates.postproc_template import parse_classification -from tests.e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc_caffe -from tests.e2e_oss._utils.path_utils import search_model_path_recursively, ref_from_model, resolve_file_path -from tests.e2e_oss.common_utils.pytest_utils import mark +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.collect_reference_templates import read_refs_pipeline +from e2e_oss.pipelines.pipeline_templates.comparators_template import classification_comparators +from e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import ir_pregenerated +from e2e_oss.pipelines.pipeline_templates.postproc_template import parse_classification +from e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc_caffe +from e2e_oss._utils.path_utils import search_model_path_recursively, ref_from_model, resolve_file_path +from e2e_oss.common_utils.pytest_utils import mark class Pregenerated_classification_base(CommonConfig): diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/pregen_eltwise.py b/tests/e2e_oss/pipelines/pipeline_base_classes/pregen_eltwise.py index 53643cfe5bd322..cebc5a83111f13 100644 --- a/tests/e2e_oss/pipelines/pipeline_base_classes/pregen_eltwise.py +++ b/tests/e2e_oss/pipelines/pipeline_base_classes/pregen_eltwise.py @@ -1,15 +1,15 @@ import os from collections import OrderedDict -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.collect_reference_templates import read_refs_pipeline -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators -from tests.e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import ir_pregenerated -from tests.e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc_caffe -from tests.e2e_oss._utils.path_utils import search_model_path_recursively, ref_from_model, resolve_file_path -from tests.e2e_oss.common_utils.pytest_utils import mark +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.collect_reference_templates import read_refs_pipeline +from e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators +from e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import ir_pregenerated +from e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc_caffe +from e2e_oss._utils.path_utils import search_model_path_recursively, ref_from_model, resolve_file_path +from e2e_oss.common_utils.pytest_utils import mark people_input_file = resolve_file_path("test_data/inputs/caffe/object_detection_voc_people.npz") car_input_file = resolve_file_path("test_data/inputs/caffe/car_1.npz") diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/pregen_od.py b/tests/e2e_oss/pipelines/pipeline_base_classes/pregen_od.py index fd38408da8260e..4189aa0dffe0b8 100644 --- a/tests/e2e_oss/pipelines/pipeline_base_classes/pregen_od.py +++ b/tests/e2e_oss/pipelines/pipeline_base_classes/pregen_od.py @@ -1,14 +1,14 @@ import os from collections import OrderedDict -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import object_detection_comparators -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import ir_pregenerated -from tests.e2e_oss.pipelines.pipeline_templates.postproc_template import parse_object_detection -from tests.e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc_caffe -from tests.e2e_oss._utils.path_utils import search_model_path_recursively, ref_from_model, resolve_file_path -from tests.e2e_oss.common_utils.pytest_utils import mark +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.comparators_template import object_detection_comparators +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import ir_pregenerated +from e2e_oss.pipelines.pipeline_templates.postproc_template import parse_object_detection +from e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc_caffe +from e2e_oss._utils.path_utils import search_model_path_recursively, ref_from_model, resolve_file_path +from e2e_oss.common_utils.pytest_utils import mark people_input_file = resolve_file_path("test_data/inputs/caffe/object_detection_voc_people.npz") diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/pregen_ss.py b/tests/e2e_oss/pipelines/pipeline_base_classes/pregen_ss.py index 2f25b3e69835b6..1329163210a1d3 100644 --- a/tests/e2e_oss/pipelines/pipeline_base_classes/pregen_ss.py +++ b/tests/e2e_oss/pipelines/pipeline_base_classes/pregen_ss.py @@ -1,16 +1,16 @@ import os from collections import OrderedDict -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.collect_reference_templates import read_refs_pipeline -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import segmentation_comparators -from tests.e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import ir_pregenerated -from tests.e2e_oss.pipelines.pipeline_templates.postproc_template import parse_semantic_segmentation -from tests.e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc_caffe -from tests.e2e_oss._utils.path_utils import search_model_path_recursively, ref_from_model, resolve_file_path -from tests.e2e_oss.common_utils.pytest_utils import mark +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.collect_reference_templates import read_refs_pipeline +from e2e_oss.pipelines.pipeline_templates.comparators_template import segmentation_comparators +from e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import ir_pregenerated +from e2e_oss.pipelines.pipeline_templates.postproc_template import parse_semantic_segmentation +from e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc_caffe +from e2e_oss._utils.path_utils import search_model_path_recursively, ref_from_model, resolve_file_path +from e2e_oss.common_utils.pytest_utils import mark people_input_file = resolve_file_path("test_data/inputs/caffe/object_detection_voc_people.npz") diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/pytorch.py b/tests/e2e_oss/pipelines/pipeline_base_classes/pytorch.py index 257d83f6e0e80b..bba226758d3336 100644 --- a/tests/e2e_oss/pipelines/pipeline_base_classes/pytorch.py +++ b/tests/e2e_oss/pipelines/pipeline_base_classes/pytorch.py @@ -3,18 +3,18 @@ import torch -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.collect_reference_templates import read_refs_pipeline -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import classification_comparators -from tests.e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation -from tests.e2e_oss.pipelines.pipeline_templates.pytorch_loader_template import pytorch_loader -from tests.e2e_oss.pipelines.pipeline_templates.pytorch_to_onnx_converter_template import convert_pytorch_to_onnx -from tests.e2e_oss.pipelines.pipeline_templates.postproc_template import parse_classification -from tests.e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc -from tests.e2e_oss._utils.path_utils import prepend_with_env_path, ref_from_model, resolve_file_path -from tests.e2e_oss.common_utils.pytest_utils import mark +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.collect_reference_templates import read_refs_pipeline +from e2e_oss.pipelines.pipeline_templates.comparators_template import classification_comparators +from e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation +from e2e_oss.pipelines.pipeline_templates.pytorch_loader_template import pytorch_loader +from e2e_oss.pipelines.pipeline_templates.pytorch_to_onnx_converter_template import convert_pytorch_to_onnx +from e2e_oss.pipelines.pipeline_templates.postproc_template import parse_classification +from e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc +from e2e_oss._utils.path_utils import prepend_with_env_path, ref_from_model, resolve_file_path +from e2e_oss.common_utils.pytest_utils import mark class _PyTorchBase(CommonConfig): diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/pytorch_huggingface.py b/tests/e2e_oss/pipelines/pipeline_base_classes/pytorch_huggingface.py index f3c1406fc0fa97..8b5b30dedbf2ce 100644 --- a/tests/e2e_oss/pipelines/pipeline_base_classes/pytorch_huggingface.py +++ b/tests/e2e_oss/pipelines/pipeline_base_classes/pytorch_huggingface.py @@ -1,14 +1,14 @@ from collections import OrderedDict -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators -from tests.e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation -from tests.e2e_oss.pipelines.pipeline_templates.pytorch_loader_template import pytorch_loader -from tests.e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc -from tests.e2e_oss._utils.path_utils import ref_from_model -from tests.e2e_oss.common_utils.pytest_utils import mark +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators +from e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation +from e2e_oss.pipelines.pipeline_templates.pytorch_loader_template import pytorch_loader +from e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc +from e2e_oss._utils.path_utils import ref_from_model +from e2e_oss.common_utils.pytest_utils import mark class _PyTorchHuggingFaceBase(CommonConfig): diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/tf_classification.py b/tests/e2e_oss/pipelines/pipeline_base_classes/tf_classification.py index 6270b4fc127b6c..381d2542aee91a 100644 --- a/tests/e2e_oss/pipelines/pipeline_base_classes/tf_classification.py +++ b/tests/e2e_oss/pipelines/pipeline_base_classes/tf_classification.py @@ -1,17 +1,17 @@ from collections import OrderedDict -from tests.e2e_oss.common_utils.tf_helper import TFVersionHelper -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.collect_reference_templates import collect_tf_refs_pipeline -from tests.e2e_oss.pipelines.pipeline_templates.collect_reference_templates import read_refs_pipeline -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import classification_comparators -from tests.e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input, read_img_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation -from tests.e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc_tf -from tests.e2e_oss._utils.path_utils import prepend_with_env_path, resolve_file_path -from tests.e2e_oss._utils.path_utils import ref_from_model -from tests.e2e_oss.common_utils.pytest_utils import mark +from e2e_oss.common_utils.tf_helper import TFVersionHelper +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.collect_reference_templates import collect_tf_refs_pipeline +from e2e_oss.pipelines.pipeline_templates.collect_reference_templates import read_refs_pipeline +from e2e_oss.pipelines.pipeline_templates.comparators_template import classification_comparators +from e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input, read_img_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation +from e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc_tf +from e2e_oss._utils.path_utils import prepend_with_env_path, resolve_file_path +from e2e_oss._utils.path_utils import ref_from_model +from e2e_oss.common_utils.pytest_utils import mark common_input_file = resolve_file_path("test_data/inputs/tf/classification_imagenet.npz") diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/tf_eltwise.py b/tests/e2e_oss/pipelines/pipeline_base_classes/tf_eltwise.py index f59402c20a4e05..403bd3dc2994ec 100644 --- a/tests/e2e_oss/pipelines/pipeline_base_classes/tf_eltwise.py +++ b/tests/e2e_oss/pipelines/pipeline_base_classes/tf_eltwise.py @@ -1,14 +1,14 @@ from collections import OrderedDict -from tests.e2e_oss.common_utils.tf_helper import TFVersionHelper -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.collect_reference_templates import read_refs_pipeline -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators -from tests.e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation -from tests.e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc_tf -from tests.e2e_oss._utils.path_utils import ref_from_model, prepend_with_env_path, resolve_file_path +from e2e_oss.common_utils.tf_helper import TFVersionHelper +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.collect_reference_templates import read_refs_pipeline +from e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators +from e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation +from e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc_tf +from e2e_oss._utils.path_utils import ref_from_model, prepend_with_env_path, resolve_file_path common_input_file = resolve_file_path("test_data/inputs/tf/classification_imagenet.npz") diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/tf_hub_case_class.py b/tests/e2e_oss/pipelines/pipeline_base_classes/tf_hub_case_class.py index 7234967c1245a4..6b2b3f3bd62be3 100644 --- a/tests/e2e_oss/pipelines/pipeline_base_classes/tf_hub_case_class.py +++ b/tests/e2e_oss/pipelines/pipeline_base_classes/tf_hub_case_class.py @@ -1,12 +1,12 @@ from collections import OrderedDict -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.collect_reference_templates import get_refs_tf_hub -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators -from tests.e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import generate_tf_hub_inputs -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import ovc_ir_generation -from tests.e2e_oss.pipelines.pipeline_templates.tf_hub_loader_template import tf_hub_loader +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.collect_reference_templates import get_refs_tf_hub +from e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators +from e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step +from e2e_oss.pipelines.pipeline_templates.input_templates import generate_tf_hub_inputs +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import ovc_ir_generation +from e2e_oss.pipelines.pipeline_templates.tf_hub_loader_template import tf_hub_loader class TFHUB_eltwise_Base(CommonConfig): diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/tf_lite.py b/tests/e2e_oss/pipelines/pipeline_base_classes/tf_lite.py index aedc6a24e9b464..75a68f9f6a7e8c 100644 --- a/tests/e2e_oss/pipelines/pipeline_base_classes/tf_lite.py +++ b/tests/e2e_oss/pipelines/pipeline_base_classes/tf_lite.py @@ -1,14 +1,14 @@ from collections import OrderedDict -from tests.e2e_oss.common_utils.tf_helper import TFVersionHelper -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import classification_comparators -from tests.e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation -from tests.e2e_oss.pipelines.pipeline_templates.postproc_template import parse_classification -from tests.e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc_tf -from tests.e2e_oss._utils.path_utils import prepend_with_env_path, ref_from_model, resolve_file_path +from e2e_oss.common_utils.tf_helper import TFVersionHelper +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.comparators_template import classification_comparators +from e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation +from e2e_oss.pipelines.pipeline_templates.postproc_template import parse_classification +from e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc_tf +from e2e_oss._utils.path_utils import prepend_with_env_path, ref_from_model, resolve_file_path common_input_file = resolve_file_path("test_data/inputs/tf/classification_imagenet.npz") diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/tf_mask_rcnn.py b/tests/e2e_oss/pipelines/pipeline_base_classes/tf_mask_rcnn.py index 73b6e3baf01b09..dd073fe171f4b3 100644 --- a/tests/e2e_oss/pipelines/pipeline_base_classes/tf_mask_rcnn.py +++ b/tests/e2e_oss/pipelines/pipeline_base_classes/tf_mask_rcnn.py @@ -1,17 +1,17 @@ from collections import OrderedDict from pathlib import Path -from tests.e2e_oss.common_utils.openvino_resources import OpenVINOResources -from tests.e2e_oss.common_utils.tf_helper import TFVersionHelper -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import object_detection_comparators -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import segmentation_comparators -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation -from tests.e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc -from tests.e2e_oss._utils.path_utils import prepend_with_env_path -from tests.e2e_oss._utils.path_utils import ref_from_model, resolve_file_path -from tests.e2e_oss.common_utils.pytest_utils import mark, timeout +from e2e_oss.common_utils.openvino_resources import OpenVINOResources +from e2e_oss.common_utils.tf_helper import TFVersionHelper +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.comparators_template import object_detection_comparators +from e2e_oss.pipelines.pipeline_templates.comparators_template import segmentation_comparators +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation +from e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc +from e2e_oss._utils.path_utils import prepend_with_env_path +from e2e_oss._utils.path_utils import ref_from_model, resolve_file_path +from e2e_oss.common_utils.pytest_utils import mark, timeout common_input_file = resolve_file_path("test_data/inputs/caffe/cars_road.npz") diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/tf_object_detection.py b/tests/e2e_oss/pipelines/pipeline_base_classes/tf_object_detection.py index 5a75bfb625950d..eb5f0b0609a1dc 100644 --- a/tests/e2e_oss/pipelines/pipeline_base_classes/tf_object_detection.py +++ b/tests/e2e_oss/pipelines/pipeline_base_classes/tf_object_detection.py @@ -1,16 +1,16 @@ from collections import OrderedDict from pathlib import Path -from tests.e2e_oss.common_utils.openvino_resources import OpenVINOResources -from tests.e2e_oss.common_utils.tf_helper import TFVersionHelper -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import object_detection_comparators -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation -from tests.e2e_oss.pipelines.pipeline_templates.postproc_template import parse_object_detection -from tests.e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc_tf -from tests.e2e_oss._utils.path_utils import prepend_with_env_path, resolve_file_path, ref_from_model -from tests.e2e_oss.common_utils.pytest_utils import mark +from e2e_oss.common_utils.openvino_resources import OpenVINOResources +from e2e_oss.common_utils.tf_helper import TFVersionHelper +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.comparators_template import object_detection_comparators +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation +from e2e_oss.pipelines.pipeline_templates.postproc_template import parse_object_detection +from e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc_tf +from e2e_oss._utils.path_utils import prepend_with_env_path, resolve_file_path, ref_from_model +from e2e_oss.common_utils.pytest_utils import mark common_input_file = resolve_file_path("test_data/inputs/caffe/object_detection_voc_people.npz") diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/tf_v2_classification.py b/tests/e2e_oss/pipelines/pipeline_base_classes/tf_v2_classification.py index fc8bd3db447947..03e07228fb7d87 100644 --- a/tests/e2e_oss/pipelines/pipeline_base_classes/tf_v2_classification.py +++ b/tests/e2e_oss/pipelines/pipeline_base_classes/tf_v2_classification.py @@ -1,13 +1,13 @@ from collections import OrderedDict -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.collect_reference_templates import read_refs_pipeline, get_refs_tf -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import classification_comparators -from tests.e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_img_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation -from tests.e2e_oss.pipelines.pipeline_templates.postproc_template import parse_classification -from tests.e2e_oss._utils.path_utils import ref_from_model +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.collect_reference_templates import read_refs_pipeline, get_refs_tf +from e2e_oss.pipelines.pipeline_templates.comparators_template import classification_comparators +from e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step +from e2e_oss.pipelines.pipeline_templates.input_templates import read_img_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation +from e2e_oss.pipelines.pipeline_templates.postproc_template import parse_classification +from e2e_oss._utils.path_utils import ref_from_model class TF_V2_ClassificationNet(CommonConfig): diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/tf_yolo.py b/tests/e2e_oss/pipelines/pipeline_base_classes/tf_yolo.py index cb5fa7500d31da..35590fbeb0b779 100644 --- a/tests/e2e_oss/pipelines/pipeline_base_classes/tf_yolo.py +++ b/tests/e2e_oss/pipelines/pipeline_base_classes/tf_yolo.py @@ -1,16 +1,16 @@ import json from collections import OrderedDict -from tests.e2e_oss.common_utils.openvino_resources import OpenVINOResources -from tests.e2e_oss.common_utils.tf_helper import TFVersionHelper -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import object_detection_comparators, eltwise_comparators -from tests.e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation -from tests.e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc -from tests.e2e_oss._utils.path_utils import prepend_with_env_path, ref_from_model, resolve_file_path -from tests.e2e_oss.common_utils.pytest_utils import mark +from e2e_oss.common_utils.openvino_resources import OpenVINOResources +from e2e_oss.common_utils.tf_helper import TFVersionHelper +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.comparators_template import object_detection_comparators, eltwise_comparators +from e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation +from e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc +from e2e_oss._utils.path_utils import prepend_with_env_path, ref_from_model, resolve_file_path +from e2e_oss.common_utils.pytest_utils import mark common_input_file = resolve_file_path("test_data/inputs/caffe/car_1_data.npz") diff --git a/tests/e2e_oss/pipelines/pipeline_templates/collect_reference_templates.py b/tests/e2e_oss/pipelines/pipeline_templates/collect_reference_templates.py index 1ddd6c267ba05f..731b0d6e2816d3 100644 --- a/tests/e2e_oss/pipelines/pipeline_templates/collect_reference_templates.py +++ b/tests/e2e_oss/pipelines/pipeline_templates/collect_reference_templates.py @@ -4,15 +4,15 @@ from collections import OrderedDict from pathlib import Path -from tests.e2e_oss._utils.kaldi_utils import read_ark_data -from tests.e2e_oss.common_utils.decorators import wrap_ord_dict -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import ir_pregenerated -from tests.e2e_oss.pipelines.pipeline_templates.postproc_template import assemble_postproc_mxnet, assemble_postproc_tf -from tests.e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc_caffe, assemble_preproc_mxnet, \ +from e2e_oss._utils.kaldi_utils import read_ark_data +from e2e_oss.common_utils.decorators import wrap_ord_dict +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import ir_pregenerated +from e2e_oss.pipelines.pipeline_templates.postproc_template import assemble_postproc_mxnet, assemble_postproc_tf +from e2e_oss.pipelines.pipeline_templates.preproc_templates import assemble_preproc_caffe, assemble_preproc_mxnet, \ assemble_preproc, assemble_preproc_tf -from tests.e2e_oss._utils.path_utils import proto_from_model, ref_from_model, symbol_from_model -from tests.e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step +from e2e_oss._utils.path_utils import proto_from_model, ref_from_model, symbol_from_model +from e2e_oss.pipelines.pipeline_templates.infer_templates import common_infer_step def get_refs_caffe(proto, model): diff --git a/tests/e2e_oss/pipelines/pipeline_templates/comparators_template.py b/tests/e2e_oss/pipelines/pipeline_templates/comparators_template.py index a14de5b96aa0ab..c7ef0cc65530db 100644 --- a/tests/e2e_oss/pipelines/pipeline_templates/comparators_template.py +++ b/tests/e2e_oss/pipelines/pipeline_templates/comparators_template.py @@ -1,4 +1,4 @@ -from tests.e2e_oss.common_utils.decorators import wrap_ord_dict +from e2e_oss.common_utils.decorators import wrap_ord_dict @wrap_ord_dict diff --git a/tests/e2e_oss/pipelines/pipeline_templates/postproc_template.py b/tests/e2e_oss/pipelines/pipeline_templates/postproc_template.py index 99f9d2f13e4dfe..970ecbf07bcb23 100644 --- a/tests/e2e_oss/pipelines/pipeline_templates/postproc_template.py +++ b/tests/e2e_oss/pipelines/pipeline_templates/postproc_template.py @@ -2,7 +2,7 @@ """ from collections import OrderedDict -from tests.e2e_oss.common_utils.decorators import wrap_ord_dict +from e2e_oss.common_utils.decorators import wrap_ord_dict @wrap_ord_dict diff --git a/tests/e2e_oss/pipelines/production/tf_hub/tf_hub.py b/tests/e2e_oss/pipelines/production/tf_hub/tf_hub.py index fb84ff9979c547..feabcd55f3468e 100644 --- a/tests/e2e_oss/pipelines/production/tf_hub/tf_hub.py +++ b/tests/e2e_oss/pipelines/production/tf_hub/tf_hub.py @@ -1,8 +1,8 @@ import os import sys -from tests.e2e_oss._utils.test_utils import class_factory -from tests.e2e_oss.pipelines.pipeline_base_classes.tf_hub_case_class import TFHUB_eltwise_Base +from e2e_oss._utils.test_utils import class_factory +from e2e_oss.pipelines.pipeline_base_classes.tf_hub_case_class import TFHUB_eltwise_Base def get_models_list(file_name: str): diff --git a/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/mxnet/synthetic_GRU.py b/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/mxnet/synthetic_GRU.py index 33a175d444219b..9550d29af36b25 100644 --- a/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/mxnet/synthetic_GRU.py +++ b/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/mxnet/synthetic_GRU.py @@ -1,13 +1,13 @@ from collections import OrderedDict from pathlib import Path -from tests.e2e_oss._utils.path_utils import prepend_with_env_path, ref_from_model -from tests.e2e_oss.common_utils.pytest_utils import mark, timeout -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.collect_reference_templates import get_refs_mxnet, read_refs_pipeline -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation +from e2e_oss._utils.path_utils import prepend_with_env_path, ref_from_model +from e2e_oss.common_utils.pytest_utils import mark, timeout +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.collect_reference_templates import get_refs_mxnet, read_refs_pipeline +from e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation class MXNET_Synthetic_GRU_Base(CommonConfig): diff --git a/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/mxnet/synthetic_RNN.py b/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/mxnet/synthetic_RNN.py index fdd2511441387a..31d94aa1309f0e 100644 --- a/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/mxnet/synthetic_RNN.py +++ b/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/mxnet/synthetic_RNN.py @@ -1,12 +1,12 @@ from collections import OrderedDict from pathlib import Path -from tests.e2e_oss._utils.path_utils import prepend_with_env_path, ref_from_model -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.collect_reference_templates import get_refs_mxnet, read_refs_pipeline -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation +from e2e_oss._utils.path_utils import prepend_with_env_path, ref_from_model +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.collect_reference_templates import get_refs_mxnet, read_refs_pipeline +from e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation class MXNET_Synthetic_RNN_Base(CommonConfig): diff --git a/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/mxnet/synthetic_lstm.py b/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/mxnet/synthetic_lstm.py index 2933fff8b83599..4d253e2709b720 100644 --- a/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/mxnet/synthetic_lstm.py +++ b/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/mxnet/synthetic_lstm.py @@ -1,12 +1,12 @@ from collections import OrderedDict from pathlib import Path -from tests.e2e_oss._utils.path_utils import prepend_with_env_path, ref_from_model -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.collect_reference_templates import get_refs_mxnet, read_refs_pipeline -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation +from e2e_oss._utils.path_utils import prepend_with_env_path, ref_from_model +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.collect_reference_templates import get_refs_mxnet, read_refs_pipeline +from e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation class MXNET_Synthetic_LSTM_Base(CommonConfig): diff --git a/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/onnx/Synthetic_RNN.py b/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/onnx/Synthetic_RNN.py index 82b0e0313a8d43..4b6bdfe804ea37 100644 --- a/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/onnx/Synthetic_RNN.py +++ b/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/onnx/Synthetic_RNN.py @@ -2,11 +2,11 @@ import os from collections import OrderedDict -from tests.e2e_oss._utils.path_utils import prepend_with_env_path -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation +from e2e_oss._utils.path_utils import prepend_with_env_path +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation class ONNX_Synthetic_LSTM_Base(CommonConfig): diff --git a/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/tf/Dynamic_sequence_length.py b/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/tf/Dynamic_sequence_length.py index 5bcf53ddf3960c..4d2520e2a7c6dd 100644 --- a/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/tf/Dynamic_sequence_length.py +++ b/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/tf/Dynamic_sequence_length.py @@ -2,13 +2,13 @@ import os from collections import OrderedDict -from tests.e2e_oss.common_utils.tf_helper import TFVersionHelper -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.collect_reference_templates import get_refs_tf -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation -from tests.e2e_oss._utils.path_utils import prepend_with_env_path +from e2e_oss.common_utils.tf_helper import TFVersionHelper +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.collect_reference_templates import get_refs_tf +from e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation +from e2e_oss._utils.path_utils import prepend_with_env_path class DynamicSequenceLengthBase(CommonConfig): diff --git a/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/tf/Synthetic_LSTM.py b/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/tf/Synthetic_LSTM.py index db0cf2bb1adc28..96af9880d991ac 100644 --- a/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/tf/Synthetic_LSTM.py +++ b/tests/e2e_oss/pipelines_custom/LSTM_no_seqlen/tf/Synthetic_LSTM.py @@ -2,12 +2,12 @@ import os from collections import OrderedDict -from tests.e2e_oss.common_utils.tf_helper import TFVersionHelper -from tests.e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators -from tests.e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input -from tests.e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation -from tests.e2e_oss._utils.path_utils import prepend_with_env_path +from e2e_oss.common_utils.tf_helper import TFVersionHelper +from e2e_oss.pipelines.pipeline_base_classes.common_base_class import CommonConfig +from e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators +from e2e_oss.pipelines.pipeline_templates.input_templates import read_npz_input +from e2e_oss.pipelines.pipeline_templates.ir_gen_templates import common_ir_generation +from e2e_oss._utils.path_utils import prepend_with_env_path class TF_Synthetic_LSTM_Base(CommonConfig): diff --git a/tests/e2e_oss/plugins/common/base_conftest.py b/tests/e2e_oss/plugins/common/base_conftest.py index 2603e727bd6a64..4a2be8ac39ab46 100644 --- a/tests/e2e_oss/plugins/common/base_conftest.py +++ b/tests/e2e_oss/plugins/common/base_conftest.py @@ -8,9 +8,9 @@ from _pytest.mark import MarkDecorator -from tests.e2e_oss.common_utils.pytest_utils import mark as Mark +from e2e_oss.common_utils.pytest_utils import mark as Mark -from tests.e2e_oss._utils.test_utils import BrokenTestException +from e2e_oss._utils.test_utils import BrokenTestException def apply_glob(paths, file_ext="py"): diff --git a/tests/e2e_oss/plugins/common/conftest.py b/tests/e2e_oss/plugins/common/conftest.py index d265e017d00a4d..4421e2b9176190 100644 --- a/tests/e2e_oss/plugins/common/conftest.py +++ b/tests/e2e_oss/plugins/common/conftest.py @@ -32,8 +32,8 @@ import pytest from jsonschema import validate, ValidationError -from tests.e2e_oss._utils.test_utils import copy_files_by_pattern, log_timestamp -from tests.utils.e2e.env_tools import Environment +from e2e_oss._utils.test_utils import copy_files_by_pattern, log_timestamp +from utils.e2e.env_tools import Environment @contextmanager diff --git a/tests/e2e_oss/plugins/e2e_test/conftest.py b/tests/e2e_oss/plugins/e2e_test/conftest.py index feabf3b902ed4a..a036ed52675ec8 100644 --- a/tests/e2e_oss/plugins/e2e_test/conftest.py +++ b/tests/e2e_oss/plugins/e2e_test/conftest.py @@ -15,16 +15,16 @@ import yaml from _pytest.runner import show_test_item, call_runtest_hook, check_interactive_exception -import tests.e2e_oss.plugins.common.base_conftest as base - -from tests.e2e_oss._utils.path_utils import DirLockingHandler -from tests.e2e_oss._utils.test_utils import class_factory, BrokenTest, BrokenTestException -from tests.e2e_oss.common_utils import hook_utils -from tests.e2e_oss.common_utils.env_utils import fix_env_conf -from tests.e2e_oss.common_utils.logger import get_logger -from tests.e2e_oss.common_utils.marks import MarkRunType, MarkGeneral -from tests.e2e_oss.common_utils.openvino_resources import OpenVINOResources, OpenVINOResourceNotFound -from tests.utils.e2e.env_tools import Environment +import e2e_oss.plugins.common.base_conftest as base + +from e2e_oss._utils.path_utils import DirLockingHandler +from e2e_oss._utils.test_utils import class_factory, BrokenTest, BrokenTestException +from e2e_oss.common_utils import hook_utils +from e2e_oss.common_utils.env_utils import fix_env_conf +from e2e_oss.common_utils.logger import get_logger +from e2e_oss.common_utils.marks import MarkRunType, MarkGeneral +from e2e_oss.common_utils.openvino_resources import OpenVINOResources, OpenVINOResourceNotFound +from utils.e2e.env_tools import Environment logger = get_logger(__name__) diff --git a/tests/e2e_oss/plugins/first_inference_tests/common_utils.py b/tests/e2e_oss/plugins/first_inference_tests/common_utils.py index 9b1fa37ccff48b..e69061fa19168d 100644 --- a/tests/e2e_oss/plugins/first_inference_tests/common_utils.py +++ b/tests/e2e_oss/plugins/first_inference_tests/common_utils.py @@ -1,8 +1,8 @@ import glob import os -from tests.e2e_oss.plugins.first_inference_tests.conftest import redefine_mo_out_path, get_non_infer_config -from tests.e2e_oss._utils.test_utils import check_mo_precision -from tests.utils.e2e.common.pipeline import Pipeline +from e2e_oss.plugins.first_inference_tests.conftest import redefine_mo_out_path, get_non_infer_config +from e2e_oss._utils.test_utils import check_mo_precision +from utils.e2e.common.pipeline import Pipeline def get_executable_cmd(args: dict): diff --git a/tests/e2e_oss/plugins/first_inference_tests/conftest.py b/tests/e2e_oss/plugins/first_inference_tests/conftest.py index 061b0b4d377be9..710722f2733c25 100644 --- a/tests/e2e_oss/plugins/first_inference_tests/conftest.py +++ b/tests/e2e_oss/plugins/first_inference_tests/conftest.py @@ -3,7 +3,7 @@ from pathlib import Path from tempfile import TemporaryDirectory -from tests.utils.e2e.env_tools import Environment +from utils.e2e.env_tools import Environment def redefine_mo_out_path(instance, pipeline): diff --git a/tests/e2e_oss/plugins/ref_collect/conftest.py b/tests/e2e_oss/plugins/ref_collect/conftest.py index 4ce031ce5e2dfa..39c2e26759ea35 100644 --- a/tests/e2e_oss/plugins/ref_collect/conftest.py +++ b/tests/e2e_oss/plugins/ref_collect/conftest.py @@ -5,9 +5,9 @@ import tests.e2e_oss.plugins.common.base_conftest as base -from tests.e2e_oss.common_utils.env_utils import fix_env_conf -from tests.e2e_oss.common_utils.openvino_resources import OpenVINOResources, OpenVINOResourceNotFound -from tests.utils.e2e.env_tools import Environment +from e2e_oss.common_utils.env_utils import fix_env_conf +from e2e_oss.common_utils.openvino_resources import OpenVINOResources, OpenVINOResourceNotFound +from utils.e2e.env_tools import Environment def set_env(metafunc): diff --git a/tests/e2e_oss/plugins/reshape_tests/conftest.py b/tests/e2e_oss/plugins/reshape_tests/conftest.py index 0da2eefd52301f..3cc1319b213f57 100644 --- a/tests/e2e_oss/plugins/reshape_tests/conftest.py +++ b/tests/e2e_oss/plugins/reshape_tests/conftest.py @@ -11,14 +11,14 @@ import pytest import yaml -import tests.e2e_oss.plugins.common.base_conftest as base -from tests.e2e_oss._utils.reshape_tests_utils import should_run_reshape, get_reshape_configurations, \ +import e2e_oss.plugins.common.base_conftest as base +from e2e_oss._utils.reshape_tests_utils import should_run_reshape, get_reshape_configurations, \ get_reshape_pipeline_pairs, batch_was_changed -from tests.e2e_oss._utils.test_utils import class_factory, BrokenTest, BrokenTestException -from tests.e2e_oss.common_utils.env_utils import fix_env_conf -from tests.e2e_oss.common_utils.openvino_resources import OpenVINOResources, OpenVINOResourceNotFound -from tests.e2e_oss.plugins.e2e_test.conftest import satisfies_all_rules, unwrap_rules -from tests.utils.e2e.env_tools import Environment +from e2e_oss._utils.test_utils import class_factory, BrokenTest, BrokenTestException +from e2e_oss.common_utils.env_utils import fix_env_conf +from e2e_oss.common_utils.openvino_resources import OpenVINOResources, OpenVINOResourceNotFound +from e2e_oss.plugins.e2e_test.conftest import satisfies_all_rules, unwrap_rules +from utils.e2e.env_tools import Environment @contextmanager diff --git a/tests/e2e_oss/test.py b/tests/e2e_oss/test.py index 6c07d4e6f56343..5cd071060517d2 100644 --- a/tests/e2e_oss/test.py +++ b/tests/e2e_oss/test.py @@ -18,15 +18,15 @@ from shutil import rmtree import yaml -from common_utils.logger import get_logger -from tests.e2e_oss._utils.modify_configs import get_original_model_importer_pipeline_config -from tests.e2e_oss._utils.test_utils import log_timestamp, read_irs_mapping_file, get_ir_tag, check_mo_precision, \ +from e2e_oss.common_utils.logger import get_logger +from e2e_oss._utils.modify_configs import get_original_model_importer_pipeline_config +from e2e_oss._utils.test_utils import log_timestamp, read_irs_mapping_file, get_ir_tag, check_mo_precision, \ set_infer_precision_hint, remove_mo_args_oob, store_data_to_csv, timestamp -from tests.e2e_oss.common_utils.parsers import pipeline_cfg_to_string -from tests.e2e_oss.common_utils.test_utils import get_shapes_from_data -from tests.utils.e2e.common.pipeline import Pipeline -from tests.utils.e2e.comparator.container import ComparatorsContainer -from tests.utils.e2e.env_tools import Environment +from e2e_oss.common_utils.parsers import pipeline_cfg_to_string +from e2e_oss.common_utils.test_utils import get_shapes_from_data +from utils.e2e.common.pipeline import Pipeline +from utils.e2e.comparator.container import ComparatorsContainer +from utils.e2e.env_tools import Environment pytest_plugins = ('e2e_oss.plugins.e2e_test.conftest',) diff --git a/tests/e2e_oss/test_auto_plugin.py b/tests/e2e_oss/test_auto_plugin.py index 030f70bf3917a8..d780d3de61b657 100644 --- a/tests/e2e_oss/test_auto_plugin.py +++ b/tests/e2e_oss/test_auto_plugin.py @@ -18,13 +18,14 @@ # pylint:disable=invalid-name -from common_utils.logger import get_logger -from tests.e2e_oss._utils.test_utils import set_infer_precision_hint, read_irs_mapping_file, get_ir_tag, \ +from e2e_oss._utils.test_utils import set_infer_precision_hint, read_irs_mapping_file, get_ir_tag, \ check_mo_precision -from tests.e2e_oss.common_utils.test_utils import name_aligner -from tests.e2e_oss.test import empty_dirs -from tests.utils.e2e.common.pipeline import Pipeline -from tests.utils.e2e.comparator.container import ComparatorsContainer +from e2e_oss.common_utils.test_utils import name_aligner +from e2e_oss.test import empty_dirs +from utils.e2e.common.pipeline import Pipeline +from utils.e2e.comparator.container import ComparatorsContainer + +from e2e_oss.common_utils.logger import get_logger pytest_plugins = ('e2e_oss.plugins.e2e_test.conftest',) diff --git a/tests/e2e_oss/test_compare_onnx_ir.py b/tests/e2e_oss/test_compare_onnx_ir.py index c3dcbcaa8adbce..af7b84fa94cc37 100644 --- a/tests/e2e_oss/test_compare_onnx_ir.py +++ b/tests/e2e_oss/test_compare_onnx_ir.py @@ -17,11 +17,11 @@ import time from pathlib import Path -from tests.e2e_oss._utils.path_utils import prepend_with_env_path -from tests.e2e_oss._utils.test_utils import set_infer_precision_hint, read_irs_mapping_file, get_ir_tag -from tests.e2e_oss.common_utils.parsers import pipeline_cfg_to_string -from tests.utils.e2e.common.pipeline import Pipeline -from tests.utils.e2e.comparator.container import ComparatorsContainer +from e2e_oss._utils.path_utils import prepend_with_env_path +from e2e_oss._utils.test_utils import set_infer_precision_hint, read_irs_mapping_file, get_ir_tag +from e2e_oss.common_utils.parsers import pipeline_cfg_to_string +from utils.e2e.common.pipeline import Pipeline +from utils.e2e.comparator.container import ComparatorsContainer pytest_plugins = ('e2e_oss.plugins.e2e_test.conftest',) diff --git a/tests/e2e_oss/test_dynamism.py b/tests/e2e_oss/test_dynamism.py index 8703c5f1c63e2b..17a12578176991 100644 --- a/tests/e2e_oss/test_dynamism.py +++ b/tests/e2e_oss/test_dynamism.py @@ -29,10 +29,10 @@ import sys from pathlib import Path -from tests.e2e_oss._utils.modify_configs import dynamism_config, ie_reshape_config -from tests.e2e_oss._utils.reshape_tests_utils import compare -from tests.e2e_oss._utils.test_utils import set_infer_precision_hint, check_mo_precision, timestamp, get_static_shape -from tests.utils.e2e.common.pipeline import Pipeline +from e2e_oss._utils.modify_configs import dynamism_config, ie_reshape_config +from e2e_oss._utils.reshape_tests_utils import compare +from e2e_oss._utils.test_utils import set_infer_precision_hint, check_mo_precision, timestamp, get_static_shape +from utils.e2e.common.pipeline import Pipeline pytest_plugins = ('e2e_oss.plugins.reshape_tests.conftest',) diff --git a/tests/e2e_oss/test_first_memory_inference_dynamism.py b/tests/e2e_oss/test_first_memory_inference_dynamism.py index c20c4069843911..f57ed034e64f8d 100644 --- a/tests/e2e_oss/test_first_memory_inference_dynamism.py +++ b/tests/e2e_oss/test_first_memory_inference_dynamism.py @@ -19,9 +19,9 @@ import pytest import yaml -from tests.e2e_oss.plugins.first_inference_tests.common_utils import get_redef_ir, get_reformat_shapes, get_trend -from tests.e2e_oss.plugins.first_inference_tests.memorytests_utils import run_memorytest, get_compared_memory_results -from tests.e2e_oss.plugins.first_inference_tests.timetests_utils import get_compared_with_refs_results +from e2e_oss.plugins.first_inference_tests.common_utils import get_redef_ir, get_reformat_shapes, get_trend +from e2e_oss.plugins.first_inference_tests.memorytests_utils import run_memorytest, get_compared_memory_results +from e2e_oss.plugins.first_inference_tests.timetests_utils import get_compared_with_refs_results pytest_plugins = 'e2e_oss.plugins.reshape_tests.conftest' diff --git a/tests/e2e_oss/test_first_time_inference_dynamism.py b/tests/e2e_oss/test_first_time_inference_dynamism.py index 662c515b559653..7d06e46c17a099 100644 --- a/tests/e2e_oss/test_first_time_inference_dynamism.py +++ b/tests/e2e_oss/test_first_time_inference_dynamism.py @@ -30,9 +30,9 @@ import pytest import yaml -from tests.e2e_oss.plugins.first_inference_tests.common_utils import get_redef_ir, get_reformat_shapes -from tests.e2e_oss.plugins.first_inference_tests.memorytests_utils import get_compared_with_refs_results -from tests.e2e_oss.plugins.first_inference_tests.timetests_utils import run_timetest, get_compared_time_results +from e2e_oss.plugins.first_inference_tests.common_utils import get_redef_ir, get_reformat_shapes +from e2e_oss.plugins.first_inference_tests.memorytests_utils import get_compared_with_refs_results +from e2e_oss.plugins.first_inference_tests.timetests_utils import run_timetest, get_compared_time_results pytest_plugins = 'e2e_oss.plugins.reshape_tests.conftest' diff --git a/tests/e2e_oss/test_legacy_fe.py b/tests/e2e_oss/test_legacy_fe.py index a58a65cca66c1e..19cb015161ad51 100644 --- a/tests/e2e_oss/test_legacy_fe.py +++ b/tests/e2e_oss/test_legacy_fe.py @@ -18,12 +18,12 @@ import yaml from common_utils.logger import get_logger -from tests.e2e_oss._utils.test_utils import check_mo_precision, set_infer_precision_hint, store_data_to_csv, \ +from e2e_oss._utils.test_utils import check_mo_precision, set_infer_precision_hint, store_data_to_csv, \ log_timestamp -from tests.e2e_oss.common_utils.parsers import pipeline_cfg_to_string -from tests.utils.e2e.common.pipeline import Pipeline -from tests.utils.e2e.comparator.container import ComparatorsContainer -from tests.utils.e2e.env_tools import Environment +from e2e_oss.common_utils.parsers import pipeline_cfg_to_string +from utils.e2e.common.pipeline import Pipeline +from utils.e2e.comparator.container import ComparatorsContainer +from utils.e2e.env_tools import Environment pytest_plugins = ('e2e_oss.plugins.e2e_test.conftest',) diff --git a/tests/e2e_oss/test_multi_request.py b/tests/e2e_oss/test_multi_request.py index 7282dc9f14b376..76ae310852ff5d 100644 --- a/tests/e2e_oss/test_multi_request.py +++ b/tests/e2e_oss/test_multi_request.py @@ -19,11 +19,11 @@ from copy import deepcopy from math import ceil -from tests.e2e_oss._utils.test_utils import check_mo_precision, read_irs_mapping_file, get_ir_tag -from tests.e2e_oss.common_utils.parsers import pipeline_cfg_to_string -from tests.e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators -from tests.utils.e2e.common.pipeline import Pipeline -from tests.utils.e2e.comparator.container import ComparatorsContainer +from e2e_oss._utils.test_utils import check_mo_precision, read_irs_mapping_file, get_ir_tag +from e2e_oss.common_utils.parsers import pipeline_cfg_to_string +from e2e_oss.pipelines.pipeline_templates.comparators_template import eltwise_comparators +from utils.e2e.common.pipeline import Pipeline +from utils.e2e.comparator.container import ComparatorsContainer pytest_plugins = ('e2e_oss.plugins.e2e_test.conftest',) diff --git a/tests/e2e_oss/test_oob.py b/tests/e2e_oss/test_oob.py index ef8b9d9e5911d5..64ce58756f8220 100644 --- a/tests/e2e_oss/test_oob.py +++ b/tests/e2e_oss/test_oob.py @@ -16,13 +16,13 @@ from shutil import rmtree import yaml -from common_utils.logger import get_logger -from tests.e2e_oss._utils.test_utils import log_timestamp, check_mo_precision, set_infer_precision_hint, \ +from e2e_oss.common_utils.logger import get_logger +from e2e_oss._utils.test_utils import log_timestamp, check_mo_precision, set_infer_precision_hint, \ remove_mo_args_oob, store_data_to_csv, timestamp -from tests.e2e_oss.common_utils.parsers import pipeline_cfg_to_string -from tests.utils.e2e.common.pipeline import Pipeline -from tests.utils.e2e.comparator.container import ComparatorsContainer -from tests.utils.e2e.env_tools import Environment +from e2e_oss.common_utils.parsers import pipeline_cfg_to_string +from utils.e2e.common.pipeline import Pipeline +from utils.e2e.comparator.container import ComparatorsContainer +from utils.e2e.env_tools import Environment pytest_plugins = ('e2e_oss.plugins.e2e_test.conftest',) diff --git a/tests/e2e_oss/test_ovc_mo.py b/tests/e2e_oss/test_ovc_mo.py index 417f1b92b49ed7..40b495172e6ce0 100644 --- a/tests/e2e_oss/test_ovc_mo.py +++ b/tests/e2e_oss/test_ovc_mo.py @@ -14,22 +14,21 @@ import logging as log import os import re -import sys from pathlib import Path from shutil import rmtree import pytest import yaml -from tests.e2e_oss._utils.test_utils import log_timestamp, read_irs_mapping_file, get_ir_tag, check_mo_precision, \ +from e2e_oss._utils.test_utils import log_timestamp, read_irs_mapping_file, get_ir_tag, check_mo_precision, \ set_infer_precision_hint, store_data_to_csv, timestamp -from tests.e2e_oss.common_utils.logger import get_logger -from tests.e2e_oss.common_utils.parsers import pipeline_cfg_to_string -from tests.utils.e2e.common.pipeline import Pipeline -from tests.utils.e2e.comparator.container import ComparatorsContainer -from tests.utils.e2e.env_tools import Environment +from e2e_oss.common_utils.logger import get_logger +from e2e_oss.common_utils.parsers import pipeline_cfg_to_string +from utils.e2e.common.pipeline import Pipeline +from utils.e2e.comparator.container import ComparatorsContainer +from utils.e2e.env_tools import Environment -pytest_plugins = ('e2e_oss.plugins.e2e_test.conftest',) +pytest_plugins = 'e2e_oss.plugins.e2e_test.conftest' log = get_logger(__name__) diff --git a/tests/e2e_oss/test_platform_dependent.py b/tests/e2e_oss/test_platform_dependent.py index add190f5e093c7..67f73aeb91866f 100644 --- a/tests/e2e_oss/test_platform_dependent.py +++ b/tests/e2e_oss/test_platform_dependent.py @@ -17,13 +17,13 @@ from shutil import rmtree import yaml -from common_utils.logger import get_logger -from tests.e2e_oss._utils.test_utils import check_mo_precision, set_infer_precision_hint, store_data_to_csv, \ +from e2e_oss.common_utils.logger import get_logger +from e2e_oss._utils.test_utils import check_mo_precision, set_infer_precision_hint, store_data_to_csv, \ log_timestamp -from tests.e2e_oss.common_utils.parsers import pipeline_cfg_to_string -from tests.utils.e2e.common.pipeline import Pipeline -from tests.utils.e2e.comparator.container import ComparatorsContainer -from tests.utils.e2e.env_tools import Environment +from e2e_oss.common_utils.parsers import pipeline_cfg_to_string +from utils.e2e.common.pipeline import Pipeline +from utils.e2e.comparator.container import ComparatorsContainer +from utils.e2e.env_tools import Environment pytest_plugins = ('e2e_oss.plugins.e2e_test.conftest',) diff --git a/tests/e2e_oss/test_reshape.py b/tests/e2e_oss/test_reshape.py index 591088a82d4c31..74688ba59e64c5 100644 --- a/tests/e2e_oss/test_reshape.py +++ b/tests/e2e_oss/test_reshape.py @@ -2,11 +2,11 @@ import sys from copy import deepcopy -from tests.e2e_oss._utils.modify_configs import get_original_model_importer_pipeline_config -from tests.e2e_oss._utils.reshape_pipeline_executers import mo_pipeline_runner, ie_pipeline_runner, \ +from e2e_oss._utils.modify_configs import get_original_model_importer_pipeline_config +from e2e_oss._utils.reshape_pipeline_executers import mo_pipeline_runner, ie_pipeline_runner, \ sbs_reshape_pipeline_runner -from tests.e2e_oss._utils.reshape_tests_utils import compare -from tests.e2e_oss._utils.test_utils import check_mo_precision, set_infer_precision_hint, timestamp +from e2e_oss._utils.reshape_tests_utils import compare +from e2e_oss._utils.test_utils import check_mo_precision, set_infer_precision_hint, timestamp """ input_descriptor is a dict which describes info about input layers diff --git a/tests/e2e_oss/test_skip_ir_generation.py b/tests/e2e_oss/test_skip_ir_generation.py index 1cfaed1ba66009..4ea33aafda0b3d 100644 --- a/tests/e2e_oss/test_skip_ir_generation.py +++ b/tests/e2e_oss/test_skip_ir_generation.py @@ -17,13 +17,13 @@ import yaml -from common_utils.logger import get_logger -from tests.e2e_oss._utils.modify_configs import get_original_model_importer_pipeline_config -from tests.e2e_oss._utils.test_utils import log_timestamp, set_infer_precision_hint, store_data_to_csv, timestamp -from tests.e2e_oss.common_utils.parsers import pipeline_cfg_to_string -from tests.utils.e2e.common.pipeline import Pipeline -from tests.utils.e2e.comparator.container import ComparatorsContainer -from tests.utils.e2e.env_tools import Environment +from e2e_oss.common_utils.logger import get_logger +from e2e_oss._utils.modify_configs import get_original_model_importer_pipeline_config +from e2e_oss._utils.test_utils import log_timestamp, set_infer_precision_hint, store_data_to_csv, timestamp +from e2e_oss.common_utils.parsers import pipeline_cfg_to_string +from utils.e2e.common.pipeline import Pipeline +from utils.e2e.comparator.container import ComparatorsContainer +from utils.e2e.env_tools import Environment pytest_plugins = ('e2e_oss.plugins.e2e_test.conftest',) diff --git a/tests/utils/e2e/common/pipeline.py b/tests/utils/e2e/common/pipeline.py index d203aba704d5c9..af218c15bfb4ae 100644 --- a/tests/utils/e2e/common/pipeline.py +++ b/tests/utils/e2e/common/pipeline.py @@ -1,15 +1,15 @@ -import tests.utils.e2e.readers -import tests.utils.e2e.preprocessors -import tests.utils.e2e.preprocessors_tf_hub -import tests.utils.e2e.ir_provider -import tests.utils.e2e.infer -import tests.utils.e2e.postprocessors -import tests.utils.e2e.ref_collector -import tests.utils.e2e.model_loader -import tests.utils.e2e.omz_pytorch_to_onnx_converter +import utils.e2e.readers +import utils.e2e.preprocessors +import utils.e2e.preprocessors_tf_hub +import utils.e2e.ir_provider +import utils.e2e.infer +import utils.e2e.postprocessors +import utils.e2e.ref_collector +import utils.e2e.model_loader +import utils.e2e.omz_pytorch_to_onnx_converter from types import SimpleNamespace -from tests.utils.e2e.common.base_provider import BaseStepProvider +from utils.e2e.common.base_provider import BaseStepProvider class Pipeline: diff --git a/tests/utils/e2e/comparator/classification.py b/tests/utils/e2e/comparator/classification.py index d4c0622ddf6f69..62c9efb1acc0ba 100644 --- a/tests/utils/e2e/comparator/classification.py +++ b/tests/utils/e2e/comparator/classification.py @@ -9,7 +9,7 @@ import logging as log import sys -from tests.e2e_oss.common_utils.table_utils import make_table +from e2e_oss.common_utils.table_utils import make_table from .provider import ClassProvider from .threshold_utils import get_default_thresholds diff --git a/tests/utils/e2e/comparator/dummy.py b/tests/utils/e2e/comparator/dummy.py index 236d13a9dfec58..333b8c00364a2b 100644 --- a/tests/utils/e2e/comparator/dummy.py +++ b/tests/utils/e2e/comparator/dummy.py @@ -1,6 +1,6 @@ import logging as log -from tests.e2e_oss.common_utils.table_utils import make_table +from e2e_oss.common_utils.table_utils import make_table from .provider import ClassProvider import sys diff --git a/tests/utils/e2e/comparator/eltwise.py b/tests/utils/e2e/comparator/eltwise.py index 06bd9e8f1c3c31..0bd4c49cfb54dd 100644 --- a/tests/utils/e2e/comparator/eltwise.py +++ b/tests/utils/e2e/comparator/eltwise.py @@ -4,7 +4,7 @@ import numpy as np -from tests.e2e_oss.common_utils.table_utils import make_table +from e2e_oss.common_utils.table_utils import make_table from .provider import ClassProvider from .threshold_utils import get_default_thresholds diff --git a/tests/utils/e2e/comparator/eltwise_kaldi.py b/tests/utils/e2e/comparator/eltwise_kaldi.py index 6e442d80aa9ce4..a4f93a63c35832 100644 --- a/tests/utils/e2e/comparator/eltwise_kaldi.py +++ b/tests/utils/e2e/comparator/eltwise_kaldi.py @@ -3,7 +3,7 @@ import numpy as np -from tests.e2e_oss.common_utils.table_utils import make_table +from e2e_oss.common_utils.table_utils import make_table from .provider import ClassProvider diff --git a/tests/utils/e2e/comparator/object_detection.py b/tests/utils/e2e/comparator/object_detection.py index 98f72a77805c7d..d9a85c29ca4fab 100644 --- a/tests/utils/e2e/comparator/object_detection.py +++ b/tests/utils/e2e/comparator/object_detection.py @@ -6,7 +6,7 @@ import numpy as np from .threshold_utils import get_default_thresholds, get_default_iou_threshold -from tests.e2e_oss.common_utils.table_utils import make_table +from e2e_oss.common_utils.table_utils import make_table from .provider import ClassProvider diff --git a/tests/utils/e2e/comparator/ocr.py b/tests/utils/e2e/comparator/ocr.py index bd6839c668f102..19eb2c03d3636f 100644 --- a/tests/utils/e2e/comparator/ocr.py +++ b/tests/utils/e2e/comparator/ocr.py @@ -8,7 +8,7 @@ import sys from .threshold_utils import get_default_thresholds -from tests.e2e_oss.common_utils.table_utils import make_table +from e2e_oss.common_utils.table_utils import make_table from .provider import ClassProvider diff --git a/tests/utils/e2e/comparator/semantic_segmentation.py b/tests/utils/e2e/comparator/semantic_segmentation.py index 0c927f23fb8bf6..c0c83032387144 100644 --- a/tests/utils/e2e/comparator/semantic_segmentation.py +++ b/tests/utils/e2e/comparator/semantic_segmentation.py @@ -1,7 +1,7 @@ import logging as log import sys import numpy as np -from tests.e2e_oss.common_utils.table_utils import make_table +from e2e_oss.common_utils.table_utils import make_table from .provider import ClassProvider from utils.e2e.comparator.threshold_utils import get_default_iou_threshold diff --git a/tests/utils/e2e/infer/common_inference.py b/tests/utils/e2e/infer/common_inference.py index d271579525e02b..eea2f2735e564d 100644 --- a/tests/utils/e2e/infer/common_inference.py +++ b/tests/utils/e2e/infer/common_inference.py @@ -21,8 +21,8 @@ from openvino.runtime import Core from openvino.inference_engine import IECore, get_version as ie_get_version -from utils.multiprocessing_utils import multiprocessing_run -from tests.e2e_oss._utils.path_utils import resolve_file_path +from e2e_oss.common_utils.multiprocessing_utils import multiprocessing_run +from e2e_oss._utils.path_utils import resolve_file_path log.basicConfig(format="[ %(levelname)s ] %(message)s", level=log.INFO, stream=sys.stdout) diff --git a/tests/utils/e2e/infer/infer_2_consecutive_reshape.py b/tests/utils/e2e/infer/infer_2_consecutive_reshape.py index 5d67c7962cc745..f549df141ecacc 100644 --- a/tests/utils/e2e/infer/infer_2_consecutive_reshape.py +++ b/tests/utils/e2e/infer/infer_2_consecutive_reshape.py @@ -4,7 +4,7 @@ import sys from openvino.inference_engine import IECore, get_version as ie_get_version -from tests.e2e_oss._utils.path_utils import resolve_file_path +from e2e_oss._utils.path_utils import resolve_file_path # import local modules: from .common_inference import Infer diff --git a/tests/utils/e2e/infer/infer_speech_kaldi.py b/tests/utils/e2e/infer/infer_speech_kaldi.py index 9044e7e3fa5c49..99c37c405c695b 100644 --- a/tests/utils/e2e/infer/infer_speech_kaldi.py +++ b/tests/utils/e2e/infer/infer_speech_kaldi.py @@ -9,7 +9,7 @@ from openvino.runtime import Core from utils.kaldi_utils import get_quantization_scale_factors -from tests.e2e_oss._utils.path_utils import resolve_file_path +from e2e_oss._utils.path_utils import resolve_file_path # import local modules: from .common_inference import Infer diff --git a/tests/utils/e2e/infer/provider.py b/tests/utils/e2e/infer/provider.py index 3ab92c4086b3ca..2f024ead82d484 100644 --- a/tests/utils/e2e/infer/provider.py +++ b/tests/utils/e2e/infer/provider.py @@ -1,6 +1,6 @@ import inspect from e2e_oss._utils.test_utils import log_timestamp -from tests.utils.e2e.common.base_provider import BaseProvider, BaseStepProvider +from utils.e2e.common.base_provider import BaseProvider, BaseStepProvider class ClassProvider(BaseProvider): diff --git a/tests/utils/e2e/infer/reshape_no_infer.py b/tests/utils/e2e/infer/reshape_no_infer.py index 8a9d663c714271..71e53aaba8df27 100644 --- a/tests/utils/e2e/infer/reshape_no_infer.py +++ b/tests/utils/e2e/infer/reshape_no_infer.py @@ -5,7 +5,7 @@ import time from openvino.inference_engine import IECore, get_version as ie_get_version -from tests.e2e_oss._utils.path_utils import resolve_file_path +from e2e_oss._utils.path_utils import resolve_file_path # import local modules: from .common_inference import Infer diff --git a/tests/utils/e2e/ir_provider/model_optimizer_runner.py b/tests/utils/e2e/ir_provider/model_optimizer_runner.py index 78cb6562f33127..c63672eec9825e 100644 --- a/tests/utils/e2e/ir_provider/model_optimizer_runner.py +++ b/tests/utils/e2e/ir_provider/model_optimizer_runner.py @@ -4,7 +4,7 @@ from openvino.tools.ovc.cli_parser import split_inputs from e2e_oss._utils.test_utils import log_timestamp -from tests.e2e_oss._utils.path_utils import resolve_file_path +from e2e_oss._utils.path_utils import resolve_file_path from pathlib import Path from .provider import ClassProvider import subprocess diff --git a/tests/utils/e2e/ir_provider/pregenerated.py b/tests/utils/e2e/ir_provider/pregenerated.py index f01d5ed50c78f7..a9ee229b332ecf 100644 --- a/tests/utils/e2e/ir_provider/pregenerated.py +++ b/tests/utils/e2e/ir_provider/pregenerated.py @@ -1,4 +1,4 @@ -from tests.e2e_oss._utils.path_utils import resolve_file_path +from e2e_oss._utils.path_utils import resolve_file_path from .provider import ClassProvider import logging as log import sys diff --git a/tests/utils/e2e/ir_provider/provider.py b/tests/utils/e2e/ir_provider/provider.py index 60c20d8579fde1..c2eda19e47eaa1 100644 --- a/tests/utils/e2e/ir_provider/provider.py +++ b/tests/utils/e2e/ir_provider/provider.py @@ -1,5 +1,5 @@ import inspect -from tests.utils.e2e.common.base_provider import BaseProvider, BaseStepProvider +from utils.e2e.common.base_provider import BaseProvider, BaseStepProvider class ClassProvider(BaseProvider): diff --git a/tests/utils/e2e/model_loader/load_pytorch_model.py b/tests/utils/e2e/model_loader/load_pytorch_model.py index c97fce1a6af1a1..1a494db230756e 100644 --- a/tests/utils/e2e/model_loader/load_pytorch_model.py +++ b/tests/utils/e2e/model_loader/load_pytorch_model.py @@ -1,8 +1,8 @@ import logging as log -from tests.e2e_oss.common_utils.pytorch_loaders import * -from tests.utils.e2e.model_loader.provider import ClassProvider +from e2e_oss.common_utils.pytorch_loaders import * +from utils.e2e.model_loader.provider import ClassProvider class PyTorchModelLoader(ClassProvider): diff --git a/tests/utils/e2e/model_loader/provider.py b/tests/utils/e2e/model_loader/provider.py index b189e1276c07ab..67b603aad900ca 100644 --- a/tests/utils/e2e/model_loader/provider.py +++ b/tests/utils/e2e/model_loader/provider.py @@ -1,6 +1,6 @@ import inspect -from tests.utils.e2e.common.base_provider import BaseProvider, BaseStepProvider +from utils.e2e.common.base_provider import BaseProvider, BaseStepProvider class ClassProvider(BaseProvider): diff --git a/tests/utils/e2e/model_loader/tf_hub_model_loader.py b/tests/utils/e2e/model_loader/tf_hub_model_loader.py index 62e34889a771cc..b153612287e62c 100644 --- a/tests/utils/e2e/model_loader/tf_hub_model_loader.py +++ b/tests/utils/e2e/model_loader/tf_hub_model_loader.py @@ -2,7 +2,7 @@ import sys import tensorflow_hub as hub -from tests.utils.e2e.model_loader.tf_hub_provider import ClassProvider +from utils.e2e.model_loader.tf_hub_provider import ClassProvider class TFHubModelLoader(ClassProvider): diff --git a/tests/utils/e2e/model_loader/tf_hub_provider.py b/tests/utils/e2e/model_loader/tf_hub_provider.py index 9a36fb135ed72e..e0b0ec0e56cd64 100644 --- a/tests/utils/e2e/model_loader/tf_hub_provider.py +++ b/tests/utils/e2e/model_loader/tf_hub_provider.py @@ -1,6 +1,6 @@ import inspect -from tests.utils.e2e.common.base_provider import BaseProvider, BaseStepProvider +from utils.e2e.common.base_provider import BaseProvider, BaseStepProvider class ClassProvider(BaseProvider): diff --git a/tests/utils/e2e/omz_pytorch_to_onnx_converter/provider.py b/tests/utils/e2e/omz_pytorch_to_onnx_converter/provider.py index 18577250bd9451..c8891cd91a91d9 100644 --- a/tests/utils/e2e/omz_pytorch_to_onnx_converter/provider.py +++ b/tests/utils/e2e/omz_pytorch_to_onnx_converter/provider.py @@ -1,5 +1,5 @@ import inspect -from tests.utils.e2e.common.base_provider import BaseProvider, BaseStepProvider +from utils.e2e.common.base_provider import BaseProvider, BaseStepProvider class ClassProvider(BaseProvider): diff --git a/tests/utils/e2e/omz_pytorch_to_onnx_converter/pytorch_to_onnx_converter.py b/tests/utils/e2e/omz_pytorch_to_onnx_converter/pytorch_to_onnx_converter.py index 08d3c68f86f262..9b3ae918eb0871 100644 --- a/tests/utils/e2e/omz_pytorch_to_onnx_converter/pytorch_to_onnx_converter.py +++ b/tests/utils/e2e/omz_pytorch_to_onnx_converter/pytorch_to_onnx_converter.py @@ -5,8 +5,8 @@ import logging as log -from tests.e2e_oss.common_utils.openvino_resources import OpenVINOResources -from tests.utils.e2e.omz_pytorch_to_onnx_converter.provider import ClassProvider +from e2e_oss.common_utils.openvino_resources import OpenVINOResources +from utils.e2e.omz_pytorch_to_onnx_converter.provider import ClassProvider class PytorchToOnnxConverter(ClassProvider): diff --git a/tests/utils/e2e/postprocessors/provider.py b/tests/utils/e2e/postprocessors/provider.py index a1665f26c74579..d3c55a55b86973 100644 --- a/tests/utils/e2e/postprocessors/provider.py +++ b/tests/utils/e2e/postprocessors/provider.py @@ -2,7 +2,7 @@ import torch -from tests.utils.e2e.common.base_provider import BaseProvider, BaseStepProvider +from utils.e2e.common.base_provider import BaseProvider, BaseStepProvider class ClassProvider(BaseProvider): diff --git a/tests/utils/e2e/preprocessors/preprocessors.py b/tests/utils/e2e/preprocessors/preprocessors.py index f1b906def26ceb..c3ee0196744c96 100644 --- a/tests/utils/e2e/preprocessors/preprocessors.py +++ b/tests/utils/e2e/preprocessors/preprocessors.py @@ -6,7 +6,7 @@ import cv2 import numpy as np -from tests.e2e_oss._utils.path_utils import resolve_file_path +from e2e_oss._utils.path_utils import resolve_file_path from .provider import ClassProvider log.basicConfig(format="[ %(levelname)s ] %(message)s", level=log.INFO, stream=sys.stdout) diff --git a/tests/utils/e2e/preprocessors/provider.py b/tests/utils/e2e/preprocessors/provider.py index 122dc9cf8a05a1..6d28f358f5716f 100644 --- a/tests/utils/e2e/preprocessors/provider.py +++ b/tests/utils/e2e/preprocessors/provider.py @@ -3,7 +3,7 @@ import numpy as np import torch -from tests.utils.e2e.common.base_provider import BaseProvider, BaseStepProvider +from utils.e2e.common.base_provider import BaseProvider, BaseStepProvider class ClassProvider(BaseProvider): diff --git a/tests/utils/e2e/preprocessors_tf_hub/tf_hub_provider.py b/tests/utils/e2e/preprocessors_tf_hub/tf_hub_provider.py index 61c0dec917ca19..848be9b679875c 100644 --- a/tests/utils/e2e/preprocessors_tf_hub/tf_hub_provider.py +++ b/tests/utils/e2e/preprocessors_tf_hub/tf_hub_provider.py @@ -1,6 +1,6 @@ import inspect -from tests.utils.e2e.common.base_provider import BaseProvider, BaseStepProvider +from utils.e2e.common.base_provider import BaseProvider, BaseStepProvider class ClassProvider(BaseProvider): diff --git a/tests/utils/e2e/readers/provider.py b/tests/utils/e2e/readers/provider.py index ded79a40bd7b4e..9e7bb49d138b33 100644 --- a/tests/utils/e2e/readers/provider.py +++ b/tests/utils/e2e/readers/provider.py @@ -1,6 +1,6 @@ import inspect -from tests.utils.e2e.common.base_provider import BaseProvider, BaseStepProvider +from utils.e2e.common.base_provider import BaseProvider, BaseStepProvider class ClassProvider(BaseProvider): diff --git a/tests/utils/e2e/readers/readers.py b/tests/utils/e2e/readers/readers.py index 7df22876af33b2..578907d5e034fc 100644 --- a/tests/utils/e2e/readers/readers.py +++ b/tests/utils/e2e/readers/readers.py @@ -6,10 +6,10 @@ import sys from copy import deepcopy -from tests.e2e_oss._utils.kaldi_utils import read_ark_data -from tests.e2e_oss._utils.path_utils import resolve_file_path -from tests.e2e_oss._utils.test_utils import prepare_inputs, get_inputs_info -from tests.utils.e2e.readers.provider import ClassProvider +from e2e_oss._utils.kaldi_utils import read_ark_data +from e2e_oss._utils.path_utils import resolve_file_path +from e2e_oss._utils.test_utils import prepare_inputs, get_inputs_info +from utils.e2e.readers.provider import ClassProvider try: from onnx import TensorProto, numpy_helper diff --git a/tests/utils/e2e/ref_collector/precollected.py b/tests/utils/e2e/ref_collector/precollected.py index bbd8f04108d460..365eb94d3f7046 100644 --- a/tests/utils/e2e/ref_collector/precollected.py +++ b/tests/utils/e2e/ref_collector/precollected.py @@ -1,7 +1,7 @@ import torch from .provider import ClassProvider -from tests.e2e_oss._utils.path_utils import resolve_file_path +from e2e_oss._utils.path_utils import resolve_file_path import numpy as np import logging as log import sys diff --git a/tests/utils/e2e/ref_collector/provider.py b/tests/utils/e2e/ref_collector/provider.py index 337769a4647dca..0f5e463027e255 100644 --- a/tests/utils/e2e/ref_collector/provider.py +++ b/tests/utils/e2e/ref_collector/provider.py @@ -1,5 +1,5 @@ import inspect -from tests.utils.e2e.common.base_provider import BaseProvider, BaseStepProvider +from utils.e2e.common.base_provider import BaseProvider, BaseStepProvider class ClassProvider(BaseProvider): diff --git a/tests/utils/e2e/ref_collector/score_caffe.py b/tests/utils/e2e/ref_collector/score_caffe.py index 81fbd6b4f9b2bf..ad79eab361cb40 100644 --- a/tests/utils/e2e/ref_collector/score_caffe.py +++ b/tests/utils/e2e/ref_collector/score_caffe.py @@ -2,8 +2,8 @@ import os import sys -from utils.multiprocessing_utils import multiprocessing_run -from tests.e2e_oss._utils.path_utils import resolve_file_path +from e2e_oss.common_utils.multiprocessing_utils import multiprocessing_run +from e2e_oss._utils.path_utils import resolve_file_path from .provider import ClassProvider os.environ['GLOG_minloglevel'] = '3' diff --git a/tests/utils/e2e/ref_collector/score_caffe2.py b/tests/utils/e2e/ref_collector/score_caffe2.py index a3907a4b163ce7..d9553883d0ee88 100644 --- a/tests/utils/e2e/ref_collector/score_caffe2.py +++ b/tests/utils/e2e/ref_collector/score_caffe2.py @@ -1,7 +1,7 @@ import logging as log import sys -from utils.multiprocessing_utils import multiprocessing_run +from e2e_oss.common_utils.multiprocessing_utils import multiprocessing_run from .provider import ClassProvider diff --git a/tests/utils/e2e/ref_collector/score_mxnet.py b/tests/utils/e2e/ref_collector/score_mxnet.py index ab6ccdd2dd8f0e..92ce29eb369670 100644 --- a/tests/utils/e2e/ref_collector/score_mxnet.py +++ b/tests/utils/e2e/ref_collector/score_mxnet.py @@ -2,7 +2,7 @@ import os import sys -from tests.e2e_oss._utils.path_utils import resolve_file_path +from e2e_oss._utils.path_utils import resolve_file_path from .provider import ClassProvider os.environ['GLOG_minloglevel'] = '3' diff --git a/tests/utils/e2e/ref_collector/score_onnx_runtime.py b/tests/utils/e2e/ref_collector/score_onnx_runtime.py index 06ea691019b3ed..2f02872db9a0d4 100644 --- a/tests/utils/e2e/ref_collector/score_onnx_runtime.py +++ b/tests/utils/e2e/ref_collector/score_onnx_runtime.py @@ -1,7 +1,7 @@ import logging as log import sys -from utils.multiprocessing_utils import multiprocessing_run +from e2e_oss.common_utils.multiprocessing_utils import multiprocessing_run from .provider import ClassProvider diff --git a/tests/utils/e2e/ref_collector/score_pytorch_onnx_runtime.py b/tests/utils/e2e/ref_collector/score_pytorch_onnx_runtime.py index df63c85b1a6042..368e0e2b15403e 100644 --- a/tests/utils/e2e/ref_collector/score_pytorch_onnx_runtime.py +++ b/tests/utils/e2e/ref_collector/score_pytorch_onnx_runtime.py @@ -2,10 +2,9 @@ import os import sys -from utils.multiprocessing_utils import multiprocessing_run +from e2e_oss.common_utils.multiprocessing_utils import multiprocessing_run from utils.path_utils import resolve_dir_path from utils.e2e.ref_collector.score_onnx_runtime import ONNXRuntimeRunner - from .provider import ClassProvider diff --git a/tests/utils/e2e/ref_collector/score_tf.py b/tests/utils/e2e/ref_collector/score_tf.py index 9a74d21480df2f..3e5f6c302f2e9c 100644 --- a/tests/utils/e2e/ref_collector/score_tf.py +++ b/tests/utils/e2e/ref_collector/score_tf.py @@ -1,5 +1,5 @@ from .provider import ClassProvider -from tests.e2e_oss._utils.path_utils import resolve_file_path, resolve_dir_path +from e2e_oss._utils.path_utils import resolve_file_path, resolve_dir_path import os import re import sys diff --git a/tests/utils/e2e/ref_collector/score_tf_lite.py b/tests/utils/e2e/ref_collector/score_tf_lite.py index 7ff56632629814..e8e71e1a40d6bf 100644 --- a/tests/utils/e2e/ref_collector/score_tf_lite.py +++ b/tests/utils/e2e/ref_collector/score_tf_lite.py @@ -1,4 +1,4 @@ -from tests.e2e_oss._utils.path_utils import resolve_file_path +from e2e_oss._utils.path_utils import resolve_file_path from .provider import ClassProvider diff --git a/tests/utils/e2e/ref_collector/tf_hub_ref_provider.py b/tests/utils/e2e/ref_collector/tf_hub_ref_provider.py index c5ee52b2c3d4a0..d0170d0deb3169 100644 --- a/tests/utils/e2e/ref_collector/tf_hub_ref_provider.py +++ b/tests/utils/e2e/ref_collector/tf_hub_ref_provider.py @@ -1,6 +1,6 @@ import inspect -from tests.utils.e2e.common.base_provider import BaseProvider, BaseStepProvider +from utils.e2e.common.base_provider import BaseProvider, BaseStepProvider class ClassProvider(BaseProvider):