change _utils folder name

rnugmanx · Oct 19, 2023 · 2d1ddae · 2d1ddae
1 parent 3369ff3
commit 2d1ddae
Show file tree

Hide file tree

Showing 59 changed files with 1,648 additions and 99 deletions.
diff --git a/tests/e2e_oss/collect_irs.py b/tests/e2e_oss/collect_irs.py
@@ -9,8 +9,8 @@
 from pathlib import Path
 from shutil import copyfile
 
-from e2e_oss._utils.test_utils import get_ir_tag, read_irs_mapping_file, write_irs_mapping_file, remove_mo_args_oob
-from utils.e2e.common.pipeline import Pipeline
+from e2e_oss.utils.test_utils import get_ir_tag, read_irs_mapping_file, write_irs_mapping_file, remove_mo_args_oob
+from tests.utils.e2e.common.pipeline import Pipeline
 
 pytest_plugins = ('e2e_oss.plugins.e2e_test.conftest',)
 

diff --git a/tests/e2e_oss/collect_refs.py b/tests/e2e_oss/collect_refs.py
@@ -15,7 +15,7 @@
 import logging as log
 import os
 from e2e_oss.common_utils.parsers import pipeline_cfg_to_string
-from utils.e2e.common.pipeline import Pipeline
+from tests.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
@@ -41,7 +41,7 @@
 
 # pylint: disable=wrong-import-position,wrong-import-order,import-error,unused-import,no-name-in-module
 
-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,\
+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,\
     PytorchTorchvisionToONNXRunner
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
@@ -8,12 +8,12 @@
 import numpy as np
 import pytest
 
-from e2e_oss._utils.path_utils import resolve_file_path
+from e2e_oss.utils.path_utils import resolve_file_path
 # import local modules:
-from e2e_oss._utils.test_utils import align_output_name
+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
+from tests.utils.e2e.common.e2e_utils import get_tensor_names_dict
+from tests.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
@@ -6,7 +6,7 @@
 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.utils.path_utils import prepend_with_env_path, resolve_file_path
 from e2e_oss.common_utils.pytest_utils import mark
 
 

diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/onnx_precollected.py b/tests/e2e_oss/pipelines/pipeline_base_classes/onnx_precollected.py
@@ -6,7 +6,7 @@
 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.utils.path_utils import prepend_with_env_path
 from e2e_oss.common_utils.pytest_utils import mark
 
 

diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/onnx_runtime.py b/tests/e2e_oss/pipelines/pipeline_base_classes/onnx_runtime.py
@@ -11,7 +11,7 @@
 from e2e_oss.pipelines.pipeline_templates.postproc_template import parse_classification, parse_object_detection, \
     parse_image_modification
 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.utils.path_utils import prepend_with_env_path, resolve_file_path
 from e2e_oss.common_utils.pytest_utils import mark
 
 

diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/paddlepaddle.py b/tests/e2e_oss/pipelines/pipeline_base_classes/paddlepaddle.py
@@ -10,7 +10,7 @@
 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
+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
@@ -9,7 +9,7 @@
 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.utils.path_utils import search_model_path_recursively, ref_from_model, resolve_file_path
 from e2e_oss.common_utils.pytest_utils import mark
 
 

diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/pregen_eltwise.py b/tests/e2e_oss/pipelines/pipeline_base_classes/pregen_eltwise.py
@@ -8,7 +8,7 @@
 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.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_od.py b/tests/e2e_oss/pipelines/pipeline_base_classes/pregen_od.py
@@ -7,7 +7,7 @@
 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.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
@@ -9,7 +9,7 @@
 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.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
@@ -13,7 +13,7 @@
 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.utils.path_utils import prepend_with_env_path, ref_from_model, resolve_file_path
 from e2e_oss.common_utils.pytest_utils import mark
 
 

diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/pytorch_huggingface.py b/tests/e2e_oss/pipelines/pipeline_base_classes/pytorch_huggingface.py
@@ -7,7 +7,7 @@
 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.utils.path_utils import ref_from_model
 from e2e_oss.common_utils.pytest_utils import mark
 
 

diff --git a/tests/e2e_oss/pipelines/pipeline_base_classes/tf_classification.py b/tests/e2e_oss/pipelines/pipeline_base_classes/tf_classification.py
@@ -9,8 +9,8 @@
 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.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
@@ -8,7 +8,7 @@
 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
+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_lite.py b/tests/e2e_oss/pipelines/pipeline_base_classes/tf_lite.py
@@ -8,7 +8,7 @@
 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
+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
@@ -9,8 +9,8 @@
 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.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
@@ -9,7 +9,7 @@
 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.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
@@ -7,7 +7,7 @@
 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
+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
@@ -9,7 +9,7 @@
 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.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
@@ -4,14 +4,14 @@
 from collections import OrderedDict
 from pathlib import Path
 
-from e2e_oss._utils.kaldi_utils import read_ark_data
+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 e2e_oss._utils.path_utils import proto_from_model, ref_from_model, symbol_from_model
+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
 
 

diff --git a/tests/e2e_oss/pipelines/production/tf_hub/tf_hub.py b/tests/e2e_oss/pipelines/production/tf_hub/tf_hub.py
@@ -1,7 +1,7 @@
 import os
 import sys
 
-from e2e_oss._utils.test_utils import class_factory
+from e2e_oss.utils.test_utils import class_factory
 from e2e_oss.pipelines.pipeline_base_classes.tf_hub_case_class import TFHUB_eltwise_Base
 
 

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
@@ -1,7 +1,7 @@
 from collections import OrderedDict
 from pathlib import Path
 
-from e2e_oss._utils.path_utils import prepend_with_env_path, ref_from_model
+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

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
@@ -1,7 +1,7 @@
 from collections import OrderedDict
 from pathlib import Path
 
-from e2e_oss._utils.path_utils import prepend_with_env_path, ref_from_model
+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

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
@@ -1,7 +1,7 @@
 from collections import OrderedDict
 from pathlib import Path
 
-from e2e_oss._utils.path_utils import prepend_with_env_path, ref_from_model
+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

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
@@ -2,7 +2,7 @@
 import os
 from collections import OrderedDict
 
-from e2e_oss._utils.path_utils import prepend_with_env_path
+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

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
@@ -8,7 +8,7 @@
 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
+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
@@ -7,7 +7,7 @@
 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
+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
@@ -10,7 +10,7 @@
 
 from e2e_oss.common_utils.pytest_utils import mark as Mark
 
-from 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
@@ -32,12 +32,8 @@
 import pytest
 from jsonschema import validate, ValidationError
 
-# TODO: revert
-import sys
-print(sys.path)
-print(os.getcwd())
-from _utils.test_utils import copy_files_by_pattern, log_timestamp
-from utils.e2e.env_tools import Environment
+from tests.e2e_oss.utils.test_utils import copy_files_by_pattern, log_timestamp
+from tests.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
@@ -17,14 +17,14 @@
 
 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.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
+from tests.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
@@ -1,8 +1,8 @@
 import glob
 import os
 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
+from e2e_oss.utils.test_utils import check_mo_precision
+from tests.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
@@ -3,7 +3,7 @@
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-from utils.e2e.env_tools import Environment
+from tests.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
@@ -7,7 +7,7 @@
 
 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
+from tests.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
@@ -12,13 +12,13 @@
 import yaml
 
 import e2e_oss.plugins.common.base_conftest as base
-from e2e_oss._utils.reshape_tests_utils import should_run_reshape, get_reshape_configurations, \
+from e2e_oss.utils.reshape_tests_utils import should_run_reshape, get_reshape_configurations, \
     get_reshape_pipeline_pairs, batch_was_changed
-from e2e_oss._utils.test_utils import class_factory, BrokenTest, BrokenTestException
+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
+from tests.utils.e2e.env_tools import Environment
 
 
 @contextmanager

diff --git a/tests/e2e_oss/test.py b/tests/e2e_oss/test.py
@@ -19,14 +19,14 @@
 import yaml
 
 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, \
+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 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
+from tests.utils.e2e.common.pipeline import Pipeline
+from tests.utils.e2e.comparator.container import ComparatorsContainer
+from tests.utils.e2e.env_tools import Environment
 
 pytest_plugins = ('e2e_oss.plugins.e2e_test.conftest',)