From f3d1aa649040416b03da67552890b46904bc6c16 Mon Sep 17 00:00:00 2001 From: Evgeny Lazarev Date: Tue, 20 Apr 2021 14:47:18 +0300 Subject: [PATCH] Moved MO unit test files to a separate directory (#5312) * Removed test-generator from all MO requirement files except the dev one * Moved all MO unit tests files to a separate directory * Added __init__.py files to the tests directory. Fixed importing paths for some unit tests * Fixed imports in all unit tests. Moved all unit test related files from the MO code to the dedicated directory * Renamed directory with unit test utils * Updated imports in unit tests --- model-optimizer/requirements.txt | 1 - model-optimizer/requirements_caffe.txt | 1 - model-optimizer/requirements_kaldi.txt | 1 - model-optimizer/requirements_mxnet.txt | 1 - model-optimizer/requirements_onnx.txt | 1 - model-optimizer/requirements_tf.txt | 1 - model-optimizer/requirements_tf2.txt | 1 - .../telemetry/utils/sender_test.py | 68 ------------------ model-optimizer/unit_tests/__init__.py | 0 .../unit_tests/extensions/__init__.py | 0 .../analysis/Iterator_get_next_test.py | 2 +- .../extensions/analysis/__init__.py | 0 .../extensions/back/ClampNormalizer_test.py | 2 +- .../back/ConvolutionNormalizer_test.py | 2 +- .../extensions/back/CutMemory_test.py | 2 +- .../back/FakeOutputResolver_test.py | 2 +- .../back/FuseTransposesSequence_test.py | 3 +- .../back/InterpolateReshape_test.py | 3 +- .../back/LayoutChangeForGatherND_test.py | 2 +- .../back/MarkNodesWithShapeValues_test.py | 18 +++-- .../extensions/back/MatMulNormalizer_test.py | 4 +- .../OptimizeTransposeReshapeSequence_test.py | 0 .../back/ReduceTransposeDimensions_test.py | 0 .../extensions/back/ResultRename_test.py | 2 +- .../ShuffleChannelPatternOptimization_test.py | 2 +- .../back/ShufflenetReLUReorder_test.py | 2 +- .../back/SpecialNodesFinalization_test.py | 2 +- .../back/TransposeReduceFusing_test.py | 2 +- .../unit_tests/extensions/back/__init__.py | 0 .../back/compress_quantized_weights_test.py | 2 +- ...sert_compatibility_l2normalization_test.py | 2 +- .../back/kaldi_remove_memory_output_test.py | 2 +- .../back/remove_last_softmax_test.py | 2 +- .../front/ATenToEmbeddingBag_test.py | 3 +- .../front/AttributedClampNormalizer_test.py | 2 +- .../front/AttributedPadToPad_test.py | 2 +- .../front/AttributedRollToRoll_test.py | 2 +- .../DropoutWithRandomUniformReplacer_test.py | 2 +- .../extensions/front/GeLUMerger_Erf_test.py | 2 +- .../extensions/front/GeLUMerger_Tanh_test.py | 2 +- .../extensions/front/HSigmoid_fusion_test.py | 2 +- .../extensions/front/HSwish_fusing_test.py | 2 +- .../extensions/front/LayerNorm_test.py | 2 +- .../extensions/front/Log1p_test.py | 2 +- .../extensions/front/Mish_fusion_test.py | 2 +- .../front/OneHotDepthNormalizer_test.py | 2 +- .../extensions/front/Pack_test.py | 2 +- .../front/RollWithEmptyAxesReplacer_test.py | 2 +- .../extensions/front/Softplus_fusion_test.py | 2 +- .../extensions/front/Swish_fusion_test.py | 2 +- .../ThresholdedReluDecomposition_test.py | 2 +- .../unit_tests/extensions/front/__init__.py | 0 .../binary_quantize_normalization_test.py | 2 +- .../front/broadcast_with_range_test.py | 2 +- .../front/caffe/MVNCaffeToMVN_test.py | 2 +- .../extensions/front/caffe/__init__.py | 0 .../extensions/front/caffe/accum_ext_test.py | 4 +- .../extensions/front/caffe/argmax_ext_test.py | 4 +- .../extensions/front/caffe/axpy_test.py | 2 +- .../extensions/front/caffe/bn_test.py | 4 +- .../extensions/front/caffe/conv_ext_test.py | 2 +- .../front/caffe/correlation_ext_test.py | 4 +- .../extensions/front/caffe/crop_ext_test.py | 4 +- .../front/caffe/ctcgreedydecoder_ext_test.py | 4 +- .../front/caffe/data_augmentation_ext_test.py | 4 +- .../front/caffe/elementwise_ext_test.py | 4 +- .../front/caffe/eltwise_add_normalize_test.py | 2 +- .../extensions/front/caffe/elu_test.py | 4 +- .../extensions/front/caffe/grn_ext_test.py | 4 +- .../front/caffe/normalize_ext_test.py | 4 +- .../front/caffe/pooling_ext_test.py | 2 +- .../front/caffe/power_file_ext_test.py | 4 +- .../extensions/front/caffe/prelu_ext_test.py | 4 +- .../caffe/priorbox_clustered_ext_test.py | 4 +- .../front/caffe/priorbox_ext_test.py | 4 +- .../front/caffe/proposal_ext_test.py | 4 +- .../front/caffe/proposal_python_ext_test.py | 4 +- .../front/caffe/regionyolo_ext_test.py | 4 +- .../front/caffe/reorgyolo_ext_test.py | 4 +- .../front/caffe/simplernms_ext_test.py | 4 +- .../caffe/spatial_transformer_ext_test.py | 4 +- .../extensions/front/div_test.py | 2 +- .../extensions/front/eltwise_n_test.py | 2 +- .../front/freeze_placeholder_value_test.py | 2 +- .../extensions/front/image_scaler_test.py | 2 +- .../front/instance_normalization_test.py | 2 +- .../front/interpolate_reshape_test.py | 2 +- .../extensions/front/kaldi/__init__.py | 0 .../add_permute_after_convolution_test.py | 2 +- .../front/kaldi/apply_counts_test.py | 2 +- .../kaldi/memory_offset_adjustment_test.py | 2 +- .../kaldi/replace_lstm_nonlinearity_test.py | 2 +- .../front/kaldi/sigmoid_ext_test.py | 2 +- .../extensions/front/kaldi/tanh_ext_test.py | 2 +- .../kaldi/tdnn_component_replacer_test.py | 2 +- .../extensions/front/mxnet/RNN_ext_test.py | 2 +- .../extensions/front/mxnet/__init__.py | 0 .../extensions/front/mxnet/activation_test.py | 2 +- .../add_input_data_to_prior_boxes_test.py | 2 +- .../mxnet/check_softmax_node_inputs_test.py | 2 +- .../extensions/front/mxnet/conv_ext_test.py | 2 +- .../extensions/front/mxnet/crop_ext_test.py | 2 +- .../extensions/front/mxnet/custom_test.py | 2 +- .../extensions/front/mxnet/gather_test.py | 2 +- .../front/mxnet/gluoncv_ssd_anchors_test.py | 2 +- .../extensions/front/mxnet/leaky_relu_test.py | 2 +- .../front/mxnet/multibox_detection_test.py | 2 +- .../front/mxnet/mx_reshape_reverse_test.py | 2 +- .../front/mxnet/mx_reshape_to_reshape_test.py | 2 +- .../front/mxnet/pooling_ext_test.py | 2 +- .../extensions/front/mxnet/sigmoid_test.py | 2 +- ...pattern_flatten_softmax_activation_test.py | 2 +- .../mxnet/ssd_pattern_remove_flatten_test.py | 2 +- .../mxnet/ssd_pattern_remove_reshape_test.py | 2 +- .../ssd_pattern_remove_transpose_test.py | 2 +- .../ssd_reorder_detection_out_inputs_test.py | 2 +- .../front/onnx/AttributedSliceToSlice_test.py | 2 +- .../front/onnx/MvnOnnxToMvn_test.py | 4 +- .../extensions/front/onnx/__init__.py | 0 .../front/onnx/activation_ext_test.py | 4 +- .../extensions/front/onnx/affine_ext_test.py | 2 +- .../extensions/front/onnx/conv_ext_test.py | 2 +- .../extensions/front/onnx/crop_ext_test.py | 2 +- .../onnx/dequantize_linear_resolver_test.py | 3 +- .../front/onnx/detection_output_test.py | 2 +- .../extensions/front/onnx/gru_ext_test.py | 2 +- .../front/onnx/image_scaler_ext_test.py | 2 +- .../onnx/instance_normalization_ext_test.py | 2 +- .../extensions/front/onnx/lstm_ext_test.py | 2 +- .../front/onnx/normalize_ext_test.py | 2 +- .../front/onnx/pad_converter_test.py | 2 +- .../extensions/front/onnx/pad_ext_test.py | 4 +- .../front/onnx/priorbox_clustered_ext_test.py | 2 +- .../front/onnx/priorbox_ext_test.py | 2 +- .../onnx/quantize_dequantize_linear_test.py | 3 +- .../onnx/quantize_linear_resolver_test.py | 3 +- .../extensions/front/onnx/rnn_ext_test.py | 2 +- .../extensions/front/onnx/squeeze_ext_test.py | 2 +- .../front/onnx/transpose_ext_test.py | 2 +- .../front/onnx/unsqueeze_ext_test.py | 2 +- .../front/onnx/upsample_ext_test.py | 4 +- .../extensions/front/output_cut_test.py | 2 +- .../extensions/front/rank_decomposer_test.py | 2 +- .../extensions/front/reciprocal_test.py | 2 +- .../front/reduce_axis_normalizer_test.py | 2 +- .../front/scatter_normalizer_test.py | 2 +- .../front/softsign_replacer_test.py | 2 +- .../extensions/front/split_normalizer_test.py | 2 +- .../extensions/front/sub_test.py | 2 +- .../tf/CTCGreedyDecoderReplacement_test.py | 4 +- .../front/tf/CTCLossReplacement_test.py | 2 +- ...nConstBeginStridedSliceReplacement_test.py | 2 +- .../front/tf/ObjectDetectionAPI_test.py | 2 +- .../front/tf/SwitchMergeOptimization_test.py | 2 +- .../front/tf/TFSliceToSlice_test.py | 2 +- .../front/tf/WhereDecomposition_test.py | 2 +- .../extensions/front/tf/__init__.py | 0 .../extensions/front/tf/concat_ext_test.py | 2 +- .../extensions/front/tf/concat_test.py | 2 +- .../extensions/front/tf/conv_ext_test.py | 2 +- .../extensions/front/tf/deconv_ext_test.py | 2 +- .../front/tf/embedding_segments_sum_test.py | 2 +- .../extensions/front/tf/fifo_replacer_test.py | 2 +- .../extensions/front/tf/floor_div_test.py | 2 +- .../front/tf/identityN_to_identity_test.py | 2 +- .../extensions/front/tf/mvn_unrolled_test.py | 2 +- .../front/tf/next_iteration_ext_test.py | 2 +- .../extensions/front/tf/pad_tf_to_pad_test.py | 2 +- .../extensions/front/tf/size_replacer_test.py | 2 +- .../front/tf/sparse_to_dense_replacer_test.py | 3 +- .../middle/AddIsCyclicAttribute_test.py | 2 +- .../middle/AddMeanScaleValues_test.py | 2 +- .../extensions/middle/CheckForCycle_test.py | 2 +- .../middle/ConcatOptimization_test.py | 2 +- .../middle/ConvertGroupedStridedSlice_test.py | 2 +- .../CutInputHavingZeroDimFromConcat_test.py | 2 +- .../middle/EltwiseInputReshape_test.py | 2 +- .../middle/FakeSplitOutputs_test.py | 2 +- .../middle/FusedBatchNormTraining_test.py | 2 +- .../extensions/middle/GroupNorm_test.py | 4 +- .../extensions/middle/InsertSelect_test.py | 2 +- .../InterpolateSequenceToInterpolate_test.py | 2 +- .../extensions/middle/L2NormFusing_test.py | 2 +- .../middle/LeakyReluPattern_test.py | 2 +- .../extensions/middle/MXTileReplacer_test.py | 2 +- .../middle/MakeKaldiConstReshapable_test.py | 2 +- .../extensions/middle/MulQuantizeFuse_test.py | 2 +- .../middle/PoolV2ToAttributedPool_test.py | 2 +- .../middle/ReluQuantizeFuse_test.py | 2 +- .../middle/RemoveDuplicationMemory_test.py | 2 +- .../middle/RemoveUselessConcatSplit_test.py | 2 +- .../middle/RemoveUselessCrops_test.py | 2 +- .../middle/RemoveUselessPad_test.py | 2 +- .../ReplaceMemoryOffsetWithSplice_test.py | 2 +- .../middle/ReplacePNormNodePattern_test.py | 2 +- .../middle/ReplaceSpliceNodePattern_test.py | 2 +- .../middle/SequenceLenthToMask_test.py | 2 +- .../middle/SharedWeightsDuplication_test.py | 2 +- .../extensions/middle/SliceConverter_test.py | 2 +- .../middle/SliceLikeToStridedSlice_test.py | 2 +- .../SplitConcatPairToInterpolate_test.py | 2 +- .../middle/StridedSliceNormalizer_test.py | 2 +- .../middle/TensorIteratorBackEdge_test.py | 2 +- .../middle/TensorIteratorCondition_test.py | 2 +- .../middle/TensorIteratorInput_test.py | 2 +- .../middle/TensorIteratorOutput_test.py | 2 +- ...ueezeTileReshapeBlockToInterpolate_test.py | 2 +- .../middle/UpsampleToResample_test.py | 2 +- .../unit_tests/extensions/middle/__init__.py | 0 .../extensions/middle/quantize_fuses_test.py | 2 +- .../extensions/middle/sparse_reshape_test.py | 2 +- .../ops/ExtractImagePatches_test.py | 2 +- .../extensions/ops/LookupTableInsert_test.py | 2 +- .../extensions/ops/MatMul_test.py | 2 +- .../ops/MatMul_value_propagation_test.py | 2 +- .../extensions/ops/ONNXResize11_test.py | 2 +- .../extensions/ops/ReduceOps_test.py | 2 +- .../extensions/ops/Reverse_test.py | 2 +- .../unit_tests/extensions/ops/__init__.py | 0 .../extensions/ops/accum_test.py | 2 +- .../extensions/ops/activation_test.py | 2 +- .../extensions/ops/argmax_test.py | 2 +- .../extensions/ops/assert_test.py | 2 +- .../extensions/ops/bucketize_test.py | 2 +- .../extensions/ops/cast_test.py | 6 +- .../extensions/ops/correlation_test.py | 2 +- .../extensions/ops/ctc_greedy_decoder_test.py | 2 +- .../extensions/ops/ctc_loss_test.py | 2 +- .../extensions/ops/cumsum_test.py | 2 +- .../extensions/ops/data_augmentation_test.py | 2 +- .../extensions/ops/depth_to_space_test.py | 2 +- .../ops/div_value_propagation_test.py | 2 +- .../extensions/ops/elementwise_test.py | 2 +- .../extensions/ops/embedding_bag_test.py | 3 +- .../extensions/ops/gather_test.py | 2 +- .../extensions/ops/gatherelements_test.py | 2 +- .../extensions/ops/gathernd_test.py | 2 +- .../extensions/ops/grn_test.py | 2 +- .../ops/instance_normalization_test.py | 0 .../extensions/ops/interpolate_test.py | 2 +- .../extensions/ops/merge_test.py | 2 +- .../ops/non_max_suppression_test.py | 2 +- .../extensions/ops/normalize_test.py | 2 +- .../extensions/ops/one_hot_test.py | 2 +- .../extensions/ops/priorbox_clustered_test.py | 2 +- .../extensions/ops/priorbox_test.py | 2 +- .../extensions/ops/proposal_test.py | 2 +- .../extensions/ops/psroipooling_test.py | 2 +- .../extensions/ops/quantize_test.py | 2 +- .../extensions/ops/regionyolo_test.py | 2 +- .../extensions/ops/reorgyolo_test.py | 2 +- .../extensions/ops/scatter_test.py | 3 +- .../extensions/ops/scatternd_test.py | 2 +- .../extensions/ops/select_test.py | 2 +- .../extensions/ops/simplernms_test.py | 2 +- .../extensions/ops/slice_like_test.py | 2 +- .../extensions/ops/space_to_depth_test.py | 2 +- .../ops/sparse_fill_empty_rows_test.py | 2 +- .../extensions/ops/sparse_reshape_test.py | 2 +- .../ops/sparse_segment_mean_test.py | 2 +- .../ops/sparse_segment_sqrtn_test.py | 2 +- .../extensions/ops/sparse_segment_sum_test.py | 2 +- .../ops/spatial_transformer_test.py | 2 +- .../extensions/ops/split_test.py | 2 +- .../extensions/ops/switch_test.py | 2 +- .../extensions/ops/topk_test.py | 2 +- .../extensions/ops/transpose_test.py | 2 +- .../extensions/ops/unique_test.py | 2 +- .../extensions/ops/upsample_test.py | 4 +- model-optimizer/unit_tests/mo/__init__.py | 0 .../unit_tests/mo/back/__init__.py | 0 .../mo/back/ie_ir_ver_2/__init__.py | 0 .../mo/back/ie_ir_ver_2/emitter_test.py | 0 .../{ => unit_tests}/mo/bom_test.py | 11 +-- .../unit_tests/mo/front/__init__.py | 0 .../unit_tests/mo/front/caffe/__init__.py | 0 .../front/caffe/custom_layers_mapping_test.py | 0 .../mo/front/caffe/extractor_test.py | 4 +- .../mo/front/caffe/extractors/__init__.py | 0 .../mo/front/caffe/extractors/utils_test.py | 2 +- .../mo/front/caffe/loader_test.py | 0 .../caffe/python_layer_extractor_test.py | 4 +- .../unit_tests/mo/front/common/__init__.py | 0 .../mo/front/common/layout_test.py | 0 .../mo/front/common/partial_infer/__init__.py | 0 .../partial_infer/caffe_fallback_test.py | 4 +- .../front/common/partial_infer/concat_test.py | 2 +- .../front/common/partial_infer/crop_test.py | 2 +- .../common/partial_infer/elemental_test.py | 0 .../common/partial_infer/eltwise_test.py | 2 +- .../partial_infer/multi_box_detection_test.py | 2 +- .../partial_infer/multi_box_prior_test.py | 2 +- .../common/partial_infer/roipooling_test.py | 2 +- .../mo/front/extractor_test.py | 4 +- .../unit_tests/mo/front/kaldi/__init__.py | 0 .../mo/front/kaldi/extractors/__init__.py | 0 .../kaldi/extractors/add_shift_ext_test.py | 4 +- .../extractors/affine_component_ext_test.py | 4 +- .../extractors/affine_transform_ext_test.py | 4 +- .../batchnorm_component_ext_test.py | 4 +- .../extractors/bias_component_ext_test.py | 4 +- .../front/kaldi/extractors/common_ext_test.py | 4 +- .../front/kaldi/extractors/concat_ext_test.py | 2 +- .../convolutional_component_ext_test.py | 4 +- .../fixed_affine_component_ext_test.py | 4 +- .../kaldi/extractors/max_pooling_ext_test.py | 5 +- .../kaldi/extractors/memoryoffset_ext_test.py | 2 +- .../normalize_component_ext_test.py | 4 +- .../extractors/pnorm_component_ext_test.py | 4 +- .../kaldi/extractors/rescale_ext_test.py | 4 +- .../extractors/scale_component_ext_test.py | 4 +- .../mo/front/kaldi/loader/__init__.py | 0 .../mo/front/kaldi/loader/loader_test.py | 2 +- .../mo/front/kaldi/loader/utils_test.py | 0 .../unit_tests/mo/front/mxnet/__init__.py | 0 .../mo/front/mxnet/extractors/__init__.py | 0 .../mxnet/extractors/multibox_prior_test.py | 0 .../mo/front/mxnet/extractors/relu_test.py | 2 +- .../front/mxnet/extractors/slice_axis_test.py | 2 +- .../mo/front/mxnet/extractors/utils_test.py | 0 .../mo/front/mxnet/loader_test.py | 0 .../unit_tests/mo/front/tf/__init__.py | 0 .../mo/front/tf/extractors/__init__.py | 0 .../mo/front/tf/extractors/concat_test.py | 2 +- .../mo/front/tf/extractors/identity_test.py | 2 +- .../mo/front/tf/extractors/utils_test.py | 2 +- .../mo/front/tf/loader_test.py | 0 .../unit_tests/mo/graph/__init__.py | 0 .../mo/graph/connection_test.py | 2 +- .../{ => unit_tests}/mo/graph/graph_test.py | 5 +- .../{ => unit_tests}/mo/graph/port_test.py | 2 +- .../{ => unit_tests}/mo/main_test.py | 0 .../unit_tests/mo/middle/__init__.py | 0 .../unit_tests/mo/middle/passes/__init__.py | 0 .../middle/passes/convert_data_type_test.py | 2 +- .../mo/middle/passes/eliminate_test.py | 2 +- .../mo/middle/passes/fusing/__init__.py | 0 .../passes/fusing/decomposition_test.py | 2 +- .../passes/fusing/fuse_linear_ops_test.py | 2 +- .../passes/fusing/fuse_linear_seq_test.py | 2 +- .../mo/middle/passes/fusing/helpers_test.py | 2 +- .../passes/fusing/mark_unfused_nodes_test.py | 2 +- .../passes/fusing/resnet_optimization_test.py | 2 +- .../mo/middle/passes/infer_test.py | 2 +- model-optimizer/unit_tests/mo/ops/__init__.py | 0 .../{ => unit_tests}/mo/ops/broadcast_test.py | 2 +- .../{ => unit_tests}/mo/ops/concat_test.py | 2 +- .../mo/ops/convolution_test.py | 4 +- .../{ => unit_tests}/mo/ops/crop_test.py | 2 +- .../mo/ops/expand_dims_test.py | 2 +- .../{ => unit_tests}/mo/ops/pad_test.py | 2 +- .../{ => unit_tests}/mo/ops/pooling_test.py | 2 +- .../{ => unit_tests}/mo/ops/slice_test.py | 2 +- .../{ => unit_tests}/mo/ops/squeeze_test.py | 2 +- .../mo/ops/strided_slice_test.py | 6 +- .../{ => unit_tests}/mo/ops/tile_test.py | 2 +- .../{ => unit_tests}/mo/ops/unsqueeze_test.py | 2 +- .../unit_tests/mo/pipeline/__init__.py | 0 .../mo/pipeline/common_test.py | 2 +- .../unit_tests/mo/utils/__init__.py | 0 .../mo/utils/broadcasting_test.py | 10 +-- .../mo/utils/cli_parser_test.py | 0 .../{ => unit_tests}/mo/utils/error_test.py | 0 .../{ => unit_tests}/mo/utils/graph_test.py | 0 .../unit_tests/mo/utils/ir_engine/__init__.py | 0 .../mo/utils/ir_engine/ir_engine_test.py | 10 +-- .../unit_tests/mo/utils/ir_reader/__init__.py | 0 .../mo/utils/ir_reader/layer_to_class_test.py | 2 +- .../mo/utils/pipeline_config_test.py | 0 .../mo/utils/simple_proto_parser_test.py | 0 .../mo/utils/summarize_graph_test.py | 0 .../{ => unit_tests}/mo/utils/utils_test.py | 0 .../{ => unit_tests}/mo/utils/version_test.py | 0 .../mo/utils/versions_checker_test.py | 0 model-optimizer/unit_tests/utils/__init__.py | 0 .../utils}/extractors.py | 0 .../unittest => unit_tests/utils}/graph.py | 0 ..._synthetic_gru_bidirectional_FP16_1_v6.bin | Bin ..._synthetic_gru_bidirectional_FP16_1_v6.xml | 0 ...c_gru_bidirectional_FP16_1_v6_negative.xml | 0 380 files changed, 374 insertions(+), 471 deletions(-) delete mode 100644 model-optimizer/telemetry/utils/sender_test.py create mode 100644 model-optimizer/unit_tests/__init__.py create mode 100644 model-optimizer/unit_tests/extensions/__init__.py rename model-optimizer/{ => unit_tests}/extensions/analysis/Iterator_get_next_test.py (96%) create mode 100644 model-optimizer/unit_tests/extensions/analysis/__init__.py rename model-optimizer/{ => unit_tests}/extensions/back/ClampNormalizer_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/back/ConvolutionNormalizer_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/back/CutMemory_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/back/FakeOutputResolver_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/back/FuseTransposesSequence_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/back/InterpolateReshape_test.py (94%) rename model-optimizer/{ => unit_tests}/extensions/back/LayoutChangeForGatherND_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/back/MarkNodesWithShapeValues_test.py (84%) rename model-optimizer/{ => unit_tests}/extensions/back/MatMulNormalizer_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/back/OptimizeTransposeReshapeSequence_test.py (100%) rename model-optimizer/{ => unit_tests}/extensions/back/ReduceTransposeDimensions_test.py (100%) rename model-optimizer/{ => unit_tests}/extensions/back/ResultRename_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/back/ShuffleChannelPatternOptimization_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/back/ShufflenetReLUReorder_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/back/SpecialNodesFinalization_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/back/TransposeReduceFusing_test.py (99%) create mode 100644 model-optimizer/unit_tests/extensions/back/__init__.py rename model-optimizer/{ => unit_tests}/extensions/back/compress_quantized_weights_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/back/insert_compatibility_l2normalization_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/back/kaldi_remove_memory_output_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/back/remove_last_softmax_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/ATenToEmbeddingBag_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/AttributedClampNormalizer_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/AttributedPadToPad_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/AttributedRollToRoll_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/DropoutWithRandomUniformReplacer_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/GeLUMerger_Erf_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/GeLUMerger_Tanh_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/HSigmoid_fusion_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/front/HSwish_fusing_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/LayerNorm_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/Log1p_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/Mish_fusion_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/front/OneHotDepthNormalizer_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/front/Pack_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/RollWithEmptyAxesReplacer_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/front/Softplus_fusion_test.py (95%) rename model-optimizer/{ => unit_tests}/extensions/front/Swish_fusion_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/ThresholdedReluDecomposition_test.py (97%) create mode 100644 model-optimizer/unit_tests/extensions/front/__init__.py rename model-optimizer/{ => unit_tests}/extensions/front/binary_quantize_normalization_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/broadcast_with_range_test.py (95%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/MVNCaffeToMVN_test.py (96%) create mode 100644 model-optimizer/unit_tests/extensions/front/caffe/__init__.py rename model-optimizer/{ => unit_tests}/extensions/front/caffe/accum_ext_test.py (93%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/argmax_ext_test.py (93%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/axpy_test.py (95%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/bn_test.py (94%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/conv_ext_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/correlation_ext_test.py (94%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/crop_ext_test.py (93%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/ctcgreedydecoder_ext_test.py (93%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/data_augmentation_ext_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/elementwise_ext_test.py (87%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/eltwise_add_normalize_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/elu_test.py (89%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/grn_ext_test.py (92%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/normalize_ext_test.py (93%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/pooling_ext_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/power_file_ext_test.py (93%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/prelu_ext_test.py (92%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/priorbox_clustered_ext_test.py (95%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/priorbox_ext_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/proposal_ext_test.py (93%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/proposal_python_ext_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/regionyolo_ext_test.py (94%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/reorgyolo_ext_test.py (92%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/simplernms_ext_test.py (94%) rename model-optimizer/{ => unit_tests}/extensions/front/caffe/spatial_transformer_ext_test.py (95%) rename model-optimizer/{ => unit_tests}/extensions/front/div_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/front/eltwise_n_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/front/freeze_placeholder_value_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/image_scaler_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/front/instance_normalization_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/interpolate_reshape_test.py (98%) create mode 100644 model-optimizer/unit_tests/extensions/front/kaldi/__init__.py rename model-optimizer/{ => unit_tests}/extensions/front/kaldi/add_permute_after_convolution_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/kaldi/apply_counts_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/kaldi/memory_offset_adjustment_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/front/kaldi/replace_lstm_nonlinearity_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/kaldi/sigmoid_ext_test.py (87%) rename model-optimizer/{ => unit_tests}/extensions/front/kaldi/tanh_ext_test.py (87%) rename model-optimizer/{ => unit_tests}/extensions/front/kaldi/tdnn_component_replacer_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/RNN_ext_test.py (97%) create mode 100644 model-optimizer/unit_tests/extensions/front/mxnet/__init__.py rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/activation_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/add_input_data_to_prior_boxes_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/check_softmax_node_inputs_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/conv_ext_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/crop_ext_test.py (94%) rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/custom_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/gather_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/gluoncv_ssd_anchors_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/leaky_relu_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/multibox_detection_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/mx_reshape_reverse_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/mx_reshape_to_reshape_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/pooling_ext_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/sigmoid_test.py (95%) rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/ssd_pattern_flatten_softmax_activation_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/ssd_pattern_remove_flatten_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/ssd_pattern_remove_reshape_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/ssd_pattern_remove_transpose_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/mxnet/ssd_reorder_detection_out_inputs_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/AttributedSliceToSlice_test.py (94%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/MvnOnnxToMvn_test.py (92%) create mode 100644 model-optimizer/unit_tests/extensions/front/onnx/__init__.py rename model-optimizer/{ => unit_tests}/extensions/front/onnx/activation_ext_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/affine_ext_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/conv_ext_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/crop_ext_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/dequantize_linear_resolver_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/detection_output_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/gru_ext_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/image_scaler_ext_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/instance_normalization_ext_test.py (91%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/lstm_ext_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/normalize_ext_test.py (93%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/pad_converter_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/pad_ext_test.py (95%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/priorbox_clustered_ext_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/priorbox_ext_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/quantize_dequantize_linear_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/quantize_linear_resolver_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/rnn_ext_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/squeeze_ext_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/transpose_ext_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/unsqueeze_ext_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/front/onnx/upsample_ext_test.py (95%) rename model-optimizer/{ => unit_tests}/extensions/front/output_cut_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/rank_decomposer_test.py (95%) rename model-optimizer/{ => unit_tests}/extensions/front/reciprocal_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/reduce_axis_normalizer_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/front/scatter_normalizer_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/softsign_replacer_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/split_normalizer_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/sub_test.py (95%) rename model-optimizer/{ => unit_tests}/extensions/front/tf/CTCGreedyDecoderReplacement_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/tf/CTCLossReplacement_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/front/tf/NonConstBeginStridedSliceReplacement_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/front/tf/ObjectDetectionAPI_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/front/tf/SwitchMergeOptimization_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/tf/TFSliceToSlice_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/tf/WhereDecomposition_test.py (98%) create mode 100644 model-optimizer/unit_tests/extensions/front/tf/__init__.py rename model-optimizer/{ => unit_tests}/extensions/front/tf/concat_ext_test.py (88%) rename model-optimizer/{ => unit_tests}/extensions/front/tf/concat_test.py (94%) rename model-optimizer/{ => unit_tests}/extensions/front/tf/conv_ext_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/tf/deconv_ext_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/tf/embedding_segments_sum_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/front/tf/fifo_replacer_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/tf/floor_div_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/tf/identityN_to_identity_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/front/tf/mvn_unrolled_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/front/tf/next_iteration_ext_test.py (86%) rename model-optimizer/{ => unit_tests}/extensions/front/tf/pad_tf_to_pad_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/front/tf/size_replacer_test.py (95%) rename model-optimizer/{ => unit_tests}/extensions/front/tf/sparse_to_dense_replacer_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/middle/AddIsCyclicAttribute_test.py (95%) rename model-optimizer/{ => unit_tests}/extensions/middle/AddMeanScaleValues_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/CheckForCycle_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/middle/ConcatOptimization_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/middle/ConvertGroupedStridedSlice_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/CutInputHavingZeroDimFromConcat_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/EltwiseInputReshape_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/FakeSplitOutputs_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/middle/FusedBatchNormTraining_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/GroupNorm_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/middle/InsertSelect_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/InterpolateSequenceToInterpolate_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/L2NormFusing_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/LeakyReluPattern_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/middle/MXTileReplacer_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/middle/MakeKaldiConstReshapable_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/middle/MulQuantizeFuse_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/PoolV2ToAttributedPool_test.py (95%) rename model-optimizer/{ => unit_tests}/extensions/middle/ReluQuantizeFuse_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/RemoveDuplicationMemory_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/RemoveUselessConcatSplit_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/RemoveUselessCrops_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/RemoveUselessPad_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/middle/ReplaceMemoryOffsetWithSplice_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/ReplacePNormNodePattern_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/middle/ReplaceSpliceNodePattern_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/SequenceLenthToMask_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/middle/SharedWeightsDuplication_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/middle/SliceConverter_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/SliceLikeToStridedSlice_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/SplitConcatPairToInterpolate_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/StridedSliceNormalizer_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/TensorIteratorBackEdge_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/middle/TensorIteratorCondition_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/middle/TensorIteratorInput_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/TensorIteratorOutput_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/middle/UnsqueezeTileReshapeBlockToInterpolate_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/UpsampleToResample_test.py (99%) create mode 100644 model-optimizer/unit_tests/extensions/middle/__init__.py rename model-optimizer/{ => unit_tests}/extensions/middle/quantize_fuses_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/middle/sparse_reshape_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/ops/ExtractImagePatches_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/LookupTableInsert_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/MatMul_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/MatMul_value_propagation_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/ONNXResize11_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/ops/ReduceOps_test.py (95%) rename model-optimizer/{ => unit_tests}/extensions/ops/Reverse_test.py (97%) create mode 100644 model-optimizer/unit_tests/extensions/ops/__init__.py rename model-optimizer/{ => unit_tests}/extensions/ops/accum_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/ops/activation_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/argmax_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/ops/assert_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/ops/bucketize_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/cast_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/ops/correlation_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/ops/ctc_greedy_decoder_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/ctc_loss_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/cumsum_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/data_augmentation_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/ops/depth_to_space_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/div_value_propagation_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/elementwise_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/embedding_bag_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/ops/gather_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/gatherelements_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/ops/gathernd_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/ops/grn_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/ops/instance_normalization_test.py (100%) rename model-optimizer/{ => unit_tests}/extensions/ops/interpolate_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/ops/merge_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/non_max_suppression_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/ops/normalize_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/ops/one_hot_test.py (95%) rename model-optimizer/{ => unit_tests}/extensions/ops/priorbox_clustered_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/priorbox_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/ops/proposal_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/psroipooling_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/quantize_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/ops/regionyolo_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/ops/reorgyolo_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/ops/scatter_test.py (95%) rename model-optimizer/{ => unit_tests}/extensions/ops/scatternd_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/ops/select_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/ops/simplernms_test.py (97%) rename model-optimizer/{ => unit_tests}/extensions/ops/slice_like_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/space_to_depth_test.py (95%) rename model-optimizer/{ => unit_tests}/extensions/ops/sparse_fill_empty_rows_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/ops/sparse_reshape_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/sparse_segment_mean_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/sparse_segment_sqrtn_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/sparse_segment_sum_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/spatial_transformer_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/split_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/ops/switch_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/ops/topk_test.py (96%) rename model-optimizer/{ => unit_tests}/extensions/ops/transpose_test.py (98%) rename model-optimizer/{ => unit_tests}/extensions/ops/unique_test.py (99%) rename model-optimizer/{ => unit_tests}/extensions/ops/upsample_test.py (98%) create mode 100644 model-optimizer/unit_tests/mo/__init__.py create mode 100644 model-optimizer/unit_tests/mo/back/__init__.py create mode 100644 model-optimizer/unit_tests/mo/back/ie_ir_ver_2/__init__.py rename model-optimizer/{ => unit_tests}/mo/back/ie_ir_ver_2/emitter_test.py (100%) rename model-optimizer/{ => unit_tests}/mo/bom_test.py (93%) create mode 100644 model-optimizer/unit_tests/mo/front/__init__.py create mode 100644 model-optimizer/unit_tests/mo/front/caffe/__init__.py rename model-optimizer/{ => unit_tests}/mo/front/caffe/custom_layers_mapping_test.py (100%) rename model-optimizer/{ => unit_tests}/mo/front/caffe/extractor_test.py (97%) create mode 100644 model-optimizer/unit_tests/mo/front/caffe/extractors/__init__.py rename model-optimizer/{ => unit_tests}/mo/front/caffe/extractors/utils_test.py (97%) rename model-optimizer/{ => unit_tests}/mo/front/caffe/loader_test.py (100%) rename model-optimizer/{ => unit_tests}/mo/front/caffe/python_layer_extractor_test.py (94%) create mode 100644 model-optimizer/unit_tests/mo/front/common/__init__.py rename model-optimizer/{ => unit_tests}/mo/front/common/layout_test.py (100%) create mode 100644 model-optimizer/unit_tests/mo/front/common/partial_infer/__init__.py rename model-optimizer/{ => unit_tests}/mo/front/common/partial_infer/caffe_fallback_test.py (96%) rename model-optimizer/{ => unit_tests}/mo/front/common/partial_infer/concat_test.py (98%) rename model-optimizer/{ => unit_tests}/mo/front/common/partial_infer/crop_test.py (99%) rename model-optimizer/{ => unit_tests}/mo/front/common/partial_infer/elemental_test.py (100%) rename model-optimizer/{ => unit_tests}/mo/front/common/partial_infer/eltwise_test.py (99%) rename model-optimizer/{ => unit_tests}/mo/front/common/partial_infer/multi_box_detection_test.py (99%) rename model-optimizer/{ => unit_tests}/mo/front/common/partial_infer/multi_box_prior_test.py (97%) rename model-optimizer/{ => unit_tests}/mo/front/common/partial_infer/roipooling_test.py (98%) rename model-optimizer/{ => unit_tests}/mo/front/extractor_test.py (99%) create mode 100644 model-optimizer/unit_tests/mo/front/kaldi/__init__.py create mode 100644 model-optimizer/unit_tests/mo/front/kaldi/extractors/__init__.py rename model-optimizer/{ => unit_tests}/mo/front/kaldi/extractors/add_shift_ext_test.py (90%) rename model-optimizer/{ => unit_tests}/mo/front/kaldi/extractors/affine_component_ext_test.py (87%) rename model-optimizer/{ => unit_tests}/mo/front/kaldi/extractors/affine_transform_ext_test.py (87%) rename model-optimizer/{ => unit_tests}/mo/front/kaldi/extractors/batchnorm_component_ext_test.py (92%) rename model-optimizer/{ => unit_tests}/mo/front/kaldi/extractors/bias_component_ext_test.py (87%) rename model-optimizer/{ => unit_tests}/mo/front/kaldi/extractors/common_ext_test.py (97%) rename model-optimizer/{ => unit_tests}/mo/front/kaldi/extractors/concat_ext_test.py (84%) rename model-optimizer/{ => unit_tests}/mo/front/kaldi/extractors/convolutional_component_ext_test.py (92%) rename model-optimizer/{ => unit_tests}/mo/front/kaldi/extractors/fixed_affine_component_ext_test.py (87%) rename model-optimizer/{ => unit_tests}/mo/front/kaldi/extractors/max_pooling_ext_test.py (89%) rename model-optimizer/{ => unit_tests}/mo/front/kaldi/extractors/memoryoffset_ext_test.py (90%) rename model-optimizer/{ => unit_tests}/mo/front/kaldi/extractors/normalize_component_ext_test.py (86%) rename model-optimizer/{ => unit_tests}/mo/front/kaldi/extractors/pnorm_component_ext_test.py (85%) rename model-optimizer/{ => unit_tests}/mo/front/kaldi/extractors/rescale_ext_test.py (89%) rename model-optimizer/{ => unit_tests}/mo/front/kaldi/extractors/scale_component_ext_test.py (87%) create mode 100644 model-optimizer/unit_tests/mo/front/kaldi/loader/__init__.py rename model-optimizer/{ => unit_tests}/mo/front/kaldi/loader/loader_test.py (99%) rename model-optimizer/{ => unit_tests}/mo/front/kaldi/loader/utils_test.py (100%) create mode 100644 model-optimizer/unit_tests/mo/front/mxnet/__init__.py create mode 100644 model-optimizer/unit_tests/mo/front/mxnet/extractors/__init__.py rename model-optimizer/{ => unit_tests}/mo/front/mxnet/extractors/multibox_prior_test.py (100%) rename model-optimizer/{ => unit_tests}/mo/front/mxnet/extractors/relu_test.py (95%) rename model-optimizer/{ => unit_tests}/mo/front/mxnet/extractors/slice_axis_test.py (98%) rename model-optimizer/{ => unit_tests}/mo/front/mxnet/extractors/utils_test.py (100%) rename model-optimizer/{ => unit_tests}/mo/front/mxnet/loader_test.py (100%) create mode 100644 model-optimizer/unit_tests/mo/front/tf/__init__.py create mode 100644 model-optimizer/unit_tests/mo/front/tf/extractors/__init__.py rename model-optimizer/{ => unit_tests}/mo/front/tf/extractors/concat_test.py (90%) rename model-optimizer/{ => unit_tests}/mo/front/tf/extractors/identity_test.py (89%) rename model-optimizer/{ => unit_tests}/mo/front/tf/extractors/utils_test.py (99%) rename model-optimizer/{ => unit_tests}/mo/front/tf/loader_test.py (100%) create mode 100644 model-optimizer/unit_tests/mo/graph/__init__.py rename model-optimizer/{ => unit_tests}/mo/graph/connection_test.py (99%) rename model-optimizer/{ => unit_tests}/mo/graph/graph_test.py (99%) rename model-optimizer/{ => unit_tests}/mo/graph/port_test.py (98%) rename model-optimizer/{ => unit_tests}/mo/main_test.py (100%) create mode 100644 model-optimizer/unit_tests/mo/middle/__init__.py create mode 100644 model-optimizer/unit_tests/mo/middle/passes/__init__.py rename model-optimizer/{ => unit_tests}/mo/middle/passes/convert_data_type_test.py (98%) rename model-optimizer/{ => unit_tests}/mo/middle/passes/eliminate_test.py (99%) create mode 100644 model-optimizer/unit_tests/mo/middle/passes/fusing/__init__.py rename model-optimizer/{ => unit_tests}/mo/middle/passes/fusing/decomposition_test.py (99%) rename model-optimizer/{ => unit_tests}/mo/middle/passes/fusing/fuse_linear_ops_test.py (99%) rename model-optimizer/{ => unit_tests}/mo/middle/passes/fusing/fuse_linear_seq_test.py (99%) rename model-optimizer/{ => unit_tests}/mo/middle/passes/fusing/helpers_test.py (99%) rename model-optimizer/{ => unit_tests}/mo/middle/passes/fusing/mark_unfused_nodes_test.py (99%) rename model-optimizer/{ => unit_tests}/mo/middle/passes/fusing/resnet_optimization_test.py (99%) rename model-optimizer/{ => unit_tests}/mo/middle/passes/infer_test.py (99%) create mode 100644 model-optimizer/unit_tests/mo/ops/__init__.py rename model-optimizer/{ => unit_tests}/mo/ops/broadcast_test.py (96%) rename model-optimizer/{ => unit_tests}/mo/ops/concat_test.py (95%) rename model-optimizer/{ => unit_tests}/mo/ops/convolution_test.py (99%) rename model-optimizer/{ => unit_tests}/mo/ops/crop_test.py (99%) rename model-optimizer/{ => unit_tests}/mo/ops/expand_dims_test.py (98%) rename model-optimizer/{ => unit_tests}/mo/ops/pad_test.py (98%) rename model-optimizer/{ => unit_tests}/mo/ops/pooling_test.py (99%) rename model-optimizer/{ => unit_tests}/mo/ops/slice_test.py (98%) rename model-optimizer/{ => unit_tests}/mo/ops/squeeze_test.py (97%) rename model-optimizer/{ => unit_tests}/mo/ops/strided_slice_test.py (99%) rename model-optimizer/{ => unit_tests}/mo/ops/tile_test.py (99%) rename model-optimizer/{ => unit_tests}/mo/ops/unsqueeze_test.py (98%) create mode 100644 model-optimizer/unit_tests/mo/pipeline/__init__.py rename model-optimizer/{ => unit_tests}/mo/pipeline/common_test.py (99%) create mode 100644 model-optimizer/unit_tests/mo/utils/__init__.py rename model-optimizer/{ => unit_tests}/mo/utils/broadcasting_test.py (92%) rename model-optimizer/{ => unit_tests}/mo/utils/cli_parser_test.py (100%) rename model-optimizer/{ => unit_tests}/mo/utils/error_test.py (100%) rename model-optimizer/{ => unit_tests}/mo/utils/graph_test.py (100%) create mode 100644 model-optimizer/unit_tests/mo/utils/ir_engine/__init__.py rename model-optimizer/{ => unit_tests}/mo/utils/ir_engine/ir_engine_test.py (94%) create mode 100644 model-optimizer/unit_tests/mo/utils/ir_reader/__init__.py rename model-optimizer/{ => unit_tests}/mo/utils/ir_reader/layer_to_class_test.py (99%) rename model-optimizer/{ => unit_tests}/mo/utils/pipeline_config_test.py (100%) rename model-optimizer/{ => unit_tests}/mo/utils/simple_proto_parser_test.py (100%) rename model-optimizer/{ => unit_tests}/mo/utils/summarize_graph_test.py (100%) rename model-optimizer/{ => unit_tests}/mo/utils/utils_test.py (100%) rename model-optimizer/{ => unit_tests}/mo/utils/version_test.py (100%) rename model-optimizer/{ => unit_tests}/mo/utils/versions_checker_test.py (100%) create mode 100644 model-optimizer/unit_tests/utils/__init__.py rename model-optimizer/{mo/utils/unittest => unit_tests/utils}/extractors.py (100%) rename model-optimizer/{mo/utils/unittest => unit_tests/utils}/graph.py (100%) rename model-optimizer/{mo/utils/unittest => unit_tests/utils}/test_data/mxnet_synthetic_gru_bidirectional_FP16_1_v6.bin (100%) rename model-optimizer/{mo/utils/unittest => unit_tests/utils}/test_data/mxnet_synthetic_gru_bidirectional_FP16_1_v6.xml (100%) rename model-optimizer/{mo/utils/unittest => unit_tests/utils}/test_data/mxnet_synthetic_gru_bidirectional_FP16_1_v6_negative.xml (100%) diff --git a/model-optimizer/requirements.txt b/model-optimizer/requirements.txt index 366dd9131d5..f4690746c79 100644 --- a/model-optimizer/requirements.txt +++ b/model-optimizer/requirements.txt @@ -5,7 +5,6 @@ networkx>=1.11 numpy>=1.14.0,<1.19.0 protobuf>=3.6.1 onnx>=1.1.2 -test-generator==0.1.1 defusedxml>=0.5.0 urllib3>=1.25.9 requests>=2.20.0 diff --git a/model-optimizer/requirements_caffe.txt b/model-optimizer/requirements_caffe.txt index 12f84ce9f05..037f0a838f6 100644 --- a/model-optimizer/requirements_caffe.txt +++ b/model-optimizer/requirements_caffe.txt @@ -1,6 +1,5 @@ networkx>=1.11 numpy>=1.14.0 protobuf>=3.6.1 -test-generator==0.1.1 defusedxml>=0.5.0 requests>=2.20.0 diff --git a/model-optimizer/requirements_kaldi.txt b/model-optimizer/requirements_kaldi.txt index 5104a2b1798..b027c76c594 100644 --- a/model-optimizer/requirements_kaldi.txt +++ b/model-optimizer/requirements_kaldi.txt @@ -1,5 +1,4 @@ networkx>=1.11 numpy>=1.14.0 -test-generator==0.1.1 defusedxml>=0.5.0 requests>=2.20.0 diff --git a/model-optimizer/requirements_mxnet.txt b/model-optimizer/requirements_mxnet.txt index 228cb06c426..8877c2b499e 100644 --- a/model-optimizer/requirements_mxnet.txt +++ b/model-optimizer/requirements_mxnet.txt @@ -1,7 +1,6 @@ mxnet>=1.0.0,<=1.7.0 networkx>=1.11 numpy>=1.14.0 -test-generator==0.1.1 defusedxml>=0.5.0 urllib3>=1.25.9 requests>=2.20.0 diff --git a/model-optimizer/requirements_onnx.txt b/model-optimizer/requirements_onnx.txt index 4f4d54b4b2f..29730df249b 100644 --- a/model-optimizer/requirements_onnx.txt +++ b/model-optimizer/requirements_onnx.txt @@ -1,6 +1,5 @@ onnx>=1.1.2 networkx>=1.11 numpy>=1.14.0 -test-generator==0.1.1 defusedxml>=0.5.0 requests>=2.20.0 diff --git a/model-optimizer/requirements_tf.txt b/model-optimizer/requirements_tf.txt index 531b03c3a80..3a83569827d 100644 --- a/model-optimizer/requirements_tf.txt +++ b/model-optimizer/requirements_tf.txt @@ -2,6 +2,5 @@ tensorflow>=1.15.2,<2.0; python_version < "3.8" tensorflow>=2.2; python_version >= "3.8" networkx>=1.11 numpy>=1.14.0,<1.19.0 -test-generator==0.1.1 defusedxml>=0.5.0 requests>=2.20.0 diff --git a/model-optimizer/requirements_tf2.txt b/model-optimizer/requirements_tf2.txt index bd6fc777b1f..94497c8a32a 100644 --- a/model-optimizer/requirements_tf2.txt +++ b/model-optimizer/requirements_tf2.txt @@ -1,6 +1,5 @@ tensorflow>=2.2 networkx>=1.11 numpy>=1.14.0 -test-generator==0.1.1 defusedxml>=0.5.0 requests>=2.20.0 diff --git a/model-optimizer/telemetry/utils/sender_test.py b/model-optimizer/telemetry/utils/sender_test.py deleted file mode 100644 index 4dca81e3f27..00000000000 --- a/model-optimizer/telemetry/utils/sender_test.py +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright (C) 2018-2021 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -import unittest -import time - -from telemetry.utils.sender import TelemetrySender - - -class FakeTelemetryBackend: - def send(self, param): - pass - - -class FakeTelemetryBackendWithSleep: - def send(self, param): - time.sleep(1) - - -class TelemetrySenderStress(unittest.TestCase): - def test_stress(self): - """ - Stress tests to schedule a lot of threads which works super fast (do nothing) with sending messages." - """ - tm = TelemetrySender() - fake_backend = FakeTelemetryBackend() - for _ in range(1000000): - tm.send(fake_backend, None) - - def test_check_shutdown(self): - """ - Stress test to schedule many threads taking 1 second and then ask to force shutdown. Make sure that the elapsed - time is small. - """ - tm = TelemetrySender() - fake_backend = FakeTelemetryBackendWithSleep() - # schedule many requests which just wait 1 second - for _ in range(100000): - tm.send(fake_backend, None) - - start_time = time.time() - # ask to shutdown with timeout of 1 second - tm.force_shutdown(1) - while len(tm.executor._threads): - pass - # check that no more than 3 seconds spent - self.assertTrue(time.time() - start_time < 3) - - def test_check_shutdown_negative(self): - """ - Test to check that without forcing shutdown total execution time is expected. - """ - tm = TelemetrySender(1) # only one worker thread - fake_backend = FakeTelemetryBackendWithSleep() - start_time = time.time() - # schedule 5 requests which totally should work more than 4 seconds - for _ in range(5): - tm.send(fake_backend, None) - - try: - # wait until all threads finish their work. We use internal ThreadPoolExecutor attribute _work_queue to make - # sure that all workers completed their work, so the whole code is wrapped to try/except to avoid exceptions - # if internal implementation is changed in the future - while tm.executor._work_queue.qsize(): - pass - self.assertTrue(time.time() - start_time > 4.0) - except: - pass diff --git a/model-optimizer/unit_tests/__init__.py b/model-optimizer/unit_tests/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/unit_tests/extensions/__init__.py b/model-optimizer/unit_tests/extensions/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/extensions/analysis/Iterator_get_next_test.py b/model-optimizer/unit_tests/extensions/analysis/Iterator_get_next_test.py similarity index 96% rename from model-optimizer/extensions/analysis/Iterator_get_next_test.py rename to model-optimizer/unit_tests/extensions/analysis/Iterator_get_next_test.py index 9d5a54bcd0a..801873bdbb9 100644 --- a/model-optimizer/extensions/analysis/Iterator_get_next_test.py +++ b/model-optimizer/unit_tests/extensions/analysis/Iterator_get_next_test.py @@ -5,7 +5,7 @@ import unittest from extensions.analysis.inputs import InputsAnalysis from mo.front.common.partial_infer.utils import int64_array -from mo.utils.unittest.graph import build_graph_with_edge_attrs +from unit_tests.utils.graph import build_graph_with_edge_attrs class IteratorGetNextAnalysisTest(unittest.TestCase): diff --git a/model-optimizer/unit_tests/extensions/analysis/__init__.py b/model-optimizer/unit_tests/extensions/analysis/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/extensions/back/ClampNormalizer_test.py b/model-optimizer/unit_tests/extensions/back/ClampNormalizer_test.py similarity index 97% rename from model-optimizer/extensions/back/ClampNormalizer_test.py rename to model-optimizer/unit_tests/extensions/back/ClampNormalizer_test.py index bd7746eed4b..f09be16e8ce 100644 --- a/model-optimizer/extensions/back/ClampNormalizer_test.py +++ b/model-optimizer/unit_tests/extensions/back/ClampNormalizer_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.back.ClampNormalizer import ClampNormalizer from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, regular_op_with_shaped_data, valued_const_with_data, result, connect +from unit_tests.utils.graph import build_graph, regular_op_with_shaped_data, valued_const_with_data, result, connect class AttributedClampNormalizerTests(unittest.TestCase): diff --git a/model-optimizer/extensions/back/ConvolutionNormalizer_test.py b/model-optimizer/unit_tests/extensions/back/ConvolutionNormalizer_test.py similarity index 98% rename from model-optimizer/extensions/back/ConvolutionNormalizer_test.py rename to model-optimizer/unit_tests/extensions/back/ConvolutionNormalizer_test.py index fb4b15cae34..d7a2f4809fc 100644 --- a/model-optimizer/extensions/back/ConvolutionNormalizer_test.py +++ b/model-optimizer/unit_tests/extensions/back/ConvolutionNormalizer_test.py @@ -11,7 +11,7 @@ from extensions.ops.fakequantize import FakeQuantize from mo.front.common.partial_infer.utils import int64_array from mo.ops.reshape import Reshape from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, result, regular_op_with_shaped_data, regular_op_with_empty_data, \ +from unit_tests.utils.graph import build_graph, result, regular_op_with_shaped_data, regular_op_with_empty_data, \ valued_const_with_data, connect diff --git a/model-optimizer/extensions/back/CutMemory_test.py b/model-optimizer/unit_tests/extensions/back/CutMemory_test.py similarity index 98% rename from model-optimizer/extensions/back/CutMemory_test.py rename to model-optimizer/unit_tests/extensions/back/CutMemory_test.py index 4edb90e6f7e..a3c5403bc89 100644 --- a/model-optimizer/extensions/back/CutMemory_test.py +++ b/model-optimizer/unit_tests/extensions/back/CutMemory_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.back.CutMemory import CutMemoryInput, CutMemoryOutput from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class CutMemoryTest(unittest.TestCase): diff --git a/model-optimizer/extensions/back/FakeOutputResolver_test.py b/model-optimizer/unit_tests/extensions/back/FakeOutputResolver_test.py similarity index 96% rename from model-optimizer/extensions/back/FakeOutputResolver_test.py rename to model-optimizer/unit_tests/extensions/back/FakeOutputResolver_test.py index 64baebc8d2c..82020d36f4f 100644 --- a/model-optimizer/extensions/back/FakeOutputResolver_test.py +++ b/model-optimizer/unit_tests/extensions/back/FakeOutputResolver_test.py @@ -6,7 +6,7 @@ import unittest from extensions.back.FakeOutputResolver import FakeOutputResolver from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, result, regular_op_with_empty_data, connect, empty_data, \ +from unit_tests.utils.graph import build_graph, result, regular_op_with_empty_data, connect, empty_data, \ valued_const_with_data diff --git a/model-optimizer/extensions/back/FuseTransposesSequence_test.py b/model-optimizer/unit_tests/extensions/back/FuseTransposesSequence_test.py similarity index 98% rename from model-optimizer/extensions/back/FuseTransposesSequence_test.py rename to model-optimizer/unit_tests/extensions/back/FuseTransposesSequence_test.py index 0614a90e9f4..ed174be2883 100644 --- a/model-optimizer/extensions/back/FuseTransposesSequence_test.py +++ b/model-optimizer/unit_tests/extensions/back/FuseTransposesSequence_test.py @@ -2,13 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 import unittest -from argparse import Namespace import numpy as np from extensions.back.FuseTransposesSequence import FuseTransposesSequence -from mo.middle.passes.eliminate_test import build_graph from mo.utils.ir_engine.compare_graphs import compare_graphs +from unit_tests.utils.graph import build_graph # The dictionary with nodes attributes used to build various graphs. A key is the name of the node and the value is the # dictionary with node attributes. diff --git a/model-optimizer/extensions/back/InterpolateReshape_test.py b/model-optimizer/unit_tests/extensions/back/InterpolateReshape_test.py similarity index 94% rename from model-optimizer/extensions/back/InterpolateReshape_test.py rename to model-optimizer/unit_tests/extensions/back/InterpolateReshape_test.py index 0ab62e5d754..e81b0611a77 100644 --- a/model-optimizer/extensions/back/InterpolateReshape_test.py +++ b/model-optimizer/unit_tests/extensions/back/InterpolateReshape_test.py @@ -2,13 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 import unittest -from argparse import Namespace import numpy as np from extensions.back.InterpolateReshape import InterpolateReshapeWA, InterpolateConcat from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, result, regular_op_with_shaped_data, valued_const_with_data, connect, \ +from unit_tests.utils.graph import build_graph, result, regular_op_with_shaped_data, valued_const_with_data, connect, \ connect_data nodes = { diff --git a/model-optimizer/extensions/back/LayoutChangeForGatherND_test.py b/model-optimizer/unit_tests/extensions/back/LayoutChangeForGatherND_test.py similarity index 99% rename from model-optimizer/extensions/back/LayoutChangeForGatherND_test.py rename to model-optimizer/unit_tests/extensions/back/LayoutChangeForGatherND_test.py index 7d517fe3c13..652f40180b9 100644 --- a/model-optimizer/extensions/back/LayoutChangeForGatherND_test.py +++ b/model-optimizer/unit_tests/extensions/back/LayoutChangeForGatherND_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.back.LayoutChangeForGatherND import LayoutChangeForGatherND from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'placeholder_1': {'shape': None, 'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/extensions/back/MarkNodesWithShapeValues_test.py b/model-optimizer/unit_tests/extensions/back/MarkNodesWithShapeValues_test.py similarity index 84% rename from model-optimizer/extensions/back/MarkNodesWithShapeValues_test.py rename to model-optimizer/unit_tests/extensions/back/MarkNodesWithShapeValues_test.py index 0d33f7b6e21..83ef22d24e7 100644 --- a/model-optimizer/extensions/back/MarkNodesWithShapeValues_test.py +++ b/model-optimizer/unit_tests/extensions/back/MarkNodesWithShapeValues_test.py @@ -9,9 +9,8 @@ from extensions.back.MarkNodesWithShapeValues import MarkNodesWithShapeValues from mo.front.common.partial_infer.utils import int64_array, float32_array from mo.graph.graph import Node from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph -from mo.utils.unittest.graph import result, regular_op_with_empty_data, \ - shaped_const_with_data, connect, regular_op +from unit_tests.utils.graph import build_graph, result, regular_op_with_empty_data, shaped_const_with_data, connect, \ + regular_op class TestMarkDataTypeInShapeOfSubgraphs(unittest.TestCase): @@ -24,7 +23,7 @@ class TestMarkDataTypeInShapeOfSubgraphs(unittest.TestCase): **shaped_const_with_data('input', int64_array(inp_shape)), **regular_op_with_empty_data('shape', {'type': 'ShapeOf'}), **regular_op_with_empty_data('cast_to_float', {'type': 'Cast', 'dst_type': dst_type}), - **regular_op('mul_const', {'op': 'Const'}), + **regular_op('mul_const', {'op': 'Const'}), **{'mul_const_d': {'kind': 'data', 'value': float32_array([1., 1., 1., 100.])}}, **regular_op_with_empty_data('mul', {'type': 'Mul'}), **regular_op_with_empty_data('cast_to_int', {'type': 'Cast', 'dst_type': np.int64}), @@ -38,7 +37,7 @@ class TestMarkDataTypeInShapeOfSubgraphs(unittest.TestCase): **regular_op_with_empty_data('cast_to_float', {'type': 'Cast', 'dst_type': dst_type, 'returns_shape_value': True}), **regular_op_with_empty_data('mul', {'type': 'Mul', 'returns_shape_value': True}), - **regular_op('mul_const', {'op': 'Const', 'returns_shape_value': True}), + **regular_op('mul_const', {'op': 'Const', 'returns_shape_value': True}), **{'mul_const_d': {'kind': 'data', 'value': float32_array([1., 1., 1., 100.]), 'correct_data_type': True}}, **regular_op_with_empty_data('cast_to_int', {'type': 'Cast', 'dst_type': np.int64, @@ -69,21 +68,20 @@ class TestMarkDataTypeInShapeOfSubgraphs(unittest.TestCase): def test_run_with_const_input(self): inp_shape = (1, 3, 1000, 1000) - dst_type = np.float32 nodes = { **shaped_const_with_data('input', int64_array(inp_shape)), - **regular_op('sizes_const', {'op': 'Const'}), + **regular_op('sizes_const', {'op': 'Const'}), **{'sizes_const_d': {'kind': 'data', 'value': float32_array([1., 1., 1., 100.])}}, - **regular_op_with_empty_data('interpolate', {'type': 'Interpolate', 'shape_calculation_model': 'scales'}), + **regular_op_with_empty_data('interpolate', {'type': 'Interpolate', 'shape_calculation_model': 'scales'}), **result('res'), } nodes_ref = { **shaped_const_with_data('input', int64_array(inp_shape)), - **regular_op('sizes_const', {'op': 'Const', 'returns_shape_value': True}), + **regular_op('sizes_const', {'op': 'Const', 'returns_shape_value': True}), **{'sizes_const_d': {'kind': 'data', 'value': float32_array([1., 1., 1., 100.])}}, - **regular_op_with_empty_data('interpolate', {'type': 'Interpolate', 'shape_calculation_model': 'scales'}), + **regular_op_with_empty_data('interpolate', {'type': 'Interpolate', 'shape_calculation_model': 'scales'}), **result('res'), } diff --git a/model-optimizer/extensions/back/MatMulNormalizer_test.py b/model-optimizer/unit_tests/extensions/back/MatMulNormalizer_test.py similarity index 96% rename from model-optimizer/extensions/back/MatMulNormalizer_test.py rename to model-optimizer/unit_tests/extensions/back/MatMulNormalizer_test.py index ab5d5942821..1d019526fcc 100644 --- a/model-optimizer/extensions/back/MatMulNormalizer_test.py +++ b/model-optimizer/unit_tests/extensions/back/MatMulNormalizer_test.py @@ -11,9 +11,9 @@ from extensions.ops.MatMul import MatMul from mo.front.common.partial_infer.utils import int64_array from mo.ops.reshape import Reshape from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, regular_op_with_shaped_data, valued_const_with_data, \ +from unit_tests.utils.graph import build_graph, regular_op_with_shaped_data, valued_const_with_data, \ result, connect -from mo.utils.unittest.graph import regular_op_with_empty_data as op_with_empty_data +from unit_tests.utils.graph import regular_op_with_empty_data as op_with_empty_data @generator diff --git a/model-optimizer/extensions/back/OptimizeTransposeReshapeSequence_test.py b/model-optimizer/unit_tests/extensions/back/OptimizeTransposeReshapeSequence_test.py similarity index 100% rename from model-optimizer/extensions/back/OptimizeTransposeReshapeSequence_test.py rename to model-optimizer/unit_tests/extensions/back/OptimizeTransposeReshapeSequence_test.py diff --git a/model-optimizer/extensions/back/ReduceTransposeDimensions_test.py b/model-optimizer/unit_tests/extensions/back/ReduceTransposeDimensions_test.py similarity index 100% rename from model-optimizer/extensions/back/ReduceTransposeDimensions_test.py rename to model-optimizer/unit_tests/extensions/back/ReduceTransposeDimensions_test.py diff --git a/model-optimizer/extensions/back/ResultRename_test.py b/model-optimizer/unit_tests/extensions/back/ResultRename_test.py similarity index 97% rename from model-optimizer/extensions/back/ResultRename_test.py rename to model-optimizer/unit_tests/extensions/back/ResultRename_test.py index 1c70c3995e8..b38937fa624 100644 --- a/model-optimizer/extensions/back/ResultRename_test.py +++ b/model-optimizer/unit_tests/extensions/back/ResultRename_test.py @@ -6,7 +6,7 @@ import unittest from extensions.back.ResultRename import ResultRename from mo.graph.graph import Node from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, regular_op, result +from unit_tests.utils.graph import build_graph, regular_op, result nodes = { **regular_op('Op1', {'type': 'Op1', 'kind': 'op', 'op': 'Op1'}), diff --git a/model-optimizer/extensions/back/ShuffleChannelPatternOptimization_test.py b/model-optimizer/unit_tests/extensions/back/ShuffleChannelPatternOptimization_test.py similarity index 99% rename from model-optimizer/extensions/back/ShuffleChannelPatternOptimization_test.py rename to model-optimizer/unit_tests/extensions/back/ShuffleChannelPatternOptimization_test.py index 8469c32c734..c4a91950c54 100644 --- a/model-optimizer/extensions/back/ShuffleChannelPatternOptimization_test.py +++ b/model-optimizer/unit_tests/extensions/back/ShuffleChannelPatternOptimization_test.py @@ -14,7 +14,7 @@ from extensions.ops.transpose import Transpose from mo.front.common.partial_infer.utils import int64_array from mo.ops.reshape import Reshape from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, result, regular_op_with_shaped_data, \ +from unit_tests.utils.graph import build_graph, result, regular_op_with_shaped_data, \ valued_const_with_data, connect, regular_op_with_empty_data diff --git a/model-optimizer/extensions/back/ShufflenetReLUReorder_test.py b/model-optimizer/unit_tests/extensions/back/ShufflenetReLUReorder_test.py similarity index 99% rename from model-optimizer/extensions/back/ShufflenetReLUReorder_test.py rename to model-optimizer/unit_tests/extensions/back/ShufflenetReLUReorder_test.py index 38dab3464af..5b154f22c9d 100644 --- a/model-optimizer/extensions/back/ShufflenetReLUReorder_test.py +++ b/model-optimizer/unit_tests/extensions/back/ShufflenetReLUReorder_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.back.ShufflenetReLUReorder import ShufflenetReLUReorder from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph # The dictionary with nodes attributes used to build various graphs. A key is the name of the node and the value is the # dictionary with node attributes. diff --git a/model-optimizer/extensions/back/SpecialNodesFinalization_test.py b/model-optimizer/unit_tests/extensions/back/SpecialNodesFinalization_test.py similarity index 99% rename from model-optimizer/extensions/back/SpecialNodesFinalization_test.py rename to model-optimizer/unit_tests/extensions/back/SpecialNodesFinalization_test.py index ea6516adbc3..efcc9042b30 100644 --- a/model-optimizer/extensions/back/SpecialNodesFinalization_test.py +++ b/model-optimizer/unit_tests/extensions/back/SpecialNodesFinalization_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.back.SpecialNodesFinalization import CreateConstNodesReplacement, RemoveConstToResult from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph_with_attrs +from unit_tests.utils.graph import build_graph_with_attrs class CreateConstNodesReplacementTest(unittest.TestCase): diff --git a/model-optimizer/extensions/back/TransposeReduceFusing_test.py b/model-optimizer/unit_tests/extensions/back/TransposeReduceFusing_test.py similarity index 99% rename from model-optimizer/extensions/back/TransposeReduceFusing_test.py rename to model-optimizer/unit_tests/extensions/back/TransposeReduceFusing_test.py index fa7ec2c1cc8..54ecf80bdfd 100644 --- a/model-optimizer/extensions/back/TransposeReduceFusing_test.py +++ b/model-optimizer/unit_tests/extensions/back/TransposeReduceFusing_test.py @@ -6,7 +6,7 @@ import unittest from extensions.back.TransposeReduceFusing import TransposeReduce from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { # op diff --git a/model-optimizer/unit_tests/extensions/back/__init__.py b/model-optimizer/unit_tests/extensions/back/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/extensions/back/compress_quantized_weights_test.py b/model-optimizer/unit_tests/extensions/back/compress_quantized_weights_test.py similarity index 98% rename from model-optimizer/extensions/back/compress_quantized_weights_test.py rename to model-optimizer/unit_tests/extensions/back/compress_quantized_weights_test.py index 251b9be4c69..73ca749d016 100644 --- a/model-optimizer/extensions/back/compress_quantized_weights_test.py +++ b/model-optimizer/unit_tests/extensions/back/compress_quantized_weights_test.py @@ -13,7 +13,7 @@ from extensions.ops.elementwise import Sub, Mul from extensions.ops.fakequantize import FakeQuantize from mo.front.common.partial_infer.eltwise import eltwise_infer from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, regular_op_with_shaped_data, valued_const_with_data, result, connect, \ +from unit_tests.utils.graph import build_graph, regular_op_with_shaped_data, valued_const_with_data, result, connect, \ shaped_const_with_data diff --git a/model-optimizer/extensions/back/insert_compatibility_l2normalization_test.py b/model-optimizer/unit_tests/extensions/back/insert_compatibility_l2normalization_test.py similarity index 96% rename from model-optimizer/extensions/back/insert_compatibility_l2normalization_test.py rename to model-optimizer/unit_tests/extensions/back/insert_compatibility_l2normalization_test.py index 5c88dfba0b6..559eb2e4075 100644 --- a/model-optimizer/extensions/back/insert_compatibility_l2normalization_test.py +++ b/model-optimizer/unit_tests/extensions/back/insert_compatibility_l2normalization_test.py @@ -6,7 +6,7 @@ import unittest import numpy as np from extensions.back.insert_compatibility_l2normalization import CompatibilityL2NormalizationPattern -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class CompatibilityL2NormalizationPatternTest(unittest.TestCase): diff --git a/model-optimizer/extensions/back/kaldi_remove_memory_output_test.py b/model-optimizer/unit_tests/extensions/back/kaldi_remove_memory_output_test.py similarity index 96% rename from model-optimizer/extensions/back/kaldi_remove_memory_output_test.py rename to model-optimizer/unit_tests/extensions/back/kaldi_remove_memory_output_test.py index b0adddcddbe..e9c42a0ddca 100644 --- a/model-optimizer/extensions/back/kaldi_remove_memory_output_test.py +++ b/model-optimizer/unit_tests/extensions/back/kaldi_remove_memory_output_test.py @@ -4,7 +4,7 @@ import unittest from extensions.back.kaldi_remove_memory_output import KaldiRemoveMemoryOutputBackReplacementPattern -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class KaldiRemoveMemoryOutputTest(unittest.TestCase): diff --git a/model-optimizer/extensions/back/remove_last_softmax_test.py b/model-optimizer/unit_tests/extensions/back/remove_last_softmax_test.py similarity index 98% rename from model-optimizer/extensions/back/remove_last_softmax_test.py rename to model-optimizer/unit_tests/extensions/back/remove_last_softmax_test.py index d9165097617..a3a8ba19c71 100644 --- a/model-optimizer/extensions/back/remove_last_softmax_test.py +++ b/model-optimizer/unit_tests/extensions/back/remove_last_softmax_test.py @@ -6,7 +6,7 @@ import unittest from extensions.back.remove_last_softmax_pattern import RemoveLastSoftMaxPattern, RemoveLastLogSoftMaxPattern from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class KaldiRemoveLastSoftMaxTest(unittest.TestCase): diff --git a/model-optimizer/extensions/front/ATenToEmbeddingBag_test.py b/model-optimizer/unit_tests/extensions/front/ATenToEmbeddingBag_test.py similarity index 98% rename from model-optimizer/extensions/front/ATenToEmbeddingBag_test.py rename to model-optimizer/unit_tests/extensions/front/ATenToEmbeddingBag_test.py index 31436a037d7..178811dac09 100644 --- a/model-optimizer/extensions/front/ATenToEmbeddingBag_test.py +++ b/model-optimizer/unit_tests/extensions/front/ATenToEmbeddingBag_test.py @@ -8,8 +8,7 @@ import numpy as np from extensions.front.ATenToEmbeddingBag import AtenToEmbeddingBag from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, result, \ - regular_op, const +from unit_tests.utils.graph import build_graph, result, regular_op, const class AtenToEmbeddingBagTest(unittest.TestCase): diff --git a/model-optimizer/extensions/front/AttributedClampNormalizer_test.py b/model-optimizer/unit_tests/extensions/front/AttributedClampNormalizer_test.py similarity index 97% rename from model-optimizer/extensions/front/AttributedClampNormalizer_test.py rename to model-optimizer/unit_tests/extensions/front/AttributedClampNormalizer_test.py index ba7aa09e51a..086ebf2a183 100644 --- a/model-optimizer/extensions/front/AttributedClampNormalizer_test.py +++ b/model-optimizer/unit_tests/extensions/front/AttributedClampNormalizer_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.AttributedClampNormalizer import AttributedClampNormalizer from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, const +from unit_tests.utils.graph import build_graph, const nodes_attributes = { 'placeholder': {'shape': None, 'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/extensions/front/AttributedPadToPad_test.py b/model-optimizer/unit_tests/extensions/front/AttributedPadToPad_test.py similarity index 98% rename from model-optimizer/extensions/front/AttributedPadToPad_test.py rename to model-optimizer/unit_tests/extensions/front/AttributedPadToPad_test.py index 6a878c3daba..0c9efd97b8c 100644 --- a/model-optimizer/extensions/front/AttributedPadToPad_test.py +++ b/model-optimizer/unit_tests/extensions/front/AttributedPadToPad_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.front.AttributedPadToPad import AttributedPadToPad from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, const +from unit_tests.utils.graph import build_graph, const nodes_attributes = { 'placeholder': {'shape': None, 'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/extensions/front/AttributedRollToRoll_test.py b/model-optimizer/unit_tests/extensions/front/AttributedRollToRoll_test.py similarity index 97% rename from model-optimizer/extensions/front/AttributedRollToRoll_test.py rename to model-optimizer/unit_tests/extensions/front/AttributedRollToRoll_test.py index 95d2e1460dd..60f0ecccd4f 100644 --- a/model-optimizer/extensions/front/AttributedRollToRoll_test.py +++ b/model-optimizer/unit_tests/extensions/front/AttributedRollToRoll_test.py @@ -7,7 +7,7 @@ from extensions.front.AttributedRollToRoll import AttributedRollToRoll from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, const, result, regular_op +from unit_tests.utils.graph import build_graph, const, result, regular_op nodes_attributes = { **regular_op('placeholder', {'type': 'Parameter'}), diff --git a/model-optimizer/extensions/front/DropoutWithRandomUniformReplacer_test.py b/model-optimizer/unit_tests/extensions/front/DropoutWithRandomUniformReplacer_test.py similarity index 97% rename from model-optimizer/extensions/front/DropoutWithRandomUniformReplacer_test.py rename to model-optimizer/unit_tests/extensions/front/DropoutWithRandomUniformReplacer_test.py index 77f9f9c5284..a95557cf84d 100644 --- a/model-optimizer/extensions/front/DropoutWithRandomUniformReplacer_test.py +++ b/model-optimizer/unit_tests/extensions/front/DropoutWithRandomUniformReplacer_test.py @@ -7,7 +7,7 @@ import unittest from extensions.front.DropoutWithRandomUniformReplacer import DropoutWithRandomUniformReplacer from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, result, regular_op +from unit_tests.utils.graph import build_graph, result, regular_op class DropoutWithRandomUniformReplacerTest(unittest.TestCase): diff --git a/model-optimizer/extensions/front/GeLUMerger_Erf_test.py b/model-optimizer/unit_tests/extensions/front/GeLUMerger_Erf_test.py similarity index 97% rename from model-optimizer/extensions/front/GeLUMerger_Erf_test.py rename to model-optimizer/unit_tests/extensions/front/GeLUMerger_Erf_test.py index 8b855226762..cf637cff998 100644 --- a/model-optimizer/extensions/front/GeLUMerger_Erf_test.py +++ b/model-optimizer/unit_tests/extensions/front/GeLUMerger_Erf_test.py @@ -7,7 +7,7 @@ from math import sqrt from extensions.front.GeLUMerger_Erf import GeLUMergerErf from mo.front.common.partial_infer.utils import float_array, int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, const, regular_op, result, build_graph +from unit_tests.utils.graph import const, regular_op, result, build_graph ref_nodes = {**regular_op('input', {'type': 'Parameter'}), **regular_op('gelu', {'type': 'Gelu', 'approximation_mode': 'erf', 'name': 'final_mul'}), diff --git a/model-optimizer/extensions/front/GeLUMerger_Tanh_test.py b/model-optimizer/unit_tests/extensions/front/GeLUMerger_Tanh_test.py similarity index 98% rename from model-optimizer/extensions/front/GeLUMerger_Tanh_test.py rename to model-optimizer/unit_tests/extensions/front/GeLUMerger_Tanh_test.py index 9c29feb9856..412dfba9f87 100644 --- a/model-optimizer/extensions/front/GeLUMerger_Tanh_test.py +++ b/model-optimizer/unit_tests/extensions/front/GeLUMerger_Tanh_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.front.GeLUMerger_Tanh import GeLUMergerTanh from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes_erf = { 'inp': {'kind': 'op', 'op': 'AnyOp'}, diff --git a/model-optimizer/extensions/front/HSigmoid_fusion_test.py b/model-optimizer/unit_tests/extensions/front/HSigmoid_fusion_test.py similarity index 99% rename from model-optimizer/extensions/front/HSigmoid_fusion_test.py rename to model-optimizer/unit_tests/extensions/front/HSigmoid_fusion_test.py index 3edb80f86ee..e2a3b68223a 100644 --- a/model-optimizer/extensions/front/HSigmoid_fusion_test.py +++ b/model-optimizer/unit_tests/extensions/front/HSigmoid_fusion_test.py @@ -7,7 +7,7 @@ from extensions.front.HSigmoid_fusion import HSigmoidWithClamp, HSigmoidWithMinM HSigmoidWithReluMul from mo.front.common.partial_infer.utils import float_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, const, regular_op, result, build_graph_with_edge_attrs +from unit_tests.utils.graph import build_graph, const, regular_op, result, build_graph_with_edge_attrs ref_nodes = {**regular_op('input', {'type': 'Parameter'}), **regular_op('hsigmoid', {'type': 'HSigmoid', 'name': 'final_mul'}), diff --git a/model-optimizer/extensions/front/HSwish_fusing_test.py b/model-optimizer/unit_tests/extensions/front/HSwish_fusing_test.py similarity index 98% rename from model-optimizer/extensions/front/HSwish_fusing_test.py rename to model-optimizer/unit_tests/extensions/front/HSwish_fusing_test.py index 912ea92ee51..33f9722d51a 100644 --- a/model-optimizer/extensions/front/HSwish_fusing_test.py +++ b/model-optimizer/unit_tests/extensions/front/HSwish_fusing_test.py @@ -6,7 +6,7 @@ import unittest from extensions.front.HSwish_fusion import HSwishWithClamp, HSwishWithMinMax from mo.front.common.partial_infer.utils import float_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, const, regular_op, result, build_graph_with_edge_attrs +from unit_tests.utils.graph import build_graph, const, regular_op, result, build_graph_with_edge_attrs ref_nodes = {**regular_op('input', {'type': 'Parameter'}), **regular_op('hswish', {'type': 'HSwish', 'name': 'final_mul'}), diff --git a/model-optimizer/extensions/front/LayerNorm_test.py b/model-optimizer/unit_tests/extensions/front/LayerNorm_test.py similarity index 98% rename from model-optimizer/extensions/front/LayerNorm_test.py rename to model-optimizer/unit_tests/extensions/front/LayerNorm_test.py index 85127c9edc7..6c75e73bb01 100644 --- a/model-optimizer/extensions/front/LayerNorm_test.py +++ b/model-optimizer/unit_tests/extensions/front/LayerNorm_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.LayerNorm import LayerNorm from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestMVNPatternReplacement(unittest.TestCase): diff --git a/model-optimizer/extensions/front/Log1p_test.py b/model-optimizer/unit_tests/extensions/front/Log1p_test.py similarity index 97% rename from model-optimizer/extensions/front/Log1p_test.py rename to model-optimizer/unit_tests/extensions/front/Log1p_test.py index 4fab1fd5948..8cbc91cceca 100644 --- a/model-optimizer/extensions/front/Log1p_test.py +++ b/model-optimizer/unit_tests/extensions/front/Log1p_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.Log1p import Log1p from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'placeholder': {'shape': np.array([4, 5, 6]), 'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/extensions/front/Mish_fusion_test.py b/model-optimizer/unit_tests/extensions/front/Mish_fusion_test.py similarity index 96% rename from model-optimizer/extensions/front/Mish_fusion_test.py rename to model-optimizer/unit_tests/extensions/front/Mish_fusion_test.py index 8febc581acd..10e48daefad 100644 --- a/model-optimizer/extensions/front/Mish_fusion_test.py +++ b/model-optimizer/unit_tests/extensions/front/Mish_fusion_test.py @@ -5,7 +5,7 @@ import unittest from extensions.front.Mish_fusion import MishFusion from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, regular_op, result, build_graph_with_edge_attrs +from unit_tests.utils.graph import build_graph, regular_op, result, build_graph_with_edge_attrs ref_nodes = {**regular_op('input', {'type': 'Parameter'}), **regular_op('mish', {'type': 'Mish', 'name': 'final_mul'}), diff --git a/model-optimizer/extensions/front/OneHotDepthNormalizer_test.py b/model-optimizer/unit_tests/extensions/front/OneHotDepthNormalizer_test.py similarity index 96% rename from model-optimizer/extensions/front/OneHotDepthNormalizer_test.py rename to model-optimizer/unit_tests/extensions/front/OneHotDepthNormalizer_test.py index 159c4f2d512..6d99744d5d8 100644 --- a/model-optimizer/extensions/front/OneHotDepthNormalizer_test.py +++ b/model-optimizer/unit_tests/extensions/front/OneHotDepthNormalizer_test.py @@ -6,7 +6,7 @@ import unittest from extensions.front.OneHotDepthNormalizer import OneHotDepthNormalizer from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, result, \ +from unit_tests.utils.graph import build_graph, result, \ regular_op, const diff --git a/model-optimizer/extensions/front/Pack_test.py b/model-optimizer/unit_tests/extensions/front/Pack_test.py similarity index 98% rename from model-optimizer/extensions/front/Pack_test.py rename to model-optimizer/unit_tests/extensions/front/Pack_test.py index 21185302f5d..91763dd1136 100644 --- a/model-optimizer/extensions/front/Pack_test.py +++ b/model-optimizer/unit_tests/extensions/front/Pack_test.py @@ -9,7 +9,7 @@ from generator import generator, generate from extensions.front.Pack import Pack from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'placeholder_0': {'shape': None, 'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/extensions/front/RollWithEmptyAxesReplacer_test.py b/model-optimizer/unit_tests/extensions/front/RollWithEmptyAxesReplacer_test.py similarity index 96% rename from model-optimizer/extensions/front/RollWithEmptyAxesReplacer_test.py rename to model-optimizer/unit_tests/extensions/front/RollWithEmptyAxesReplacer_test.py index 3010644a058..e172737f15e 100644 --- a/model-optimizer/extensions/front/RollWithEmptyAxesReplacer_test.py +++ b/model-optimizer/unit_tests/extensions/front/RollWithEmptyAxesReplacer_test.py @@ -7,7 +7,7 @@ from extensions.front.RollWithEmptyAxesReplacer import RollWithEmptyAxesReplacer from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, const, result, regular_op +from unit_tests.utils.graph import build_graph, const, result, regular_op nodes_attributes = { **regular_op('placeholder', {'type': 'Parameter'}), diff --git a/model-optimizer/extensions/front/Softplus_fusion_test.py b/model-optimizer/unit_tests/extensions/front/Softplus_fusion_test.py similarity index 95% rename from model-optimizer/extensions/front/Softplus_fusion_test.py rename to model-optimizer/unit_tests/extensions/front/Softplus_fusion_test.py index 1adcd8022ae..0dd93f8d95c 100644 --- a/model-optimizer/extensions/front/Softplus_fusion_test.py +++ b/model-optimizer/unit_tests/extensions/front/Softplus_fusion_test.py @@ -6,7 +6,7 @@ import unittest from extensions.front.Softplus_fusion import SoftplusFusion from mo.front.common.partial_infer.utils import float_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, const, regular_op, result, build_graph_with_edge_attrs +from unit_tests.utils.graph import build_graph, const, regular_op, result, build_graph_with_edge_attrs ref_nodes = {**regular_op('input', {'type': 'Parameter'}), **regular_op('softplus', {'type': 'SoftPlus', 'name': 'final_log'}), diff --git a/model-optimizer/extensions/front/Swish_fusion_test.py b/model-optimizer/unit_tests/extensions/front/Swish_fusion_test.py similarity index 98% rename from model-optimizer/extensions/front/Swish_fusion_test.py rename to model-optimizer/unit_tests/extensions/front/Swish_fusion_test.py index f4620e3b139..ccf9985536b 100644 --- a/model-optimizer/extensions/front/Swish_fusion_test.py +++ b/model-optimizer/unit_tests/extensions/front/Swish_fusion_test.py @@ -5,7 +5,7 @@ import unittest from extensions.front.Swish_fusion import SwishWithSigmoidWithoutBeta, SwishWithSigmoidWithBeta from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, regular_op, result, build_graph_with_edge_attrs +from unit_tests.utils.graph import build_graph, regular_op, result, build_graph_with_edge_attrs ref_nodes = {**regular_op('input', {'type': 'Parameter'}), **regular_op('swish', {'type': 'Swish', 'name': 'final_mul'}), diff --git a/model-optimizer/extensions/front/ThresholdedReluDecomposition_test.py b/model-optimizer/unit_tests/extensions/front/ThresholdedReluDecomposition_test.py similarity index 97% rename from model-optimizer/extensions/front/ThresholdedReluDecomposition_test.py rename to model-optimizer/unit_tests/extensions/front/ThresholdedReluDecomposition_test.py index 2dc592feeb3..e550b724dcf 100644 --- a/model-optimizer/extensions/front/ThresholdedReluDecomposition_test.py +++ b/model-optimizer/unit_tests/extensions/front/ThresholdedReluDecomposition_test.py @@ -6,7 +6,7 @@ import unittest from extensions.front.ThresholdedReluDecomposition import ThresholdedReluDecomposition from mo.front.common.partial_infer.utils import float_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, const +from unit_tests.utils.graph import build_graph, const nodes_attributes = { 'parameter': {'shape': None, 'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/unit_tests/extensions/front/__init__.py b/model-optimizer/unit_tests/extensions/front/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/extensions/front/binary_quantize_normalization_test.py b/model-optimizer/unit_tests/extensions/front/binary_quantize_normalization_test.py similarity index 97% rename from model-optimizer/extensions/front/binary_quantize_normalization_test.py rename to model-optimizer/unit_tests/extensions/front/binary_quantize_normalization_test.py index 2b64e1993fa..a0b36dda99a 100644 --- a/model-optimizer/extensions/front/binary_quantize_normalization_test.py +++ b/model-optimizer/unit_tests/extensions/front/binary_quantize_normalization_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.binary_quantize_normalization import BinaryFakeQuantizeNormalization from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph graph_nodes = { '0': {'name': 'input', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/extensions/front/broadcast_with_range_test.py b/model-optimizer/unit_tests/extensions/front/broadcast_with_range_test.py similarity index 95% rename from model-optimizer/extensions/front/broadcast_with_range_test.py rename to model-optimizer/unit_tests/extensions/front/broadcast_with_range_test.py index 9c1bfb1b5f6..ca5cd19f3e2 100644 --- a/model-optimizer/extensions/front/broadcast_with_range_test.py +++ b/model-optimizer/unit_tests/extensions/front/broadcast_with_range_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.broadcast_with_range import ExpandRangeConstant from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, result, regular_op_with_shaped_data, valued_const_with_data, connect, \ +from unit_tests.utils.graph import build_graph, result, regular_op_with_shaped_data, valued_const_with_data, connect, \ regular_op_with_empty_data, connect_data diff --git a/model-optimizer/extensions/front/caffe/MVNCaffeToMVN_test.py b/model-optimizer/unit_tests/extensions/front/caffe/MVNCaffeToMVN_test.py similarity index 96% rename from model-optimizer/extensions/front/caffe/MVNCaffeToMVN_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/MVNCaffeToMVN_test.py index 76fe876fff9..68f77631bb7 100644 --- a/model-optimizer/extensions/front/caffe/MVNCaffeToMVN_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/MVNCaffeToMVN_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.caffe.MVNCaffeToMVN import MVNCaffeToMVN from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, regular_op_with_empty_data, result, const, connect_front +from unit_tests.utils.graph import build_graph, regular_op_with_empty_data, result, const, connect_front nodes = { **regular_op_with_empty_data('input', {'type': 'Parameter'}), diff --git a/model-optimizer/unit_tests/extensions/front/caffe/__init__.py b/model-optimizer/unit_tests/extensions/front/caffe/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/extensions/front/caffe/accum_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/accum_ext_test.py similarity index 93% rename from model-optimizer/extensions/front/caffe/accum_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/accum_ext_test.py index 6c5477cd585..603a1449f07 100644 --- a/model-optimizer/extensions/front/caffe/accum_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/accum_ext_test.py @@ -7,8 +7,8 @@ from unittest.mock import patch from extensions.front.caffe.accum_ext import AccumFrontExtractor from extensions.ops.accum import AccumOp from mo.ops.op import Op -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import FakeNode +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakeAccumProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/argmax_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/argmax_ext_test.py similarity index 93% rename from model-optimizer/extensions/front/caffe/argmax_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/argmax_ext_test.py index 0f55d526e2b..e48572d84e4 100644 --- a/model-optimizer/extensions/front/caffe/argmax_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/argmax_ext_test.py @@ -7,8 +7,8 @@ from unittest.mock import patch from extensions.front.caffe.argmax_ext import ArgMaxFrontExtractor from extensions.ops.argmax import ArgMaxOp from mo.ops.op import Op -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import FakeNode +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakeArgMaxProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/axpy_test.py b/model-optimizer/unit_tests/extensions/front/caffe/axpy_test.py similarity index 95% rename from model-optimizer/extensions/front/caffe/axpy_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/axpy_test.py index e1ca7df5fbc..2225890c45d 100644 --- a/model-optimizer/extensions/front/caffe/axpy_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/axpy_test.py @@ -5,7 +5,7 @@ import unittest from extensions.front.caffe.axpy import AxpyToSSandAdd from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph_with_edge_attrs +from unit_tests.utils.graph import build_graph_with_edge_attrs class TestAxpyReplacer(unittest.TestCase): diff --git a/model-optimizer/extensions/front/caffe/bn_test.py b/model-optimizer/unit_tests/extensions/front/caffe/bn_test.py similarity index 94% rename from model-optimizer/extensions/front/caffe/bn_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/bn_test.py index 6ea6ed0f0ff..398e384d128 100644 --- a/model-optimizer/extensions/front/caffe/bn_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/bn_test.py @@ -7,8 +7,8 @@ import unittest from extensions.front.caffe.bn import BNToScaleShift from mo.graph.graph import Node from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.extractors import FakeParam -from mo.utils.unittest.graph import build_graph_with_edge_attrs, build_graph_with_attrs +from unit_tests.utils.extractors import FakeParam +from unit_tests.utils.graph import build_graph_with_edge_attrs, build_graph_with_attrs class FakeBNProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/conv_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/conv_ext_test.py similarity index 99% rename from model-optimizer/extensions/front/caffe/conv_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/conv_ext_test.py index eb1e368e8c7..d3680d0b586 100644 --- a/model-optimizer/extensions/front/caffe/conv_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/conv_ext_test.py @@ -9,7 +9,7 @@ import numpy as np from extensions.front.caffe.conv_ext import ConvFrontExtractor, DeconvFrontExtractor, conv_create_attrs, conv_set_params from mo.front.caffe.extractors.utils import get_list_from_container from mo.utils.error import Error -from mo.utils.unittest.extractors import PB, FakeParam, FakeMultiParam +from unit_tests.utils.extractors import PB, FakeParam, FakeMultiParam class FakeConvProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/correlation_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/correlation_ext_test.py similarity index 94% rename from model-optimizer/extensions/front/caffe/correlation_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/correlation_ext_test.py index d526dace338..577d9ba084a 100644 --- a/model-optimizer/extensions/front/caffe/correlation_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/correlation_ext_test.py @@ -7,8 +7,8 @@ from unittest.mock import patch from extensions.front.caffe.correlation_ext import CorrelationFrontExtractor from extensions.ops.correlation import CorrelationOp from mo.ops.op import Op -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import FakeNode +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakeCorrProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/crop_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/crop_ext_test.py similarity index 93% rename from model-optimizer/extensions/front/caffe/crop_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/crop_ext_test.py index 295ff6932f4..cc9407ab212 100644 --- a/model-optimizer/extensions/front/caffe/crop_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/crop_ext_test.py @@ -8,8 +8,8 @@ from extensions.front.caffe.crop_ext import CropFrontExtractor from mo.front.common.partial_infer.crop import crop_infer from mo.ops.crop import Crop from mo.ops.op import Op -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import FakeNode +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakeCropProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/ctcgreedydecoder_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/ctcgreedydecoder_ext_test.py similarity index 93% rename from model-optimizer/extensions/front/caffe/ctcgreedydecoder_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/ctcgreedydecoder_ext_test.py index 46f1532ddd8..0434f040c03 100644 --- a/model-optimizer/extensions/front/caffe/ctcgreedydecoder_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/ctcgreedydecoder_ext_test.py @@ -7,8 +7,8 @@ from unittest.mock import patch from extensions.front.caffe.ctcgreedydecoder_ext import CTCGreedyDecoderFrontExtractor from extensions.ops.ctc_greedy_decoder import CTCGreedyDecoderOp from mo.ops.op import Op -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import FakeNode +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakeCTCGreedyDecoderProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/data_augmentation_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/data_augmentation_ext_test.py similarity index 96% rename from model-optimizer/extensions/front/caffe/data_augmentation_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/data_augmentation_ext_test.py index facf87ea3ad..0bbbf2cdb53 100644 --- a/model-optimizer/extensions/front/caffe/data_augmentation_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/data_augmentation_ext_test.py @@ -9,8 +9,8 @@ import numpy as np from extensions.front.caffe.data_augmentation_ext import DataAugmentationFrontExtractor from extensions.ops.data_augmentation import DataAugmentationOp from mo.ops.op import Op -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import FakeNode +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakeDAProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/elementwise_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/elementwise_ext_test.py similarity index 87% rename from model-optimizer/extensions/front/caffe/elementwise_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/elementwise_ext_test.py index 59b83363ed1..d8914f0a4da 100644 --- a/model-optimizer/extensions/front/caffe/elementwise_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/elementwise_ext_test.py @@ -5,8 +5,8 @@ import unittest from unittest.mock import patch from extensions.front.caffe.elementwise_ext import BiasToAdd -from mo.utils.unittest.extractors import FakeModelLayer, FakeMultiParam -from mo.utils.unittest.graph import FakeNode +from unit_tests.utils.extractors import FakeModelLayer, FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakeBiasProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/eltwise_add_normalize_test.py b/model-optimizer/unit_tests/extensions/front/caffe/eltwise_add_normalize_test.py similarity index 99% rename from model-optimizer/extensions/front/caffe/eltwise_add_normalize_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/eltwise_add_normalize_test.py index d347693fec3..a570c6b26b8 100644 --- a/model-optimizer/extensions/front/caffe/eltwise_add_normalize_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/eltwise_add_normalize_test.py @@ -7,8 +7,8 @@ import numpy as np from extensions.front.caffe.eltwise_add_normalize import EltwiseAddNormalize from mo.front.common.partial_infer.utils import int64_array -from mo.middle.passes.eliminate_test import build_graph from mo.utils.ir_engine.compare_graphs import compare_graphs +from unit_tests.utils.graph import build_graph input_shape = int64_array([1, 4, 10]) const_1_value = np.array([2.0]) diff --git a/model-optimizer/extensions/front/caffe/elu_test.py b/model-optimizer/unit_tests/extensions/front/caffe/elu_test.py similarity index 89% rename from model-optimizer/extensions/front/caffe/elu_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/elu_test.py index b5cebf6cc97..c2077ad87a6 100644 --- a/model-optimizer/extensions/front/caffe/elu_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/elu_test.py @@ -5,8 +5,8 @@ import unittest from unittest.mock import patch from extensions.front.caffe.elu import ELUFrontExtractor -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import FakeNode +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakeProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/grn_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/grn_ext_test.py similarity index 92% rename from model-optimizer/extensions/front/caffe/grn_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/grn_ext_test.py index dc8f1d6d99f..7d62f8029db 100644 --- a/model-optimizer/extensions/front/caffe/grn_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/grn_ext_test.py @@ -8,8 +8,8 @@ from extensions.front.caffe.grn_ext import GRNFrontExtractor from extensions.ops.grn import GRNOp from mo.front.common.partial_infer.elemental import copy_shape_infer from mo.ops.op import Op -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import FakeNode +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakeGRNProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/normalize_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/normalize_ext_test.py similarity index 93% rename from model-optimizer/extensions/front/caffe/normalize_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/normalize_ext_test.py index be2041cc03e..8383e79f83e 100644 --- a/model-optimizer/extensions/front/caffe/normalize_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/normalize_ext_test.py @@ -7,8 +7,8 @@ from unittest.mock import patch from extensions.front.caffe.normalize_ext import NormalizeFrontExtractor from extensions.ops.normalize import NormalizeOp from mo.ops.op import Op -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import FakeNode +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakeNormalizeProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/pooling_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/pooling_ext_test.py similarity index 98% rename from model-optimizer/extensions/front/caffe/pooling_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/pooling_ext_test.py index 2fff102e876..7787b66fb12 100644 --- a/model-optimizer/extensions/front/caffe/pooling_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/pooling_ext_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.front.caffe.pooling_ext import PoolingFrontExtractor from mo.front.common.extractors.utils import layout_attrs from mo.ops.pooling import Pooling -from mo.utils.unittest.extractors import PB, FakeMultiParam +from unit_tests.utils.extractors import PB, FakeMultiParam class FakeProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/power_file_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/power_file_ext_test.py similarity index 93% rename from model-optimizer/extensions/front/caffe/power_file_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/power_file_ext_test.py index 7984735f6ea..1aebaebc020 100644 --- a/model-optimizer/extensions/front/caffe/power_file_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/power_file_ext_test.py @@ -8,8 +8,8 @@ from extensions.front.caffe.power_file_ext import PowerFileFrontExtractor from extensions.ops.power_file import PowerFileOp from mo.front.common.partial_infer.elemental import copy_shape_infer from mo.ops.op import Op -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import FakeNode +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakePowerFileProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/prelu_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/prelu_ext_test.py similarity index 92% rename from model-optimizer/extensions/front/caffe/prelu_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/prelu_ext_test.py index 3aacb165d03..00733445044 100644 --- a/model-optimizer/extensions/front/caffe/prelu_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/prelu_ext_test.py @@ -7,8 +7,8 @@ from unittest.mock import patch from extensions.front.caffe.prelu_ext import PreluFrontExtractor from extensions.ops.prelu import PReLU from mo.ops.op import Op -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import FakeNode +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakePReLUProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/priorbox_clustered_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/priorbox_clustered_ext_test.py similarity index 95% rename from model-optimizer/extensions/front/caffe/priorbox_clustered_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/priorbox_clustered_ext_test.py index a5081500389..269183402d6 100644 --- a/model-optimizer/extensions/front/caffe/priorbox_clustered_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/priorbox_clustered_ext_test.py @@ -9,8 +9,8 @@ import numpy as np from extensions.front.caffe.priorbox_clustered_ext import PriorBoxClusteredFrontExtractor from extensions.ops.priorbox_clustered import PriorBoxClusteredOp from mo.ops.op import Op -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import FakeNode +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakePriorBoxClusteredProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/priorbox_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/priorbox_ext_test.py similarity index 97% rename from model-optimizer/extensions/front/caffe/priorbox_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/priorbox_ext_test.py index a3a12b680d9..5754aa084bb 100644 --- a/model-optimizer/extensions/front/caffe/priorbox_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/priorbox_ext_test.py @@ -9,8 +9,8 @@ import numpy as np from extensions.front.caffe.priorbox_ext import PriorBoxFrontExtractor from extensions.ops.priorbox import PriorBoxOp from mo.ops.op import Op -from mo.utils.unittest.extractors import FakeMultiParam, FakeParam -from mo.utils.unittest.graph import FakeNode +from unit_tests.utils.extractors import FakeMultiParam, FakeParam +from unit_tests.utils.graph import FakeNode class FakeMultiParamListFields(FakeMultiParam): diff --git a/model-optimizer/extensions/front/caffe/proposal_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/proposal_ext_test.py similarity index 93% rename from model-optimizer/extensions/front/caffe/proposal_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/proposal_ext_test.py index 8a5ea3285f6..f80215562fd 100644 --- a/model-optimizer/extensions/front/caffe/proposal_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/proposal_ext_test.py @@ -7,8 +7,8 @@ from unittest.mock import patch from extensions.front.caffe.proposal_ext import ProposalFrontExtractor from extensions.ops.proposal import ProposalOp from mo.ops.op import Op -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import FakeNode, FakeAttr +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakeProposalProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/proposal_python_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/proposal_python_ext_test.py similarity index 96% rename from model-optimizer/extensions/front/caffe/proposal_python_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/proposal_python_ext_test.py index fb496bd7f75..aae2203b009 100644 --- a/model-optimizer/extensions/front/caffe/proposal_python_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/proposal_python_ext_test.py @@ -6,8 +6,8 @@ import unittest from extensions.front.caffe.proposal_python_ext import ProposalPythonFrontExtractor from extensions.ops.proposal import ProposalOp from mo.ops.op import Op -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import FakeNode, FakeAttr +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakeProposalPythonProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/regionyolo_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/regionyolo_ext_test.py similarity index 94% rename from model-optimizer/extensions/front/caffe/regionyolo_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/regionyolo_ext_test.py index 6400b70055f..226747e6135 100644 --- a/model-optimizer/extensions/front/caffe/regionyolo_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/regionyolo_ext_test.py @@ -7,8 +7,8 @@ from unittest.mock import patch from extensions.front.caffe.regionyolo_ext import RegionYoloFrontExtractor from extensions.ops.regionyolo import RegionYoloOp from mo.ops.op import Op -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import FakeNode +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakeRegionYoloProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/reorgyolo_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/reorgyolo_ext_test.py similarity index 92% rename from model-optimizer/extensions/front/caffe/reorgyolo_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/reorgyolo_ext_test.py index 2f3cfde2627..b466dd55f27 100644 --- a/model-optimizer/extensions/front/caffe/reorgyolo_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/reorgyolo_ext_test.py @@ -7,8 +7,8 @@ from unittest.mock import patch from extensions.front.caffe.reorgyolo_ext import ReorgYoloFrontExtractor from extensions.ops.reorgyolo import ReorgYoloOp from mo.ops.op import Op -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import FakeNode +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakeReorgYoloProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/simplernms_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/simplernms_ext_test.py similarity index 94% rename from model-optimizer/extensions/front/caffe/simplernms_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/simplernms_ext_test.py index af7420d4c5f..e716ee5fa7e 100644 --- a/model-optimizer/extensions/front/caffe/simplernms_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/simplernms_ext_test.py @@ -7,8 +7,8 @@ from unittest.mock import patch from extensions.front.caffe.simplernms_ext import SimplerNMSFrontExtractor from extensions.ops.simplernms import SimplerNMSOp from mo.ops.op import Op -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import FakeNode +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakeSimplerNMSProtoLayer: diff --git a/model-optimizer/extensions/front/caffe/spatial_transformer_ext_test.py b/model-optimizer/unit_tests/extensions/front/caffe/spatial_transformer_ext_test.py similarity index 95% rename from model-optimizer/extensions/front/caffe/spatial_transformer_ext_test.py rename to model-optimizer/unit_tests/extensions/front/caffe/spatial_transformer_ext_test.py index 059903cbd1f..4e90bb317d6 100644 --- a/model-optimizer/extensions/front/caffe/spatial_transformer_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/caffe/spatial_transformer_ext_test.py @@ -7,8 +7,8 @@ from unittest.mock import patch from extensions.front.caffe.spatial_transformer_ext import SpatialTransformFrontExtractor from extensions.ops.spatial_transformer import SpatialTransformOp from mo.ops.op import Op -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import FakeNode +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakeSpatialTransformProtoLayer: diff --git a/model-optimizer/extensions/front/div_test.py b/model-optimizer/unit_tests/extensions/front/div_test.py similarity index 96% rename from model-optimizer/extensions/front/div_test.py rename to model-optimizer/unit_tests/extensions/front/div_test.py index 9d32f1d2da7..f72d3e497e4 100644 --- a/model-optimizer/extensions/front/div_test.py +++ b/model-optimizer/unit_tests/extensions/front/div_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.div import Div from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, result, regular_op_with_shaped_data, valued_const_with_data, connect, \ +from unit_tests.utils.graph import build_graph, result, regular_op_with_shaped_data, valued_const_with_data, connect, \ connect_data nodes = { diff --git a/model-optimizer/extensions/front/eltwise_n_test.py b/model-optimizer/unit_tests/extensions/front/eltwise_n_test.py similarity index 99% rename from model-optimizer/extensions/front/eltwise_n_test.py rename to model-optimizer/unit_tests/extensions/front/eltwise_n_test.py index 46705e2c8b4..9d2bc4af9f7 100644 --- a/model-optimizer/extensions/front/eltwise_n_test.py +++ b/model-optimizer/unit_tests/extensions/front/eltwise_n_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.eltwise_n import EltwiseNReplacement from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'placeholder_1': {'shape': None, 'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/extensions/front/freeze_placeholder_value_test.py b/model-optimizer/unit_tests/extensions/front/freeze_placeholder_value_test.py similarity index 98% rename from model-optimizer/extensions/front/freeze_placeholder_value_test.py rename to model-optimizer/unit_tests/extensions/front/freeze_placeholder_value_test.py index 421d566fa3e..2f236ca861c 100644 --- a/model-optimizer/extensions/front/freeze_placeholder_value_test.py +++ b/model-optimizer/unit_tests/extensions/front/freeze_placeholder_value_test.py @@ -6,7 +6,7 @@ import unittest import numpy as np from extensions.front.freeze_placeholder_value import FreezePlaceholderValue -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_bool = { '0': {'name': 'input1', 'kind': 'op', 'op': 'Parameter', 'data_type': bool, 'shape': np.array([])}, diff --git a/model-optimizer/extensions/front/image_scaler_test.py b/model-optimizer/unit_tests/extensions/front/image_scaler_test.py similarity index 99% rename from model-optimizer/extensions/front/image_scaler_test.py rename to model-optimizer/unit_tests/extensions/front/image_scaler_test.py index 521e2ccb1cf..9fb23144c79 100644 --- a/model-optimizer/extensions/front/image_scaler_test.py +++ b/model-optimizer/unit_tests/extensions/front/image_scaler_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.image_scaler import ImageScaler from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'placeholder_1': {'shape': None, 'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/extensions/front/instance_normalization_test.py b/model-optimizer/unit_tests/extensions/front/instance_normalization_test.py similarity index 98% rename from model-optimizer/extensions/front/instance_normalization_test.py rename to model-optimizer/unit_tests/extensions/front/instance_normalization_test.py index b8d0fdd30d5..189b3a37555 100644 --- a/model-optimizer/extensions/front/instance_normalization_test.py +++ b/model-optimizer/unit_tests/extensions/front/instance_normalization_test.py @@ -5,7 +5,7 @@ import unittest from extensions.front.instance_normalization import InstanceNormalization from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'input': {'kind': 'op', 'op': 'AnyOp'}, diff --git a/model-optimizer/extensions/front/interpolate_reshape_test.py b/model-optimizer/unit_tests/extensions/front/interpolate_reshape_test.py similarity index 98% rename from model-optimizer/extensions/front/interpolate_reshape_test.py rename to model-optimizer/unit_tests/extensions/front/interpolate_reshape_test.py index 0fc090f8897..77fe1df6b77 100644 --- a/model-optimizer/extensions/front/interpolate_reshape_test.py +++ b/model-optimizer/unit_tests/extensions/front/interpolate_reshape_test.py @@ -9,7 +9,7 @@ from generator import generator, generate from extensions.front.interpolate_reshape import InterpolateWithConcat from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, result, regular_op_with_shaped_data, valued_const_with_data, connect, \ +from unit_tests.utils.graph import build_graph, result, regular_op_with_shaped_data, valued_const_with_data, connect, \ connect_data nodes = { diff --git a/model-optimizer/unit_tests/extensions/front/kaldi/__init__.py b/model-optimizer/unit_tests/extensions/front/kaldi/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/extensions/front/kaldi/add_permute_after_convolution_test.py b/model-optimizer/unit_tests/extensions/front/kaldi/add_permute_after_convolution_test.py similarity index 98% rename from model-optimizer/extensions/front/kaldi/add_permute_after_convolution_test.py rename to model-optimizer/unit_tests/extensions/front/kaldi/add_permute_after_convolution_test.py index 28017a2509a..f883cbb4a23 100644 --- a/model-optimizer/extensions/front/kaldi/add_permute_after_convolution_test.py +++ b/model-optimizer/unit_tests/extensions/front/kaldi/add_permute_after_convolution_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.kaldi.add_permute_after_convolution import ReplaceConvolutionTranspose from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class ReplaceConvolutionTransposeTests(unittest.TestCase): diff --git a/model-optimizer/extensions/front/kaldi/apply_counts_test.py b/model-optimizer/unit_tests/extensions/front/kaldi/apply_counts_test.py similarity index 98% rename from model-optimizer/extensions/front/kaldi/apply_counts_test.py rename to model-optimizer/unit_tests/extensions/front/kaldi/apply_counts_test.py index 153d85d96cd..ae7274dcda0 100644 --- a/model-optimizer/extensions/front/kaldi/apply_counts_test.py +++ b/model-optimizer/unit_tests/extensions/front/kaldi/apply_counts_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.kaldi.apply_counts import apply_biases_to_last_layer from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestKaldiPipeline(unittest.TestCase): diff --git a/model-optimizer/extensions/front/kaldi/memory_offset_adjustment_test.py b/model-optimizer/unit_tests/extensions/front/kaldi/memory_offset_adjustment_test.py similarity index 99% rename from model-optimizer/extensions/front/kaldi/memory_offset_adjustment_test.py rename to model-optimizer/unit_tests/extensions/front/kaldi/memory_offset_adjustment_test.py index 85137a2c057..20039e209d8 100644 --- a/model-optimizer/extensions/front/kaldi/memory_offset_adjustment_test.py +++ b/model-optimizer/unit_tests/extensions/front/kaldi/memory_offset_adjustment_test.py @@ -5,7 +5,7 @@ import unittest from extensions.front.kaldi.memory_offset_adjustment import MemoryOffsetAdjustment from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class MemoruOffsetAdjustmentTests(unittest.TestCase): diff --git a/model-optimizer/extensions/front/kaldi/replace_lstm_nonlinearity_test.py b/model-optimizer/unit_tests/extensions/front/kaldi/replace_lstm_nonlinearity_test.py similarity index 98% rename from model-optimizer/extensions/front/kaldi/replace_lstm_nonlinearity_test.py rename to model-optimizer/unit_tests/extensions/front/kaldi/replace_lstm_nonlinearity_test.py index 8b875b2f72c..73f25afd339 100644 --- a/model-optimizer/extensions/front/kaldi/replace_lstm_nonlinearity_test.py +++ b/model-optimizer/unit_tests/extensions/front/kaldi/replace_lstm_nonlinearity_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.front.kaldi.replace_lstm_nonlinearity import ReplaceLstmNonLinearityPattern from mo.graph.graph import Node from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class ReplaceLstmNonlinearityTests(unittest.TestCase): diff --git a/model-optimizer/extensions/front/kaldi/sigmoid_ext_test.py b/model-optimizer/unit_tests/extensions/front/kaldi/sigmoid_ext_test.py similarity index 87% rename from model-optimizer/extensions/front/kaldi/sigmoid_ext_test.py rename to model-optimizer/unit_tests/extensions/front/kaldi/sigmoid_ext_test.py index b4b003d0a08..d39b0d0d5db 100644 --- a/model-optimizer/extensions/front/kaldi/sigmoid_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/kaldi/sigmoid_ext_test.py @@ -3,7 +3,7 @@ from extensions.front.kaldi.sigmoid_ext import SigmoidFrontExtractor from extensions.ops.activation_ops import Sigmoid -from mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest +from unit_tests.mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest from mo.ops.op import Op diff --git a/model-optimizer/extensions/front/kaldi/tanh_ext_test.py b/model-optimizer/unit_tests/extensions/front/kaldi/tanh_ext_test.py similarity index 87% rename from model-optimizer/extensions/front/kaldi/tanh_ext_test.py rename to model-optimizer/unit_tests/extensions/front/kaldi/tanh_ext_test.py index c75cf66c68b..9c42e5c36bd 100644 --- a/model-optimizer/extensions/front/kaldi/tanh_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/kaldi/tanh_ext_test.py @@ -3,7 +3,7 @@ from extensions.front.kaldi.tanh_component_ext import TanhFrontExtractor from extensions.ops.activation_ops import Tanh -from mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest +from unit_tests.mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest from mo.ops.op import Op diff --git a/model-optimizer/extensions/front/kaldi/tdnn_component_replacer_test.py b/model-optimizer/unit_tests/extensions/front/kaldi/tdnn_component_replacer_test.py similarity index 97% rename from model-optimizer/extensions/front/kaldi/tdnn_component_replacer_test.py rename to model-optimizer/unit_tests/extensions/front/kaldi/tdnn_component_replacer_test.py index 17ef9cb9f2f..0233e862d31 100644 --- a/model-optimizer/extensions/front/kaldi/tdnn_component_replacer_test.py +++ b/model-optimizer/unit_tests/extensions/front/kaldi/tdnn_component_replacer_test.py @@ -8,7 +8,7 @@ from generator import generator, generate from extensions.front.kaldi.tdnn_component_replacer import TdnnComponentReplacer from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, regular_op, result, connect_front, const +from unit_tests.utils.graph import build_graph, regular_op, result, connect_front, const @generator diff --git a/model-optimizer/extensions/front/mxnet/RNN_ext_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/RNN_ext_test.py similarity index 97% rename from model-optimizer/extensions/front/mxnet/RNN_ext_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/RNN_ext_test.py index d016a0a7e4b..a3d1bec6f4b 100644 --- a/model-optimizer/extensions/front/mxnet/RNN_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/RNN_ext_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.mxnet.RNN_ext import RNNFrontExtractor from mo.utils.error import Error -from mo.utils.unittest.extractors import PB +from unit_tests.utils.extractors import PB class RNNFrontExtractorTest(unittest.TestCase): diff --git a/model-optimizer/unit_tests/extensions/front/mxnet/__init__.py b/model-optimizer/unit_tests/extensions/front/mxnet/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/extensions/front/mxnet/activation_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/activation_test.py similarity index 97% rename from model-optimizer/extensions/front/mxnet/activation_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/activation_test.py index 50e53ebb371..945e4fa61ee 100644 --- a/model-optimizer/extensions/front/mxnet/activation_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/activation_test.py @@ -5,7 +5,7 @@ import unittest from extensions.front.mxnet.activation import ActivationFrontExtractor from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestActivationFrontExtractorOp(unittest.TestCase): diff --git a/model-optimizer/extensions/front/mxnet/add_input_data_to_prior_boxes_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/add_input_data_to_prior_boxes_test.py similarity index 97% rename from model-optimizer/extensions/front/mxnet/add_input_data_to_prior_boxes_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/add_input_data_to_prior_boxes_test.py index aff09d11766..c2e3756b88a 100644 --- a/model-optimizer/extensions/front/mxnet/add_input_data_to_prior_boxes_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/add_input_data_to_prior_boxes_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.front.mxnet.add_input_data_to_prior_boxes import AddInputDataToPriorBoxes from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestMxnetPipeline(unittest.TestCase): diff --git a/model-optimizer/extensions/front/mxnet/check_softmax_node_inputs_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/check_softmax_node_inputs_test.py similarity index 97% rename from model-optimizer/extensions/front/mxnet/check_softmax_node_inputs_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/check_softmax_node_inputs_test.py index 859f4f65b02..20850a089b5 100644 --- a/model-optimizer/extensions/front/mxnet/check_softmax_node_inputs_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/check_softmax_node_inputs_test.py @@ -5,7 +5,7 @@ import unittest from extensions.front.mxnet.check_softmax_node_inputs import CheckSoftmaxNodeInputs from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestCheckSoftmaxNodeInputs(unittest.TestCase): diff --git a/model-optimizer/extensions/front/mxnet/conv_ext_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/conv_ext_test.py similarity index 99% rename from model-optimizer/extensions/front/mxnet/conv_ext_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/conv_ext_test.py index afc5402dd7b..792964eceea 100644 --- a/model-optimizer/extensions/front/mxnet/conv_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/conv_ext_test.py @@ -6,7 +6,7 @@ import unittest import numpy as np from extensions.front.mxnet.conv_ext import DeconvFrontExtractor -from mo.utils.unittest.extractors import PB +from unit_tests.utils.extractors import PB class TestDeconvShapesParsing(unittest.TestCase): diff --git a/model-optimizer/extensions/front/mxnet/crop_ext_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/crop_ext_test.py similarity index 94% rename from model-optimizer/extensions/front/mxnet/crop_ext_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/crop_ext_test.py index d9a23ee539a..725120444ff 100644 --- a/model-optimizer/extensions/front/mxnet/crop_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/crop_ext_test.py @@ -5,7 +5,7 @@ import unittest from extensions.front.mxnet.crop_ext import CropFrontExtractor from mo.ops.crop import Crop -from mo.utils.unittest.extractors import PB +from unit_tests.utils.extractors import PB class TestCropExt(unittest.TestCase): diff --git a/model-optimizer/extensions/front/mxnet/custom_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/custom_test.py similarity index 96% rename from model-optimizer/extensions/front/mxnet/custom_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/custom_test.py index e0493f4eb74..d52d0154d62 100644 --- a/model-optimizer/extensions/front/mxnet/custom_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/custom_test.py @@ -6,7 +6,7 @@ import unittest from extensions.front.mxnet.custom import CustomFrontExtractorOp from mo.front.extractor import FrontExtractorOp, MXNetCustomFrontExtractorOp from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph attrs = {'test_attr': 1} diff --git a/model-optimizer/extensions/front/mxnet/gather_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/gather_test.py similarity index 98% rename from model-optimizer/extensions/front/mxnet/gather_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/gather_test.py index 49edba0c53a..f53f08fc1c5 100644 --- a/model-optimizer/extensions/front/mxnet/gather_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/gather_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.mxnet.gather import GatherFrontReplacer from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class GatherTest(unittest.TestCase): diff --git a/model-optimizer/extensions/front/mxnet/gluoncv_ssd_anchors_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/gluoncv_ssd_anchors_test.py similarity index 99% rename from model-optimizer/extensions/front/mxnet/gluoncv_ssd_anchors_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/gluoncv_ssd_anchors_test.py index 0a839f37aa6..71c4dbb82c3 100644 --- a/model-optimizer/extensions/front/mxnet/gluoncv_ssd_anchors_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/gluoncv_ssd_anchors_test.py @@ -7,7 +7,7 @@ import unittest from extensions.front.mxnet.gluoncv_ssd_anchors import SsdAnchorsReplacer from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'slice_like': {'kind': 'op', 'op': 'slice_like'}, diff --git a/model-optimizer/extensions/front/mxnet/leaky_relu_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/leaky_relu_test.py similarity index 98% rename from model-optimizer/extensions/front/mxnet/leaky_relu_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/leaky_relu_test.py index 8bcba1cd3a7..37895fe0835 100644 --- a/model-optimizer/extensions/front/mxnet/leaky_relu_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/leaky_relu_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.mxnet.leaky_relu import LeakyReLUFrontExtractor from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestLeakyReLUFrontExtractorOp(unittest.TestCase): diff --git a/model-optimizer/extensions/front/mxnet/multibox_detection_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/multibox_detection_test.py similarity index 98% rename from model-optimizer/extensions/front/mxnet/multibox_detection_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/multibox_detection_test.py index e34fa088287..83a5ec0f7da 100644 --- a/model-optimizer/extensions/front/mxnet/multibox_detection_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/multibox_detection_test.py @@ -4,7 +4,7 @@ import unittest from extensions.front.mxnet.multibox_detection_ext import MultiBoxDetectionOutputExtractor -from mo.utils.unittest.extractors import PB +from unit_tests.utils.extractors import PB class TestMultiBoxDetection_Parsing(unittest.TestCase): diff --git a/model-optimizer/extensions/front/mxnet/mx_reshape_reverse_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/mx_reshape_reverse_test.py similarity index 99% rename from model-optimizer/extensions/front/mxnet/mx_reshape_reverse_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/mx_reshape_reverse_test.py index deaf30ffa90..11bf62bcc8d 100644 --- a/model-optimizer/extensions/front/mxnet/mx_reshape_reverse_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/mx_reshape_reverse_test.py @@ -5,7 +5,7 @@ import unittest from extensions.front.mxnet.mx_reshape_reverse import MXReshapeReverse from mo.front.common.partial_infer.utils import int64_array -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestMXReshapeReverseTest(unittest.TestCase): diff --git a/model-optimizer/extensions/front/mxnet/mx_reshape_to_reshape_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/mx_reshape_to_reshape_test.py similarity index 98% rename from model-optimizer/extensions/front/mxnet/mx_reshape_to_reshape_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/mx_reshape_to_reshape_test.py index 74c618655fc..50c6a315bfe 100644 --- a/model-optimizer/extensions/front/mxnet/mx_reshape_to_reshape_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/mx_reshape_to_reshape_test.py @@ -5,7 +5,7 @@ import unittest from extensions.front.mxnet.mx_reshape_to_reshape import MXReshapeToReshape from mo.front.common.partial_infer.utils import int64_array -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestMXReshapeToReshape(unittest.TestCase): diff --git a/model-optimizer/extensions/front/mxnet/pooling_ext_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/pooling_ext_test.py similarity index 96% rename from model-optimizer/extensions/front/mxnet/pooling_ext_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/pooling_ext_test.py index 14be1089582..4759b5a1680 100644 --- a/model-optimizer/extensions/front/mxnet/pooling_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/pooling_ext_test.py @@ -6,7 +6,7 @@ import unittest import numpy as np from extensions.front.mxnet.pooling_ext import PoolingFrontExtractor -from mo.utils.unittest.extractors import PB +from unit_tests.utils.extractors import PB class TestPoolingShapesParsing(unittest.TestCase): diff --git a/model-optimizer/extensions/front/mxnet/sigmoid_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/sigmoid_test.py similarity index 95% rename from model-optimizer/extensions/front/mxnet/sigmoid_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/sigmoid_test.py index 9fc9a30c7e4..34d078a4e76 100644 --- a/model-optimizer/extensions/front/mxnet/sigmoid_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/sigmoid_test.py @@ -5,7 +5,7 @@ import unittest from extensions.front.mxnet.sigmoid import SigmoidFrontExtractor from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestSigmoidFrontExtractorOp(unittest.TestCase): diff --git a/model-optimizer/extensions/front/mxnet/ssd_pattern_flatten_softmax_activation_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/ssd_pattern_flatten_softmax_activation_test.py similarity index 97% rename from model-optimizer/extensions/front/mxnet/ssd_pattern_flatten_softmax_activation_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/ssd_pattern_flatten_softmax_activation_test.py index a5585382bd8..a86d4a6fa95 100644 --- a/model-optimizer/extensions/front/mxnet/ssd_pattern_flatten_softmax_activation_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/ssd_pattern_flatten_softmax_activation_test.py @@ -5,7 +5,7 @@ import unittest from extensions.front.mxnet.ssd_pattern_flatten_softmax_activation import SsdPatternFlattenSoftmaxActivation from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestSsdPatternFlattenSoftmaxActivation(unittest.TestCase): diff --git a/model-optimizer/extensions/front/mxnet/ssd_pattern_remove_flatten_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/ssd_pattern_remove_flatten_test.py similarity index 96% rename from model-optimizer/extensions/front/mxnet/ssd_pattern_remove_flatten_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/ssd_pattern_remove_flatten_test.py index a27da1cc877..1e19c5c20ad 100644 --- a/model-optimizer/extensions/front/mxnet/ssd_pattern_remove_flatten_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/ssd_pattern_remove_flatten_test.py @@ -5,7 +5,7 @@ import unittest from extensions.front.mxnet.ssd_pattern_remove_flatten import SsdPatternRemoveFlatten from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestSsdPatternRemoveFlatten(unittest.TestCase): diff --git a/model-optimizer/extensions/front/mxnet/ssd_pattern_remove_reshape_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/ssd_pattern_remove_reshape_test.py similarity index 98% rename from model-optimizer/extensions/front/mxnet/ssd_pattern_remove_reshape_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/ssd_pattern_remove_reshape_test.py index e8c66412aba..d3c8ec623a6 100644 --- a/model-optimizer/extensions/front/mxnet/ssd_pattern_remove_reshape_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/ssd_pattern_remove_reshape_test.py @@ -5,7 +5,7 @@ import unittest from extensions.front.mxnet.ssd_pattern_remove_reshape import SsdPatternRemoveReshape from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestSsdPatternRemoveReshape(unittest.TestCase): diff --git a/model-optimizer/extensions/front/mxnet/ssd_pattern_remove_transpose_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/ssd_pattern_remove_transpose_test.py similarity index 97% rename from model-optimizer/extensions/front/mxnet/ssd_pattern_remove_transpose_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/ssd_pattern_remove_transpose_test.py index 4ec408f77a5..81c5b3ff900 100644 --- a/model-optimizer/extensions/front/mxnet/ssd_pattern_remove_transpose_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/ssd_pattern_remove_transpose_test.py @@ -5,7 +5,7 @@ import unittest from extensions.front.mxnet.ssd_pattern_remove_transpose import SsdPatternRemoveTranspose from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestSsdPatternRemoveTranspose(unittest.TestCase): diff --git a/model-optimizer/extensions/front/mxnet/ssd_reorder_detection_out_inputs_test.py b/model-optimizer/unit_tests/extensions/front/mxnet/ssd_reorder_detection_out_inputs_test.py similarity index 97% rename from model-optimizer/extensions/front/mxnet/ssd_reorder_detection_out_inputs_test.py rename to model-optimizer/unit_tests/extensions/front/mxnet/ssd_reorder_detection_out_inputs_test.py index d3f37e138fc..0a51c344f16 100644 --- a/model-optimizer/extensions/front/mxnet/ssd_reorder_detection_out_inputs_test.py +++ b/model-optimizer/unit_tests/extensions/front/mxnet/ssd_reorder_detection_out_inputs_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.mxnet.ssd_reorder_detection_out_inputs import SsdReorderDetectionOutInputs from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestSsdReorderDetectionOutInputs(unittest.TestCase): diff --git a/model-optimizer/extensions/front/onnx/AttributedSliceToSlice_test.py b/model-optimizer/unit_tests/extensions/front/onnx/AttributedSliceToSlice_test.py similarity index 94% rename from model-optimizer/extensions/front/onnx/AttributedSliceToSlice_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/AttributedSliceToSlice_test.py index 9420dc384c1..b7c5239f0e5 100644 --- a/model-optimizer/extensions/front/onnx/AttributedSliceToSlice_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/AttributedSliceToSlice_test.py @@ -8,7 +8,7 @@ from generator import generator, generate from extensions.front.onnx.AttributedSliceToSlice import AttributedSliceToSliceReplacer from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, regular_op_with_empty_data, result, const, connect_front +from unit_tests.utils.graph import build_graph, regular_op_with_empty_data, result, const, connect_front @generator diff --git a/model-optimizer/extensions/front/onnx/MvnOnnxToMvn_test.py b/model-optimizer/unit_tests/extensions/front/onnx/MvnOnnxToMvn_test.py similarity index 92% rename from model-optimizer/extensions/front/onnx/MvnOnnxToMvn_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/MvnOnnxToMvn_test.py index 70f722e5210..77a798f1bf9 100644 --- a/model-optimizer/extensions/front/onnx/MvnOnnxToMvn_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/MvnOnnxToMvn_test.py @@ -3,12 +3,10 @@ import unittest -import numpy as np - from extensions.front.onnx.MvnOnnxToMvn import MvnOnnxToMvn from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, regular_op_with_empty_data, result, const, connect_front +from unit_tests.utils.graph import build_graph, regular_op_with_empty_data, result, const, connect_front nodes = { **regular_op_with_empty_data('input', {'type': 'Parameter'}), diff --git a/model-optimizer/unit_tests/extensions/front/onnx/__init__.py b/model-optimizer/unit_tests/extensions/front/onnx/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/extensions/front/onnx/activation_ext_test.py b/model-optimizer/unit_tests/extensions/front/onnx/activation_ext_test.py similarity index 96% rename from model-optimizer/extensions/front/onnx/activation_ext_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/activation_ext_test.py index 58e9e3a7499..a2e5f07db80 100644 --- a/model-optimizer/extensions/front/onnx/activation_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/activation_ext_test.py @@ -11,8 +11,8 @@ import extensions.front.onnx.activation_ext as extractors from extensions.ops.activation_ops import Elu from mo.graph.graph import Node from mo.ops.op import Op -from mo.utils.unittest.extractors import PB -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.extractors import PB +from unit_tests.utils.graph import build_graph @generator diff --git a/model-optimizer/extensions/front/onnx/affine_ext_test.py b/model-optimizer/unit_tests/extensions/front/onnx/affine_ext_test.py similarity index 97% rename from model-optimizer/extensions/front/onnx/affine_ext_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/affine_ext_test.py index 705a3e81c59..1f362f46750 100644 --- a/model-optimizer/extensions/front/onnx/affine_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/affine_ext_test.py @@ -8,7 +8,7 @@ import onnx from extensions.front.onnx.affine_ext import AffineFrontExtractor from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class AffineONNXExtractorTest(unittest.TestCase): diff --git a/model-optimizer/extensions/front/onnx/conv_ext_test.py b/model-optimizer/unit_tests/extensions/front/onnx/conv_ext_test.py similarity index 98% rename from model-optimizer/extensions/front/onnx/conv_ext_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/conv_ext_test.py index 27f5c2460ea..f5b6ab0622e 100644 --- a/model-optimizer/extensions/front/onnx/conv_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/conv_ext_test.py @@ -9,7 +9,7 @@ import onnx from extensions.front.onnx.conv_ext import ConvTransposeFrontExtractor from mo.graph.graph import Node from mo.utils.error import Error -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class ConvTransposeONNXExtractorTest(unittest.TestCase): diff --git a/model-optimizer/extensions/front/onnx/crop_ext_test.py b/model-optimizer/unit_tests/extensions/front/onnx/crop_ext_test.py similarity index 97% rename from model-optimizer/extensions/front/onnx/crop_ext_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/crop_ext_test.py index e1d8e7ed080..b194e98f7e9 100644 --- a/model-optimizer/extensions/front/onnx/crop_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/crop_ext_test.py @@ -8,7 +8,7 @@ import onnx from extensions.front.onnx.crop_ext import CropFrontExtractor from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class CropONNXExtractorTest(unittest.TestCase): diff --git a/model-optimizer/extensions/front/onnx/dequantize_linear_resolver_test.py b/model-optimizer/unit_tests/extensions/front/onnx/dequantize_linear_resolver_test.py similarity index 97% rename from model-optimizer/extensions/front/onnx/dequantize_linear_resolver_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/dequantize_linear_resolver_test.py index 63ca7bde34b..c305ec57ca3 100644 --- a/model-optimizer/extensions/front/onnx/dequantize_linear_resolver_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/dequantize_linear_resolver_test.py @@ -2,13 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 import unittest -from argparse import Namespace import numpy as np from extensions.front.onnx.dequantize_linear_resolver import DequantizeLinearResolver from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes1_attributes = { 'input': {'kind': 'op', 'op': 'AnyOp'}, diff --git a/model-optimizer/extensions/front/onnx/detection_output_test.py b/model-optimizer/unit_tests/extensions/front/onnx/detection_output_test.py similarity index 98% rename from model-optimizer/extensions/front/onnx/detection_output_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/detection_output_test.py index 4dae8079528..2a0fe9116d3 100644 --- a/model-optimizer/extensions/front/onnx/detection_output_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/detection_output_test.py @@ -9,7 +9,7 @@ import onnx from extensions.front.onnx.detection_output import DetectionOutputFrontExtractor from extensions.ops.DetectionOutput import DetectionOutput from mo.ops.op import Op -from mo.utils.unittest.extractors import PB +from unit_tests.utils.extractors import PB class TestDetectionOutputExt(unittest.TestCase): diff --git a/model-optimizer/extensions/front/onnx/gru_ext_test.py b/model-optimizer/unit_tests/extensions/front/onnx/gru_ext_test.py similarity index 97% rename from model-optimizer/extensions/front/onnx/gru_ext_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/gru_ext_test.py index e00cdc76d05..0506ed44a21 100644 --- a/model-optimizer/extensions/front/onnx/gru_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/gru_ext_test.py @@ -7,7 +7,7 @@ import numpy as np import onnx from extensions.front.onnx.gru_ext import GRUFrontExtractor -from mo.utils.unittest.extractors import PB +from unit_tests.utils.extractors import PB class GRUExtractorTest(unittest.TestCase): diff --git a/model-optimizer/extensions/front/onnx/image_scaler_ext_test.py b/model-optimizer/unit_tests/extensions/front/onnx/image_scaler_ext_test.py similarity index 96% rename from model-optimizer/extensions/front/onnx/image_scaler_ext_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/image_scaler_ext_test.py index 710929a610d..773d4f6ffff 100644 --- a/model-optimizer/extensions/front/onnx/image_scaler_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/image_scaler_ext_test.py @@ -7,7 +7,7 @@ import numpy as np import onnx from extensions.front.onnx.image_scaler_ext import ImageScalerFrontExtractor -from mo.utils.unittest.extractors import PB +from unit_tests.utils.extractors import PB class TestImageScalerONNXExt(unittest.TestCase): diff --git a/model-optimizer/extensions/front/onnx/instance_normalization_ext_test.py b/model-optimizer/unit_tests/extensions/front/onnx/instance_normalization_ext_test.py similarity index 91% rename from model-optimizer/extensions/front/onnx/instance_normalization_ext_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/instance_normalization_ext_test.py index 9881ba39731..86ebbb3e763 100644 --- a/model-optimizer/extensions/front/onnx/instance_normalization_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/instance_normalization_ext_test.py @@ -4,7 +4,7 @@ import onnx from extensions.front.onnx.instance_normalization_ext import InstanceNormalizationExtractor -from mo.utils.unittest.extractors import PB, BaseExtractorsTestingClass +from unit_tests.utils.extractors import PB, BaseExtractorsTestingClass class TestInstanceNormalization(BaseExtractorsTestingClass): diff --git a/model-optimizer/extensions/front/onnx/lstm_ext_test.py b/model-optimizer/unit_tests/extensions/front/onnx/lstm_ext_test.py similarity index 97% rename from model-optimizer/extensions/front/onnx/lstm_ext_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/lstm_ext_test.py index 60c8568b6d9..12940a22168 100644 --- a/model-optimizer/extensions/front/onnx/lstm_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/lstm_ext_test.py @@ -7,7 +7,7 @@ import numpy as np import onnx from extensions.front.onnx.lstm_ext import LSTMFrontExtractor -from mo.utils.unittest.extractors import PB +from unit_tests.utils.extractors import PB class LSTMExtractorTest(unittest.TestCase): diff --git a/model-optimizer/extensions/front/onnx/normalize_ext_test.py b/model-optimizer/unit_tests/extensions/front/onnx/normalize_ext_test.py similarity index 93% rename from model-optimizer/extensions/front/onnx/normalize_ext_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/normalize_ext_test.py index 0324b49e9d6..ffc13a3975e 100644 --- a/model-optimizer/extensions/front/onnx/normalize_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/normalize_ext_test.py @@ -4,7 +4,7 @@ import onnx from extensions.front.onnx.normalize_ext import NormalizeFrontExtractor -from mo.utils.unittest.extractors import PB, BaseExtractorsTestingClass +from unit_tests.utils.extractors import PB, BaseExtractorsTestingClass class TestNormalize(BaseExtractorsTestingClass): diff --git a/model-optimizer/extensions/front/onnx/pad_converter_test.py b/model-optimizer/unit_tests/extensions/front/onnx/pad_converter_test.py similarity index 97% rename from model-optimizer/extensions/front/onnx/pad_converter_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/pad_converter_test.py index a43ec3681de..18330784909 100644 --- a/model-optimizer/extensions/front/onnx/pad_converter_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/pad_converter_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.onnx.pad_converter import ONNXPadToPad from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, const +from unit_tests.utils.graph import build_graph, const nodes_attributes = { 'placeholder': {'shape': None, 'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/extensions/front/onnx/pad_ext_test.py b/model-optimizer/unit_tests/extensions/front/onnx/pad_ext_test.py similarity index 95% rename from model-optimizer/extensions/front/onnx/pad_ext_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/pad_ext_test.py index c67e831bdd4..c56d09bf175 100644 --- a/model-optimizer/extensions/front/onnx/pad_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/pad_ext_test.py @@ -1,13 +1,11 @@ # Copyright (C) 2018-2021 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -from argparse import Namespace - import onnx from extensions.front.onnx.pad_ext import PadFrontExtractor from mo.graph.graph import Graph -from mo.utils.unittest.extractors import PB, BaseExtractorsTestingClass +from unit_tests.utils.extractors import PB, BaseExtractorsTestingClass class TestPad(BaseExtractorsTestingClass): diff --git a/model-optimizer/extensions/front/onnx/priorbox_clustered_ext_test.py b/model-optimizer/unit_tests/extensions/front/onnx/priorbox_clustered_ext_test.py similarity index 98% rename from model-optimizer/extensions/front/onnx/priorbox_clustered_ext_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/priorbox_clustered_ext_test.py index 06f3ae8ea00..bd40d1eac35 100644 --- a/model-optimizer/extensions/front/onnx/priorbox_clustered_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/priorbox_clustered_ext_test.py @@ -9,7 +9,7 @@ import onnx from extensions.front.onnx.priorbox_clustered_ext import PriorBoxClusteredFrontExtractor from extensions.ops.priorbox_clustered import PriorBoxClusteredOp from mo.ops.op import Op -from mo.utils.unittest.extractors import PB +from unit_tests.utils.extractors import PB class TestPriorBoxClusteredExt(unittest.TestCase): diff --git a/model-optimizer/extensions/front/onnx/priorbox_ext_test.py b/model-optimizer/unit_tests/extensions/front/onnx/priorbox_ext_test.py similarity index 98% rename from model-optimizer/extensions/front/onnx/priorbox_ext_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/priorbox_ext_test.py index f5e2be7061c..2971defd3c9 100644 --- a/model-optimizer/extensions/front/onnx/priorbox_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/priorbox_ext_test.py @@ -9,7 +9,7 @@ import onnx from extensions.front.onnx.priorbox_ext import PriorBoxFrontExtractor from extensions.ops.priorbox import PriorBoxOp from mo.ops.op import Op -from mo.utils.unittest.extractors import PB +from unit_tests.utils.extractors import PB class TestPriorBoxExt(unittest.TestCase): diff --git a/model-optimizer/extensions/front/onnx/quantize_dequantize_linear_test.py b/model-optimizer/unit_tests/extensions/front/onnx/quantize_dequantize_linear_test.py similarity index 98% rename from model-optimizer/extensions/front/onnx/quantize_dequantize_linear_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/quantize_dequantize_linear_test.py index c97f6722be4..3d07eb06236 100644 --- a/model-optimizer/extensions/front/onnx/quantize_dequantize_linear_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/quantize_dequantize_linear_test.py @@ -2,13 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 import unittest -from argparse import Namespace import numpy as np from extensions.front.onnx.quantize_dequantize_linear import QuantizeDequantizeLinear from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph # quantize and dequantize share tensors with scale/zp nodes0_attributes = { diff --git a/model-optimizer/extensions/front/onnx/quantize_linear_resolver_test.py b/model-optimizer/unit_tests/extensions/front/onnx/quantize_linear_resolver_test.py similarity index 98% rename from model-optimizer/extensions/front/onnx/quantize_linear_resolver_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/quantize_linear_resolver_test.py index e90d6c71442..2209f87e0d4 100644 --- a/model-optimizer/extensions/front/onnx/quantize_linear_resolver_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/quantize_linear_resolver_test.py @@ -2,13 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 import unittest -from argparse import Namespace import numpy as np from extensions.front.onnx.quantize_linear_resolver import QuantizeLinearResolver from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes1_attributes = { 'input': {'kind': 'op', 'op': 'AnyOp'}, diff --git a/model-optimizer/extensions/front/onnx/rnn_ext_test.py b/model-optimizer/unit_tests/extensions/front/onnx/rnn_ext_test.py similarity index 97% rename from model-optimizer/extensions/front/onnx/rnn_ext_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/rnn_ext_test.py index 36d031e21d7..3b506c15387 100644 --- a/model-optimizer/extensions/front/onnx/rnn_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/rnn_ext_test.py @@ -7,7 +7,7 @@ import numpy as np import onnx from extensions.front.onnx.rnn_ext import RNNFrontExtractor -from mo.utils.unittest.extractors import PB +from unit_tests.utils.extractors import PB class RNNExtractorTest(unittest.TestCase): diff --git a/model-optimizer/extensions/front/onnx/squeeze_ext_test.py b/model-optimizer/unit_tests/extensions/front/onnx/squeeze_ext_test.py similarity index 97% rename from model-optimizer/extensions/front/onnx/squeeze_ext_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/squeeze_ext_test.py index ee943eba26b..68b84f55cc0 100644 --- a/model-optimizer/extensions/front/onnx/squeeze_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/squeeze_ext_test.py @@ -10,7 +10,7 @@ from generator import generator, generate from extensions.front.onnx.squeeze_ext import SqueezeFrontExtractor from mo.ops.op import Op from mo.ops.squeeze import Squeeze -from mo.utils.unittest.extractors import PB +from unit_tests.utils.extractors import PB @generator diff --git a/model-optimizer/extensions/front/onnx/transpose_ext_test.py b/model-optimizer/unit_tests/extensions/front/onnx/transpose_ext_test.py similarity index 97% rename from model-optimizer/extensions/front/onnx/transpose_ext_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/transpose_ext_test.py index cb4e8075af6..39b01288c9a 100644 --- a/model-optimizer/extensions/front/onnx/transpose_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/transpose_ext_test.py @@ -11,7 +11,7 @@ from generator import generator, generate from extensions.front.onnx.transpose_ext import TransposeFrontExtractor from extensions.ops.transpose import Transpose from mo.ops.op import Op -from mo.utils.unittest.extractors import PB +from unit_tests.utils.extractors import PB @generator diff --git a/model-optimizer/extensions/front/onnx/unsqueeze_ext_test.py b/model-optimizer/unit_tests/extensions/front/onnx/unsqueeze_ext_test.py similarity index 96% rename from model-optimizer/extensions/front/onnx/unsqueeze_ext_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/unsqueeze_ext_test.py index f631aa8351d..d98e3fcc7a4 100644 --- a/model-optimizer/extensions/front/onnx/unsqueeze_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/unsqueeze_ext_test.py @@ -10,7 +10,7 @@ from generator import generator, generate from extensions.front.onnx.unsqueeze_ext import UnsqueezeFrontExtractor from mo.ops.op import Op from mo.ops.unsqueeze import Unsqueeze -from mo.utils.unittest.extractors import PB +from unit_tests.utils.extractors import PB @generator diff --git a/model-optimizer/extensions/front/onnx/upsample_ext_test.py b/model-optimizer/unit_tests/extensions/front/onnx/upsample_ext_test.py similarity index 95% rename from model-optimizer/extensions/front/onnx/upsample_ext_test.py rename to model-optimizer/unit_tests/extensions/front/onnx/upsample_ext_test.py index bb1684b8192..e048780b05b 100644 --- a/model-optimizer/extensions/front/onnx/upsample_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/onnx/upsample_ext_test.py @@ -6,8 +6,8 @@ import onnx from extensions.front.onnx.upsample_ext import UpsampleFrontExtractor from mo.graph.graph import Node from mo.utils.error import Error -from mo.utils.unittest.extractors import BaseExtractorsTestingClass -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.extractors import BaseExtractorsTestingClass +from unit_tests.utils.graph import build_graph class UpsampleONNXExtractorTest(BaseExtractorsTestingClass): diff --git a/model-optimizer/extensions/front/output_cut_test.py b/model-optimizer/unit_tests/extensions/front/output_cut_test.py similarity index 98% rename from model-optimizer/extensions/front/output_cut_test.py rename to model-optimizer/unit_tests/extensions/front/output_cut_test.py index 8d662250176..ff660917206 100644 --- a/model-optimizer/extensions/front/output_cut_test.py +++ b/model-optimizer/unit_tests/extensions/front/output_cut_test.py @@ -5,7 +5,7 @@ import unittest from extensions.front.output_cut import OutputCut from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph, regular_op +from unit_tests.utils.graph import build_graph, regular_op nodes = { **regular_op('Parameter1', {'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}), diff --git a/model-optimizer/extensions/front/rank_decomposer_test.py b/model-optimizer/unit_tests/extensions/front/rank_decomposer_test.py similarity index 95% rename from model-optimizer/extensions/front/rank_decomposer_test.py rename to model-optimizer/unit_tests/extensions/front/rank_decomposer_test.py index d6fea7f3476..99d86464eb3 100644 --- a/model-optimizer/extensions/front/rank_decomposer_test.py +++ b/model-optimizer/unit_tests/extensions/front/rank_decomposer_test.py @@ -9,7 +9,7 @@ from generator import generator, generate from extensions.front.rank_decomposer import RankDecomposer from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, regular_op_with_empty_data, result, connect, \ +from unit_tests.utils.graph import build_graph, regular_op_with_empty_data, result, connect, \ valued_const_with_data nodes = lambda output_type: { diff --git a/model-optimizer/extensions/front/reciprocal_test.py b/model-optimizer/unit_tests/extensions/front/reciprocal_test.py similarity index 98% rename from model-optimizer/extensions/front/reciprocal_test.py rename to model-optimizer/unit_tests/extensions/front/reciprocal_test.py index 738c47404ae..dd2f09a09ae 100644 --- a/model-optimizer/extensions/front/reciprocal_test.py +++ b/model-optimizer/unit_tests/extensions/front/reciprocal_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.reciprocal import ReciprocalReplacer from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'placeholder_1': {'shape': None, 'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/extensions/front/reduce_axis_normalizer_test.py b/model-optimizer/unit_tests/extensions/front/reduce_axis_normalizer_test.py similarity index 96% rename from model-optimizer/extensions/front/reduce_axis_normalizer_test.py rename to model-optimizer/unit_tests/extensions/front/reduce_axis_normalizer_test.py index d459f52e648..11800d84ac8 100644 --- a/model-optimizer/extensions/front/reduce_axis_normalizer_test.py +++ b/model-optimizer/unit_tests/extensions/front/reduce_axis_normalizer_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.front.reduce_axis_normalizer import ReduceAxisNormalizer from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, result, connect_front, regular_op +from unit_tests.utils.graph import build_graph, result, connect_front, regular_op nodes = { **regular_op('parameter', {'type': 'Parameter'}), diff --git a/model-optimizer/extensions/front/scatter_normalizer_test.py b/model-optimizer/unit_tests/extensions/front/scatter_normalizer_test.py similarity index 97% rename from model-optimizer/extensions/front/scatter_normalizer_test.py rename to model-optimizer/unit_tests/extensions/front/scatter_normalizer_test.py index 0c873d7eca6..db05730e359 100644 --- a/model-optimizer/extensions/front/scatter_normalizer_test.py +++ b/model-optimizer/unit_tests/extensions/front/scatter_normalizer_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.scatter_normalizer import ScatterNormalizer from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, result, connect, \ +from unit_tests.utils.graph import build_graph, result, connect, \ regular_op_with_empty_data nodes = { diff --git a/model-optimizer/extensions/front/softsign_replacer_test.py b/model-optimizer/unit_tests/extensions/front/softsign_replacer_test.py similarity index 97% rename from model-optimizer/extensions/front/softsign_replacer_test.py rename to model-optimizer/unit_tests/extensions/front/softsign_replacer_test.py index 60f9e701f99..82cc52d3e81 100644 --- a/model-optimizer/extensions/front/softsign_replacer_test.py +++ b/model-optimizer/unit_tests/extensions/front/softsign_replacer_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.softsign_replacer import SoftSign from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'placeholder_1': {'type': 'Parameter', 'kind': 'op', 'op': 'Parameter', 'shape': np.array([1, 227, 227, 3])}, diff --git a/model-optimizer/extensions/front/split_normalizer_test.py b/model-optimizer/unit_tests/extensions/front/split_normalizer_test.py similarity index 98% rename from model-optimizer/extensions/front/split_normalizer_test.py rename to model-optimizer/unit_tests/extensions/front/split_normalizer_test.py index 0c4e96a2de6..1bc841f8bb2 100644 --- a/model-optimizer/extensions/front/split_normalizer_test.py +++ b/model-optimizer/unit_tests/extensions/front/split_normalizer_test.py @@ -6,7 +6,7 @@ import unittest from extensions.front.split_normalizer import SqueezeAxis from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, const +from unit_tests.utils.graph import build_graph, const nodes_attributes = { 'placeholder': {'shape': None, 'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/extensions/front/sub_test.py b/model-optimizer/unit_tests/extensions/front/sub_test.py similarity index 95% rename from model-optimizer/extensions/front/sub_test.py rename to model-optimizer/unit_tests/extensions/front/sub_test.py index 1cc1956e975..3c3e50ee8dd 100644 --- a/model-optimizer/extensions/front/sub_test.py +++ b/model-optimizer/unit_tests/extensions/front/sub_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.sub import Sub from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, result, regular_op_with_shaped_data, valued_const_with_data, connect, \ +from unit_tests.utils.graph import build_graph, result, regular_op_with_shaped_data, valued_const_with_data, connect, \ connect_data nodes = { diff --git a/model-optimizer/extensions/front/tf/CTCGreedyDecoderReplacement_test.py b/model-optimizer/unit_tests/extensions/front/tf/CTCGreedyDecoderReplacement_test.py similarity index 98% rename from model-optimizer/extensions/front/tf/CTCGreedyDecoderReplacement_test.py rename to model-optimizer/unit_tests/extensions/front/tf/CTCGreedyDecoderReplacement_test.py index 1b5c6895974..c4d1d467df4 100644 --- a/model-optimizer/extensions/front/tf/CTCGreedyDecoderReplacement_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/CTCGreedyDecoderReplacement_test.py @@ -3,12 +3,10 @@ import unittest -import numpy as np - from extensions.front.tf.CTCGreedyDecoderReplacement import CTCGreedyDecoderReplacement, CTCGreedyDecoderWithSparseToDenseShapeReplacement from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, const +from unit_tests.utils.graph import build_graph, const class CTCGreedyDecoderReplacementTests(unittest.TestCase): diff --git a/model-optimizer/extensions/front/tf/CTCLossReplacement_test.py b/model-optimizer/unit_tests/extensions/front/tf/CTCLossReplacement_test.py similarity index 99% rename from model-optimizer/extensions/front/tf/CTCLossReplacement_test.py rename to model-optimizer/unit_tests/extensions/front/tf/CTCLossReplacement_test.py index 25aabc9b927..f173ec15c17 100644 --- a/model-optimizer/extensions/front/tf/CTCLossReplacement_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/CTCLossReplacement_test.py @@ -8,7 +8,7 @@ from argparse import Namespace from extensions.front.tf.CTCLossReplacement import CTCLossReplacement from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, const +from unit_tests.utils.graph import build_graph, const class CTCLossFrontReplacementTest(unittest.TestCase): diff --git a/model-optimizer/extensions/front/tf/NonConstBeginStridedSliceReplacement_test.py b/model-optimizer/unit_tests/extensions/front/tf/NonConstBeginStridedSliceReplacement_test.py similarity index 99% rename from model-optimizer/extensions/front/tf/NonConstBeginStridedSliceReplacement_test.py rename to model-optimizer/unit_tests/extensions/front/tf/NonConstBeginStridedSliceReplacement_test.py index 6e6709f213b..457fa6c7fd8 100644 --- a/model-optimizer/extensions/front/tf/NonConstBeginStridedSliceReplacement_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/NonConstBeginStridedSliceReplacement_test.py @@ -6,7 +6,7 @@ import unittest from extensions.front.tf.NonConstBeginStridedSliceReplacement import NonConstBeginStridedSliceReplacement from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, const +from unit_tests.utils.graph import build_graph, const class NonConstBeginStridedSliceReplacementTests(unittest.TestCase): diff --git a/model-optimizer/extensions/front/tf/ObjectDetectionAPI_test.py b/model-optimizer/unit_tests/extensions/front/tf/ObjectDetectionAPI_test.py similarity index 99% rename from model-optimizer/extensions/front/tf/ObjectDetectionAPI_test.py rename to model-optimizer/unit_tests/extensions/front/tf/ObjectDetectionAPI_test.py index 20d7a1c2d42..338f77b8c3c 100644 --- a/model-optimizer/extensions/front/tf/ObjectDetectionAPI_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/ObjectDetectionAPI_test.py @@ -14,7 +14,7 @@ from mo.graph.graph import Graph from mo.utils.custom_replacement_config import CustomReplacementDescriptor from mo.utils.error import Error from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import const, regular_op, result, build_graph, connect_front +from unit_tests.utils.graph import const, regular_op, result, build_graph, connect_front class FakePipelineConfig: diff --git a/model-optimizer/extensions/front/tf/SwitchMergeOptimization_test.py b/model-optimizer/unit_tests/extensions/front/tf/SwitchMergeOptimization_test.py similarity index 98% rename from model-optimizer/extensions/front/tf/SwitchMergeOptimization_test.py rename to model-optimizer/unit_tests/extensions/front/tf/SwitchMergeOptimization_test.py index 7370e7bcbda..7c8f1d02e05 100644 --- a/model-optimizer/extensions/front/tf/SwitchMergeOptimization_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/SwitchMergeOptimization_test.py @@ -6,7 +6,7 @@ import unittest from extensions.front.tf.SwitchMergeOptimization import SwitchMergeOptimization from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class SwitchMergeOptimizationTest(unittest.TestCase): diff --git a/model-optimizer/extensions/front/tf/TFSliceToSlice_test.py b/model-optimizer/unit_tests/extensions/front/tf/TFSliceToSlice_test.py similarity index 97% rename from model-optimizer/extensions/front/tf/TFSliceToSlice_test.py rename to model-optimizer/unit_tests/extensions/front/tf/TFSliceToSlice_test.py index a19fe319241..94204b0129f 100644 --- a/model-optimizer/extensions/front/tf/TFSliceToSlice_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/TFSliceToSlice_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.tf.TFSliceToSlice import TFSliceToSliceReplacer from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, regular_op_with_empty_data, result, const, connect_front +from unit_tests.utils.graph import build_graph, regular_op_with_empty_data, result, const, connect_front nodes = { **regular_op_with_empty_data('input', {'type': 'Parameter'}), diff --git a/model-optimizer/extensions/front/tf/WhereDecomposition_test.py b/model-optimizer/unit_tests/extensions/front/tf/WhereDecomposition_test.py similarity index 98% rename from model-optimizer/extensions/front/tf/WhereDecomposition_test.py rename to model-optimizer/unit_tests/extensions/front/tf/WhereDecomposition_test.py index e3ba84140cb..590727ec705 100644 --- a/model-optimizer/extensions/front/tf/WhereDecomposition_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/WhereDecomposition_test.py @@ -10,7 +10,7 @@ from generator import generator, generate from extensions.front.tf.WhereDecomposition import WhereDecomposition from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph graph_node_attrs = { diff --git a/model-optimizer/unit_tests/extensions/front/tf/__init__.py b/model-optimizer/unit_tests/extensions/front/tf/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/extensions/front/tf/concat_ext_test.py b/model-optimizer/unit_tests/extensions/front/tf/concat_ext_test.py similarity index 88% rename from model-optimizer/extensions/front/tf/concat_ext_test.py rename to model-optimizer/unit_tests/extensions/front/tf/concat_ext_test.py index bda6c35447b..405a8cd1866 100644 --- a/model-optimizer/extensions/front/tf/concat_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/concat_ext_test.py @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 from extensions.front.tf.concat_ext import ConcatFrontExtractor -from mo.utils.unittest.extractors import PB, BaseExtractorsTestingClass +from unit_tests.utils.extractors import PB, BaseExtractorsTestingClass class ConcatExtractorTest(BaseExtractorsTestingClass): diff --git a/model-optimizer/extensions/front/tf/concat_test.py b/model-optimizer/unit_tests/extensions/front/tf/concat_test.py similarity index 94% rename from model-optimizer/extensions/front/tf/concat_test.py rename to model-optimizer/unit_tests/extensions/front/tf/concat_test.py index 41cee96ca71..822b1333f57 100644 --- a/model-optimizer/extensions/front/tf/concat_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/concat_test.py @@ -4,7 +4,7 @@ import unittest from extensions.front.tf.concat import Concat -from mo.utils.unittest.graph import build_graph_with_edge_attrs +from unit_tests.utils.graph import build_graph_with_edge_attrs class TestConcatEdgesReshuffler(unittest.TestCase): diff --git a/model-optimizer/extensions/front/tf/conv_ext_test.py b/model-optimizer/unit_tests/extensions/front/tf/conv_ext_test.py similarity index 98% rename from model-optimizer/extensions/front/tf/conv_ext_test.py rename to model-optimizer/unit_tests/extensions/front/tf/conv_ext_test.py index 230bef5dc67..aa880e27ff7 100644 --- a/model-optimizer/extensions/front/tf/conv_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/conv_ext_test.py @@ -4,7 +4,7 @@ import numpy as np from extensions.front.tf.conv_ext import Conv2DFrontExtractor, DepthwiseConv2dNativeFrontExtractor -from mo.utils.unittest.extractors import PB, BaseExtractorsTestingClass +from unit_tests.utils.extractors import PB, BaseExtractorsTestingClass class ConvExtractorTest(BaseExtractorsTestingClass): diff --git a/model-optimizer/extensions/front/tf/deconv_ext_test.py b/model-optimizer/unit_tests/extensions/front/tf/deconv_ext_test.py similarity index 97% rename from model-optimizer/extensions/front/tf/deconv_ext_test.py rename to model-optimizer/unit_tests/extensions/front/tf/deconv_ext_test.py index 8b97f0b3f97..8099bc7361e 100644 --- a/model-optimizer/extensions/front/tf/deconv_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/deconv_ext_test.py @@ -4,7 +4,7 @@ import numpy as np from extensions.front.tf.deconv_ext import Conv2DBackpropInputFrontExtractor -from mo.utils.unittest.extractors import PB, BaseExtractorsTestingClass +from unit_tests.utils.extractors import PB, BaseExtractorsTestingClass class DeconvolutionExtractorTest(BaseExtractorsTestingClass): diff --git a/model-optimizer/extensions/front/tf/embedding_segments_sum_test.py b/model-optimizer/unit_tests/extensions/front/tf/embedding_segments_sum_test.py similarity index 99% rename from model-optimizer/extensions/front/tf/embedding_segments_sum_test.py rename to model-optimizer/unit_tests/extensions/front/tf/embedding_segments_sum_test.py index 1b41e033dc2..8e02480942e 100644 --- a/model-optimizer/extensions/front/tf/embedding_segments_sum_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/embedding_segments_sum_test.py @@ -6,7 +6,7 @@ import unittest from extensions.front.tf.embedding_segments_sum import EmbeddingSegmentsSumFrontReplacer, EmbeddingSegmentsSumFrontReplacer2 from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, const +from unit_tests.utils.graph import build_graph, const class EmbeddingSegmentsSumFrontReplacerFrontReplacersTest(unittest.TestCase): diff --git a/model-optimizer/extensions/front/tf/fifo_replacer_test.py b/model-optimizer/unit_tests/extensions/front/tf/fifo_replacer_test.py similarity index 98% rename from model-optimizer/extensions/front/tf/fifo_replacer_test.py rename to model-optimizer/unit_tests/extensions/front/tf/fifo_replacer_test.py index d3b639f1541..23d4c9956da 100644 --- a/model-optimizer/extensions/front/tf/fifo_replacer_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/fifo_replacer_test.py @@ -6,7 +6,7 @@ import unittest import numpy as np from extensions.front.tf.fifo_replacer import FIFOQueue -from mo.utils.unittest.graph import build_graph_with_edge_attrs +from unit_tests.utils.graph import build_graph_with_edge_attrs class TestFIFOQueueReplacement(unittest.TestCase): diff --git a/model-optimizer/extensions/front/tf/floor_div_test.py b/model-optimizer/unit_tests/extensions/front/tf/floor_div_test.py similarity index 97% rename from model-optimizer/extensions/front/tf/floor_div_test.py rename to model-optimizer/unit_tests/extensions/front/tf/floor_div_test.py index 57a48d4c194..49b8673ec3f 100644 --- a/model-optimizer/extensions/front/tf/floor_div_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/floor_div_test.py @@ -5,7 +5,7 @@ import unittest from extensions.front.tf.floor_div_decomposition import FloorDivDecomposition from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, result, connect, \ +from unit_tests.utils.graph import build_graph, result, connect, \ connect_data, regular_op_with_empty_data nodes = { diff --git a/model-optimizer/extensions/front/tf/identityN_to_identity_test.py b/model-optimizer/unit_tests/extensions/front/tf/identityN_to_identity_test.py similarity index 97% rename from model-optimizer/extensions/front/tf/identityN_to_identity_test.py rename to model-optimizer/unit_tests/extensions/front/tf/identityN_to_identity_test.py index f05fbf46ac3..b6f39f52fd2 100644 --- a/model-optimizer/extensions/front/tf/identityN_to_identity_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/identityN_to_identity_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.front.tf.identityN_to_identity import IdentityN_to_Identity from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import result, regular_op_with_shaped_data, \ +from unit_tests.utils.graph import result, regular_op_with_shaped_data, \ regular_op_with_empty_data, build_graph, connect, empty_data nodes = { diff --git a/model-optimizer/extensions/front/tf/mvn_unrolled_test.py b/model-optimizer/unit_tests/extensions/front/tf/mvn_unrolled_test.py similarity index 98% rename from model-optimizer/extensions/front/tf/mvn_unrolled_test.py rename to model-optimizer/unit_tests/extensions/front/tf/mvn_unrolled_test.py index 28df8ae474e..76740795979 100644 --- a/model-optimizer/extensions/front/tf/mvn_unrolled_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/mvn_unrolled_test.py @@ -7,7 +7,7 @@ from extensions.front.tf.mvn_unrolled import MVNUnrolled from extensions.ops.mvn import MVN from mo.ops.op import Op from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph_with_attrs +from unit_tests.utils.graph import build_graph_with_attrs class MVNUnrolledMatchingTests(unittest.TestCase): diff --git a/model-optimizer/extensions/front/tf/next_iteration_ext_test.py b/model-optimizer/unit_tests/extensions/front/tf/next_iteration_ext_test.py similarity index 86% rename from model-optimizer/extensions/front/tf/next_iteration_ext_test.py rename to model-optimizer/unit_tests/extensions/front/tf/next_iteration_ext_test.py index eaf5f06c52c..b2884865574 100644 --- a/model-optimizer/extensions/front/tf/next_iteration_ext_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/next_iteration_ext_test.py @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 from extensions.front.tf.next_iteration_ext import NextIterationExtractor -from mo.utils.unittest.extractors import PB, BaseExtractorsTestingClass +from unit_tests.utils.extractors import PB, BaseExtractorsTestingClass class TestNextIteration(BaseExtractorsTestingClass): diff --git a/model-optimizer/extensions/front/tf/pad_tf_to_pad_test.py b/model-optimizer/unit_tests/extensions/front/tf/pad_tf_to_pad_test.py similarity index 99% rename from model-optimizer/extensions/front/tf/pad_tf_to_pad_test.py rename to model-optimizer/unit_tests/extensions/front/tf/pad_tf_to_pad_test.py index ea017d17e9a..ed63d797f60 100644 --- a/model-optimizer/extensions/front/tf/pad_tf_to_pad_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/pad_tf_to_pad_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.front.tf.pad_tf_to_pad import PadTFToPad from mo.front.common.partial_infer.utils import int64_array, float_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, const +from unit_tests.utils.graph import build_graph, const nodes_attributes = { 'placeholder': {'shape': None, 'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/extensions/front/tf/size_replacer_test.py b/model-optimizer/unit_tests/extensions/front/tf/size_replacer_test.py similarity index 95% rename from model-optimizer/extensions/front/tf/size_replacer_test.py rename to model-optimizer/unit_tests/extensions/front/tf/size_replacer_test.py index 446bc20f1e9..c6f075b7084 100644 --- a/model-optimizer/extensions/front/tf/size_replacer_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/size_replacer_test.py @@ -9,7 +9,7 @@ from generator import generator, generate from extensions.front.tf.SizeReplacer import SizeFrontReplacer from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, regular_op_with_empty_data, result, connect, \ +from unit_tests.utils.graph import build_graph, regular_op_with_empty_data, result, connect, \ valued_const_with_data nodes = lambda output_type: { diff --git a/model-optimizer/extensions/front/tf/sparse_to_dense_replacer_test.py b/model-optimizer/unit_tests/extensions/front/tf/sparse_to_dense_replacer_test.py similarity index 96% rename from model-optimizer/extensions/front/tf/sparse_to_dense_replacer_test.py rename to model-optimizer/unit_tests/extensions/front/tf/sparse_to_dense_replacer_test.py index b1ac8426c7f..4e624dfd069 100644 --- a/model-optimizer/extensions/front/tf/sparse_to_dense_replacer_test.py +++ b/model-optimizer/unit_tests/extensions/front/tf/sparse_to_dense_replacer_test.py @@ -6,8 +6,7 @@ import unittest from extensions.front.tf.sparse_to_dense_replacer import SparseToDenseReplacer from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph -from mo.utils.unittest.graph import build_graph, const +from unit_tests.utils.graph import build_graph, const class SparseToDenseFrontReplacersTest(unittest.TestCase): diff --git a/model-optimizer/extensions/middle/AddIsCyclicAttribute_test.py b/model-optimizer/unit_tests/extensions/middle/AddIsCyclicAttribute_test.py similarity index 95% rename from model-optimizer/extensions/middle/AddIsCyclicAttribute_test.py rename to model-optimizer/unit_tests/extensions/middle/AddIsCyclicAttribute_test.py index 865ed9e5841..9f5162f43aa 100644 --- a/model-optimizer/extensions/middle/AddIsCyclicAttribute_test.py +++ b/model-optimizer/unit_tests/extensions/middle/AddIsCyclicAttribute_test.py @@ -4,7 +4,7 @@ import unittest from extensions.middle.AddIsCyclicAttribute import AddIsCyclicAttribute -from mo.utils.unittest.graph import build_graph_with_attrs +from unit_tests.utils.graph import build_graph_with_attrs class AddIsCyclicAttributeTest(unittest.TestCase): diff --git a/model-optimizer/extensions/middle/AddMeanScaleValues_test.py b/model-optimizer/unit_tests/extensions/middle/AddMeanScaleValues_test.py similarity index 99% rename from model-optimizer/extensions/middle/AddMeanScaleValues_test.py rename to model-optimizer/unit_tests/extensions/middle/AddMeanScaleValues_test.py index a73f55e1074..440e8798020 100644 --- a/model-optimizer/extensions/middle/AddMeanScaleValues_test.py +++ b/model-optimizer/unit_tests/extensions/middle/AddMeanScaleValues_test.py @@ -11,7 +11,7 @@ from extensions.middle.ScaleInput import ScaleInput from mo.graph.graph import Graph, Node from mo.utils.cli_parser import get_mean_scale_dictionary, parse_tuple_pairs from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, regular_op_with_shaped_data, result, connect, connect_data, \ +from unit_tests.utils.graph import build_graph, regular_op_with_shaped_data, result, connect, connect_data, \ valued_const_with_data nodes = { diff --git a/model-optimizer/extensions/middle/CheckForCycle_test.py b/model-optimizer/unit_tests/extensions/middle/CheckForCycle_test.py similarity index 98% rename from model-optimizer/extensions/middle/CheckForCycle_test.py rename to model-optimizer/unit_tests/extensions/middle/CheckForCycle_test.py index d9c2e2a043e..8e1f1b4f702 100644 --- a/model-optimizer/extensions/middle/CheckForCycle_test.py +++ b/model-optimizer/unit_tests/extensions/middle/CheckForCycle_test.py @@ -5,7 +5,7 @@ import unittest from extensions.middle.CheckForCycle import CheckForCycle from mo.utils.error import Error -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'type': 'Identity', 'value': None, 'kind': 'op'}, 'node_1_data': {'value': None, 'kind': 'data', 'data_type': None}, diff --git a/model-optimizer/extensions/middle/ConcatOptimization_test.py b/model-optimizer/unit_tests/extensions/middle/ConcatOptimization_test.py similarity index 98% rename from model-optimizer/extensions/middle/ConcatOptimization_test.py rename to model-optimizer/unit_tests/extensions/middle/ConcatOptimization_test.py index b2211c5fb03..341dde05045 100644 --- a/model-optimizer/extensions/middle/ConcatOptimization_test.py +++ b/model-optimizer/unit_tests/extensions/middle/ConcatOptimization_test.py @@ -6,7 +6,7 @@ import unittest from extensions.middle.ConcatOptimization import ConcatOdInputEraserAndPortsReconnect from mo.graph.graph import Node from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, result, regular_op_with_shaped_data, shaped_const_with_data, connect +from unit_tests.utils.graph import build_graph, result, regular_op_with_shaped_data, shaped_const_with_data, connect class ConcatOdInputEraserAndPortsReconnectTest(unittest.TestCase): diff --git a/model-optimizer/extensions/middle/ConvertGroupedStridedSlice_test.py b/model-optimizer/unit_tests/extensions/middle/ConvertGroupedStridedSlice_test.py similarity index 99% rename from model-optimizer/extensions/middle/ConvertGroupedStridedSlice_test.py rename to model-optimizer/unit_tests/extensions/middle/ConvertGroupedStridedSlice_test.py index 0b36ff77839..32fe29884b0 100644 --- a/model-optimizer/extensions/middle/ConvertGroupedStridedSlice_test.py +++ b/model-optimizer/unit_tests/extensions/middle/ConvertGroupedStridedSlice_test.py @@ -10,7 +10,7 @@ from extensions.middle.ConvertGroupedStridedSlice import ConvertGroupedStridedSl from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'placeholder_1': {'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/extensions/middle/CutInputHavingZeroDimFromConcat_test.py b/model-optimizer/unit_tests/extensions/middle/CutInputHavingZeroDimFromConcat_test.py similarity index 99% rename from model-optimizer/extensions/middle/CutInputHavingZeroDimFromConcat_test.py rename to model-optimizer/unit_tests/extensions/middle/CutInputHavingZeroDimFromConcat_test.py index ea008ff61a6..639ae74cbf5 100644 --- a/model-optimizer/extensions/middle/CutInputHavingZeroDimFromConcat_test.py +++ b/model-optimizer/unit_tests/extensions/middle/CutInputHavingZeroDimFromConcat_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.middle.CutInputHavingZeroDimFromConcat import CutInputHavingZeroDimFromConcat from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph node_attrs_for_the_case_when_there_are_no_zero_shape_constants = { 'const0': { diff --git a/model-optimizer/extensions/middle/EltwiseInputReshape_test.py b/model-optimizer/unit_tests/extensions/middle/EltwiseInputReshape_test.py similarity index 99% rename from model-optimizer/extensions/middle/EltwiseInputReshape_test.py rename to model-optimizer/unit_tests/extensions/middle/EltwiseInputReshape_test.py index 9f451a43247..db5d7607fc8 100644 --- a/model-optimizer/extensions/middle/EltwiseInputReshape_test.py +++ b/model-optimizer/unit_tests/extensions/middle/EltwiseInputReshape_test.py @@ -7,8 +7,8 @@ import numpy as np from extensions.middle.EltwiseInputReshape import normalize_eltwise_inputs from mo.front.common.partial_infer.utils import int64_array -from mo.middle.passes.eliminate_test import build_graph from mo.utils.ir_engine.compare_graphs import compare_graphs +from unit_tests.utils.graph import build_graph # The dictionary with nodes attributes used to build various graphs. A key is the name of the node and the value is the # dictionary with node attributes. diff --git a/model-optimizer/extensions/middle/FakeSplitOutputs_test.py b/model-optimizer/unit_tests/extensions/middle/FakeSplitOutputs_test.py similarity index 98% rename from model-optimizer/extensions/middle/FakeSplitOutputs_test.py rename to model-optimizer/unit_tests/extensions/middle/FakeSplitOutputs_test.py index 2c2e4e58ce2..2ce3b6e729d 100644 --- a/model-optimizer/extensions/middle/FakeSplitOutputs_test.py +++ b/model-optimizer/unit_tests/extensions/middle/FakeSplitOutputs_test.py @@ -9,7 +9,7 @@ from extensions.middle.FakeSplitOutputs import AddFakeOutputsToSplit, AddFakeOut from mo.front.common.partial_infer.elemental import copy_shape_infer from mo.graph.graph import Node from mo.middle.passes.eliminate import graph_clean_up -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'placeholder_1': {'type': 'Parameter', 'kind': 'op', 'op': 'Parameter', 'shape': np.array([1, 227, 227, 3])}, diff --git a/model-optimizer/extensions/middle/FusedBatchNormTraining_test.py b/model-optimizer/unit_tests/extensions/middle/FusedBatchNormTraining_test.py similarity index 99% rename from model-optimizer/extensions/middle/FusedBatchNormTraining_test.py rename to model-optimizer/unit_tests/extensions/middle/FusedBatchNormTraining_test.py index 23c56554eef..d7a4c4a3e39 100644 --- a/model-optimizer/extensions/middle/FusedBatchNormTraining_test.py +++ b/model-optimizer/unit_tests/extensions/middle/FusedBatchNormTraining_test.py @@ -9,8 +9,8 @@ from generator import generator, generate from extensions.middle.FusedBatchNormTraining import FusedBatchNormTraining from mo.front.common.partial_infer.utils import int64_array from mo.middle.passes.eliminate import shape_inference -from mo.middle.passes.eliminate_test import build_graph from mo.utils.ir_engine.compare_graphs import compare_graphs +from unit_tests.utils.graph import build_graph nodes_attributes = { 'placeholder': {'value': None, 'shape': int64_array([3, 10, 11, 5]), 'type': 'Parameter', 'kind': 'op', diff --git a/model-optimizer/extensions/middle/GroupNorm_test.py b/model-optimizer/unit_tests/extensions/middle/GroupNorm_test.py similarity index 97% rename from model-optimizer/extensions/middle/GroupNorm_test.py rename to model-optimizer/unit_tests/extensions/middle/GroupNorm_test.py index 00e3fd2ded9..38d84d83e67 100644 --- a/model-optimizer/extensions/middle/GroupNorm_test.py +++ b/model-optimizer/unit_tests/extensions/middle/GroupNorm_test.py @@ -6,8 +6,8 @@ import unittest from extensions.middle.GroupNorm import GroupNormToMVN from mo.front.common.partial_infer.utils import float_array, int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, result, build_graph_with_edge_attrs, connect, \ - regular_op_with_shaped_data, valued_const_with_data, connect_data +from unit_tests.utils.graph import build_graph, result, connect, \ + regular_op_with_shaped_data, valued_const_with_data shape = int64_array([1, 3, 5, 2]) nodes = {**regular_op_with_shaped_data('input', shape, {'type': 'Parameter', 'op': 'Parameter'}), diff --git a/model-optimizer/extensions/middle/InsertSelect_test.py b/model-optimizer/unit_tests/extensions/middle/InsertSelect_test.py similarity index 99% rename from model-optimizer/extensions/middle/InsertSelect_test.py rename to model-optimizer/unit_tests/extensions/middle/InsertSelect_test.py index db783576de9..03efaf262b5 100644 --- a/model-optimizer/extensions/middle/InsertSelect_test.py +++ b/model-optimizer/unit_tests/extensions/middle/InsertSelect_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.middle.InsertSelect import AddSelectBeforeMemoryNodePattern from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class InsertSelectTests(unittest.TestCase): diff --git a/model-optimizer/extensions/middle/InterpolateSequenceToInterpolate_test.py b/model-optimizer/unit_tests/extensions/middle/InterpolateSequenceToInterpolate_test.py similarity index 99% rename from model-optimizer/extensions/middle/InterpolateSequenceToInterpolate_test.py rename to model-optimizer/unit_tests/extensions/middle/InterpolateSequenceToInterpolate_test.py index e9f95811485..aa3002122c2 100644 --- a/model-optimizer/extensions/middle/InterpolateSequenceToInterpolate_test.py +++ b/model-optimizer/unit_tests/extensions/middle/InterpolateSequenceToInterpolate_test.py @@ -7,7 +7,7 @@ import unittest from extensions.middle.InterpolateSequenceToInterpolate import InterpolateSequenceToInterpolate from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph graph_node_attrs_for_2d_case_1_opset4_case = { 'placeholder': {'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/extensions/middle/L2NormFusing_test.py b/model-optimizer/unit_tests/extensions/middle/L2NormFusing_test.py similarity index 99% rename from model-optimizer/extensions/middle/L2NormFusing_test.py rename to model-optimizer/unit_tests/extensions/middle/L2NormFusing_test.py index 82395c818b6..bfd96dd42d9 100644 --- a/model-optimizer/extensions/middle/L2NormFusing_test.py +++ b/model-optimizer/unit_tests/extensions/middle/L2NormFusing_test.py @@ -9,7 +9,7 @@ from generator import generator, generate from extensions.middle.L2NormFusing import L2NormToNorm from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph_with_attrs +from unit_tests.utils.graph import build_graph_with_attrs # A list with nodes attributes used to build various graphs. nodes = [ diff --git a/model-optimizer/extensions/middle/LeakyReluPattern_test.py b/model-optimizer/unit_tests/extensions/middle/LeakyReluPattern_test.py similarity index 97% rename from model-optimizer/extensions/middle/LeakyReluPattern_test.py rename to model-optimizer/unit_tests/extensions/middle/LeakyReluPattern_test.py index 50ce990b56e..9c88a29da8d 100644 --- a/model-optimizer/extensions/middle/LeakyReluPattern_test.py +++ b/model-optimizer/unit_tests/extensions/middle/LeakyReluPattern_test.py @@ -8,7 +8,7 @@ from mo.front.common.partial_infer.utils import float_array, int64_array from mo.graph.graph import Node from mo.ops.result import Result from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, result, build_graph_with_edge_attrs, connect, \ +from unit_tests.utils.graph import build_graph, result, build_graph_with_edge_attrs, connect, \ regular_op_with_shaped_data, valued_const_with_data, connect_data shape = int64_array([1, 3, 5, 2]) diff --git a/model-optimizer/extensions/middle/MXTileReplacer_test.py b/model-optimizer/unit_tests/extensions/middle/MXTileReplacer_test.py similarity index 98% rename from model-optimizer/extensions/middle/MXTileReplacer_test.py rename to model-optimizer/unit_tests/extensions/middle/MXTileReplacer_test.py index b4f6b470928..98d55e33aaa 100644 --- a/model-optimizer/extensions/middle/MXTileReplacer_test.py +++ b/model-optimizer/unit_tests/extensions/middle/MXTileReplacer_test.py @@ -6,7 +6,7 @@ import unittest from extensions.middle.MXTileReplacer import MXTileReplacer from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'placeholder': {'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/extensions/middle/MakeKaldiConstReshapable_test.py b/model-optimizer/unit_tests/extensions/middle/MakeKaldiConstReshapable_test.py similarity index 98% rename from model-optimizer/extensions/middle/MakeKaldiConstReshapable_test.py rename to model-optimizer/unit_tests/extensions/middle/MakeKaldiConstReshapable_test.py index db038982932..73eafab8c03 100644 --- a/model-optimizer/extensions/middle/MakeKaldiConstReshapable_test.py +++ b/model-optimizer/unit_tests/extensions/middle/MakeKaldiConstReshapable_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.middle.MakeKaldiConstReshapable import MakeKaldiConstReshapable from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, result, regular_op_with_shaped_data, connect +from unit_tests.utils.graph import build_graph, result, regular_op_with_shaped_data, connect nodes = { **regular_op_with_shaped_data('placeholder_1', [1, 13], {'kind': 'op', 'op': 'Parameter', 'shape': [1, 13]}), diff --git a/model-optimizer/extensions/middle/MulQuantizeFuse_test.py b/model-optimizer/unit_tests/extensions/middle/MulQuantizeFuse_test.py similarity index 99% rename from model-optimizer/extensions/middle/MulQuantizeFuse_test.py rename to model-optimizer/unit_tests/extensions/middle/MulQuantizeFuse_test.py index 49503987caa..34b3fccf810 100644 --- a/model-optimizer/extensions/middle/MulQuantizeFuse_test.py +++ b/model-optimizer/unit_tests/extensions/middle/MulQuantizeFuse_test.py @@ -6,8 +6,8 @@ import unittest import numpy as np from extensions.middle.MulFakeQuantizeFuse import MulFakeQuantizeFuse -from mo.middle.passes.eliminate_test import build_graph from mo.utils.ir_engine.compare_graphs import compare_graphs +from unit_tests.utils.graph import build_graph # The dictionary with nodes attributes used to build various graphs. A key is the name of the node and the value is the # dictionary with node attributes. diff --git a/model-optimizer/extensions/middle/PoolV2ToAttributedPool_test.py b/model-optimizer/unit_tests/extensions/middle/PoolV2ToAttributedPool_test.py similarity index 95% rename from model-optimizer/extensions/middle/PoolV2ToAttributedPool_test.py rename to model-optimizer/unit_tests/extensions/middle/PoolV2ToAttributedPool_test.py index 2a239fe9b39..2dc7b7a594b 100644 --- a/model-optimizer/extensions/middle/PoolV2ToAttributedPool_test.py +++ b/model-optimizer/unit_tests/extensions/middle/PoolV2ToAttributedPool_test.py @@ -6,7 +6,7 @@ import unittest from extensions.middle.PoolV2ToAttributedPool import PoolV2ToAttributedPool from mo.utils.ir_engine.compare_graphs import compare_graphs from mo.utils.shape import int64_array -from mo.utils.unittest.graph import build_graph, valued_const_with_data, regular_op_with_empty_data, \ +from unit_tests.utils.graph import build_graph, valued_const_with_data, regular_op_with_empty_data, \ connect, shaped_const_with_data, result diff --git a/model-optimizer/extensions/middle/ReluQuantizeFuse_test.py b/model-optimizer/unit_tests/extensions/middle/ReluQuantizeFuse_test.py similarity index 99% rename from model-optimizer/extensions/middle/ReluQuantizeFuse_test.py rename to model-optimizer/unit_tests/extensions/middle/ReluQuantizeFuse_test.py index c12ceb592fd..5972070bead 100644 --- a/model-optimizer/extensions/middle/ReluQuantizeFuse_test.py +++ b/model-optimizer/unit_tests/extensions/middle/ReluQuantizeFuse_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.middle.ReluQuantizeFuse import ReluQuantizeFuse, ReluFakeQuantizeMark from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes = { # input diff --git a/model-optimizer/extensions/middle/RemoveDuplicationMemory_test.py b/model-optimizer/unit_tests/extensions/middle/RemoveDuplicationMemory_test.py similarity index 99% rename from model-optimizer/extensions/middle/RemoveDuplicationMemory_test.py rename to model-optimizer/unit_tests/extensions/middle/RemoveDuplicationMemory_test.py index a18ea20f40f..7fe4ff166b7 100644 --- a/model-optimizer/extensions/middle/RemoveDuplicationMemory_test.py +++ b/model-optimizer/unit_tests/extensions/middle/RemoveDuplicationMemory_test.py @@ -5,7 +5,7 @@ import unittest from extensions.middle.RemoveDuplicationMemory import RemoveMemoryDuplicationPattern, MergeNeighborSplicePattern from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class RemoveMemoryDuplicationPatternTests(unittest.TestCase): diff --git a/model-optimizer/extensions/middle/RemoveUselessConcatSplit_test.py b/model-optimizer/unit_tests/extensions/middle/RemoveUselessConcatSplit_test.py similarity index 99% rename from model-optimizer/extensions/middle/RemoveUselessConcatSplit_test.py rename to model-optimizer/unit_tests/extensions/middle/RemoveUselessConcatSplit_test.py index d3ebd71ef43..4ec3516310e 100644 --- a/model-optimizer/extensions/middle/RemoveUselessConcatSplit_test.py +++ b/model-optimizer/unit_tests/extensions/middle/RemoveUselessConcatSplit_test.py @@ -6,7 +6,7 @@ import unittest from extensions.middle.RemoveUselessConcatSplit import RemoveUselessConcatSplitPattern from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class RemoveUselessConcatSplitTests(unittest.TestCase): diff --git a/model-optimizer/extensions/middle/RemoveUselessCrops_test.py b/model-optimizer/unit_tests/extensions/middle/RemoveUselessCrops_test.py similarity index 99% rename from model-optimizer/extensions/middle/RemoveUselessCrops_test.py rename to model-optimizer/unit_tests/extensions/middle/RemoveUselessCrops_test.py index e629154285a..e51dab87b56 100644 --- a/model-optimizer/extensions/middle/RemoveUselessCrops_test.py +++ b/model-optimizer/unit_tests/extensions/middle/RemoveUselessCrops_test.py @@ -5,7 +5,7 @@ import unittest from extensions.middle.RemoveUselessCrops import RemoveUselessCropsPattern from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class RemoveUselessCropsPatternTests(unittest.TestCase): diff --git a/model-optimizer/extensions/middle/RemoveUselessPad_test.py b/model-optimizer/unit_tests/extensions/middle/RemoveUselessPad_test.py similarity index 96% rename from model-optimizer/extensions/middle/RemoveUselessPad_test.py rename to model-optimizer/unit_tests/extensions/middle/RemoveUselessPad_test.py index 53059492f00..42af9272603 100644 --- a/model-optimizer/extensions/middle/RemoveUselessPad_test.py +++ b/model-optimizer/unit_tests/extensions/middle/RemoveUselessPad_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.middle.RemoveUselessPad import RemoveUselessPad from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, regular_op_with_shaped_data, valued_const_with_data, result, connect, \ +from unit_tests.utils.graph import build_graph, regular_op_with_shaped_data, valued_const_with_data, result, connect, \ connect_data diff --git a/model-optimizer/extensions/middle/ReplaceMemoryOffsetWithSplice_test.py b/model-optimizer/unit_tests/extensions/middle/ReplaceMemoryOffsetWithSplice_test.py similarity index 99% rename from model-optimizer/extensions/middle/ReplaceMemoryOffsetWithSplice_test.py rename to model-optimizer/unit_tests/extensions/middle/ReplaceMemoryOffsetWithSplice_test.py index 81c9223a9f6..aa62e185fff 100644 --- a/model-optimizer/extensions/middle/ReplaceMemoryOffsetWithSplice_test.py +++ b/model-optimizer/unit_tests/extensions/middle/ReplaceMemoryOffsetWithSplice_test.py @@ -6,7 +6,7 @@ import unittest from extensions.middle.ReplaceMemoryOffsetWithSplice import ReplaceMemoryOffsetNodePattern from mo.graph.graph import Node from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class ReplaceMemoryOffsetNodePatternTests(unittest.TestCase): diff --git a/model-optimizer/extensions/middle/ReplacePNormNodePattern_test.py b/model-optimizer/unit_tests/extensions/middle/ReplacePNormNodePattern_test.py similarity index 98% rename from model-optimizer/extensions/middle/ReplacePNormNodePattern_test.py rename to model-optimizer/unit_tests/extensions/middle/ReplacePNormNodePattern_test.py index c26f65265ea..6fcd529db77 100644 --- a/model-optimizer/extensions/middle/ReplacePNormNodePattern_test.py +++ b/model-optimizer/unit_tests/extensions/middle/ReplacePNormNodePattern_test.py @@ -5,7 +5,7 @@ import unittest from extensions.middle.ReplacePNorm import ReplacePNormNodePattern from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class ReplacePNormNodePatternTests(unittest.TestCase): diff --git a/model-optimizer/extensions/middle/ReplaceSpliceNodePattern_test.py b/model-optimizer/unit_tests/extensions/middle/ReplaceSpliceNodePattern_test.py similarity index 99% rename from model-optimizer/extensions/middle/ReplaceSpliceNodePattern_test.py rename to model-optimizer/unit_tests/extensions/middle/ReplaceSpliceNodePattern_test.py index ec5985196a4..ee0a5136932 100644 --- a/model-optimizer/extensions/middle/ReplaceSpliceNodePattern_test.py +++ b/model-optimizer/unit_tests/extensions/middle/ReplaceSpliceNodePattern_test.py @@ -7,7 +7,7 @@ from extensions.middle.ReplaceSpliceNodePattern import ReplaceSpliceNodePattern from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class ReplaceSpliceNodePatternTests(unittest.TestCase): diff --git a/model-optimizer/extensions/middle/SequenceLenthToMask_test.py b/model-optimizer/unit_tests/extensions/middle/SequenceLenthToMask_test.py similarity index 98% rename from model-optimizer/extensions/middle/SequenceLenthToMask_test.py rename to model-optimizer/unit_tests/extensions/middle/SequenceLenthToMask_test.py index 1f9b5698282..33ddeae4a12 100644 --- a/model-optimizer/extensions/middle/SequenceLenthToMask_test.py +++ b/model-optimizer/unit_tests/extensions/middle/SequenceLenthToMask_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.middle.SequenceLengthToMask import SequenceLengthToMask from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'logits': {'shape': int64_array([5, 3, 30]), 'type': 'Parameter', 'kind': 'op', diff --git a/model-optimizer/extensions/middle/SharedWeightsDuplication_test.py b/model-optimizer/unit_tests/extensions/middle/SharedWeightsDuplication_test.py similarity index 97% rename from model-optimizer/extensions/middle/SharedWeightsDuplication_test.py rename to model-optimizer/unit_tests/extensions/middle/SharedWeightsDuplication_test.py index 9c97f9f5eb3..dc3d9b96397 100644 --- a/model-optimizer/extensions/middle/SharedWeightsDuplication_test.py +++ b/model-optimizer/unit_tests/extensions/middle/SharedWeightsDuplication_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.middle.SharedWeightsDuplication import SharedWeightsDuplication from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'const': {'shape': None, 'type': 'Const', 'kind': 'op', 'op': 'Const'}, diff --git a/model-optimizer/extensions/middle/SliceConverter_test.py b/model-optimizer/unit_tests/extensions/middle/SliceConverter_test.py similarity index 99% rename from model-optimizer/extensions/middle/SliceConverter_test.py rename to model-optimizer/unit_tests/extensions/middle/SliceConverter_test.py index bfaeefa55cb..f0266d0c7d7 100644 --- a/model-optimizer/extensions/middle/SliceConverter_test.py +++ b/model-optimizer/unit_tests/extensions/middle/SliceConverter_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.middle.SliceConverter import ConvertSlice from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, regular_op_with_shaped_data, valued_const_with_data, \ +from unit_tests.utils.graph import build_graph, regular_op_with_shaped_data, valued_const_with_data, \ regular_op_with_empty_data, result, connect, connect_data nodes_attributes = { diff --git a/model-optimizer/extensions/middle/SliceLikeToStridedSlice_test.py b/model-optimizer/unit_tests/extensions/middle/SliceLikeToStridedSlice_test.py similarity index 99% rename from model-optimizer/extensions/middle/SliceLikeToStridedSlice_test.py rename to model-optimizer/unit_tests/extensions/middle/SliceLikeToStridedSlice_test.py index 855a3b741ad..391d9de58ba 100644 --- a/model-optimizer/extensions/middle/SliceLikeToStridedSlice_test.py +++ b/model-optimizer/unit_tests/extensions/middle/SliceLikeToStridedSlice_test.py @@ -6,7 +6,7 @@ import unittest from extensions.middle.SliceLikeToStridedSlice import SliceLikeToStridedSlice from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'input': {'kind': 'op', 'op': 'Const'}, diff --git a/model-optimizer/extensions/middle/SplitConcatPairToInterpolate_test.py b/model-optimizer/unit_tests/extensions/middle/SplitConcatPairToInterpolate_test.py similarity index 99% rename from model-optimizer/extensions/middle/SplitConcatPairToInterpolate_test.py rename to model-optimizer/unit_tests/extensions/middle/SplitConcatPairToInterpolate_test.py index f9358816cad..e7742941cb3 100644 --- a/model-optimizer/extensions/middle/SplitConcatPairToInterpolate_test.py +++ b/model-optimizer/unit_tests/extensions/middle/SplitConcatPairToInterpolate_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.middle.SplitConcatPairToInterpolate import SplitConcatPairToInterpolate from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph graph_node_attrs_for_2d_spatial_case = { 'placeholder': {'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/extensions/middle/StridedSliceNormalizer_test.py b/model-optimizer/unit_tests/extensions/middle/StridedSliceNormalizer_test.py similarity index 99% rename from model-optimizer/extensions/middle/StridedSliceNormalizer_test.py rename to model-optimizer/unit_tests/extensions/middle/StridedSliceNormalizer_test.py index 9cb8c6f6dcd..5216f37478f 100644 --- a/model-optimizer/extensions/middle/StridedSliceNormalizer_test.py +++ b/model-optimizer/unit_tests/extensions/middle/StridedSliceNormalizer_test.py @@ -15,7 +15,7 @@ from mo.graph.graph import Node from mo.middle.passes.infer import partial_infer from mo.ops.strided_slice import StridedSlice from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, valued_const_with_data, regular_op_with_empty_data, \ +from unit_tests.utils.graph import build_graph, valued_const_with_data, regular_op_with_empty_data, \ connect, regular_op, empty_data, regular_op_with_shaped_data edges = ( diff --git a/model-optimizer/extensions/middle/TensorIteratorBackEdge_test.py b/model-optimizer/unit_tests/extensions/middle/TensorIteratorBackEdge_test.py similarity index 98% rename from model-optimizer/extensions/middle/TensorIteratorBackEdge_test.py rename to model-optimizer/unit_tests/extensions/middle/TensorIteratorBackEdge_test.py index 370c819637f..d6aaf04721a 100644 --- a/model-optimizer/extensions/middle/TensorIteratorBackEdge_test.py +++ b/model-optimizer/unit_tests/extensions/middle/TensorIteratorBackEdge_test.py @@ -5,7 +5,7 @@ import unittest from extensions.middle.TensorIteratorBackEdge import BackEdgesMatching from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph_with_attrs +from unit_tests.utils.graph import build_graph_with_attrs class BackEdgesMatchingTests(unittest.TestCase): diff --git a/model-optimizer/extensions/middle/TensorIteratorCondition_test.py b/model-optimizer/unit_tests/extensions/middle/TensorIteratorCondition_test.py similarity index 98% rename from model-optimizer/extensions/middle/TensorIteratorCondition_test.py rename to model-optimizer/unit_tests/extensions/middle/TensorIteratorCondition_test.py index 6c4d27899fb..ac7183d641a 100644 --- a/model-optimizer/extensions/middle/TensorIteratorCondition_test.py +++ b/model-optimizer/unit_tests/extensions/middle/TensorIteratorCondition_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.middle.TensorIteratorCondition import LoopConditionMatcher from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph_with_attrs +from unit_tests.utils.graph import build_graph_with_attrs class TensorIteratorConditionTests(unittest.TestCase): diff --git a/model-optimizer/extensions/middle/TensorIteratorInput_test.py b/model-optimizer/unit_tests/extensions/middle/TensorIteratorInput_test.py similarity index 99% rename from model-optimizer/extensions/middle/TensorIteratorInput_test.py rename to model-optimizer/unit_tests/extensions/middle/TensorIteratorInput_test.py index 34e46734936..86e93217504 100644 --- a/model-optimizer/extensions/middle/TensorIteratorInput_test.py +++ b/model-optimizer/unit_tests/extensions/middle/TensorIteratorInput_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.middle.TensorIteratorInput import SmartInputMatcher, SimpleInputMatcher, BackEdgeSimpleInputMatcher from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph_with_attrs +from unit_tests.utils.graph import build_graph_with_attrs class SmartInputMatcherTests(unittest.TestCase): diff --git a/model-optimizer/extensions/middle/TensorIteratorOutput_test.py b/model-optimizer/unit_tests/extensions/middle/TensorIteratorOutput_test.py similarity index 96% rename from model-optimizer/extensions/middle/TensorIteratorOutput_test.py rename to model-optimizer/unit_tests/extensions/middle/TensorIteratorOutput_test.py index 10792c775ae..9ab550e2d45 100644 --- a/model-optimizer/extensions/middle/TensorIteratorOutput_test.py +++ b/model-optimizer/unit_tests/extensions/middle/TensorIteratorOutput_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.middle.TensorIteratorOutput import SmartOutputMatcher from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph_with_attrs +from unit_tests.utils.graph import build_graph_with_attrs class SmartOutputMatcherTests(unittest.TestCase): diff --git a/model-optimizer/extensions/middle/UnsqueezeTileReshapeBlockToInterpolate_test.py b/model-optimizer/unit_tests/extensions/middle/UnsqueezeTileReshapeBlockToInterpolate_test.py similarity index 99% rename from model-optimizer/extensions/middle/UnsqueezeTileReshapeBlockToInterpolate_test.py rename to model-optimizer/unit_tests/extensions/middle/UnsqueezeTileReshapeBlockToInterpolate_test.py index 69f9a15ef7f..f6fdf932186 100644 --- a/model-optimizer/extensions/middle/UnsqueezeTileReshapeBlockToInterpolate_test.py +++ b/model-optimizer/unit_tests/extensions/middle/UnsqueezeTileReshapeBlockToInterpolate_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.middle.UnsqueezeTileReshapeBlockToInterpolate import UnsqueezeTileReshapeBlockToInterpolate from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph graph_node_attrs = { 'placeholder': {'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/extensions/middle/UpsampleToResample_test.py b/model-optimizer/unit_tests/extensions/middle/UpsampleToResample_test.py similarity index 99% rename from model-optimizer/extensions/middle/UpsampleToResample_test.py rename to model-optimizer/unit_tests/extensions/middle/UpsampleToResample_test.py index 4b27f954225..d75ced8168f 100644 --- a/model-optimizer/extensions/middle/UpsampleToResample_test.py +++ b/model-optimizer/unit_tests/extensions/middle/UpsampleToResample_test.py @@ -9,7 +9,7 @@ from generator import generator, generate from extensions.middle.UpsampleToResample import UpsampleToResample from mo.front.common.partial_infer.utils import int64_array, float32_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph graph_node_attrs = { 'placeholder': {'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/unit_tests/extensions/middle/__init__.py b/model-optimizer/unit_tests/extensions/middle/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/extensions/middle/quantize_fuses_test.py b/model-optimizer/unit_tests/extensions/middle/quantize_fuses_test.py similarity index 99% rename from model-optimizer/extensions/middle/quantize_fuses_test.py rename to model-optimizer/unit_tests/extensions/middle/quantize_fuses_test.py index ec7da4b0802..3605cba6fa2 100644 --- a/model-optimizer/extensions/middle/quantize_fuses_test.py +++ b/model-optimizer/unit_tests/extensions/middle/quantize_fuses_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.middle.quantize_fuses import FakeQuantizeFuse from mo.front.common.partial_infer.eltwise import eltwise_infer from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes = { 'placeholder': {'kind': 'op', 'op': 'Placeholder'}, diff --git a/model-optimizer/extensions/middle/sparse_reshape_test.py b/model-optimizer/unit_tests/extensions/middle/sparse_reshape_test.py similarity index 99% rename from model-optimizer/extensions/middle/sparse_reshape_test.py rename to model-optimizer/unit_tests/extensions/middle/sparse_reshape_test.py index fbccf744d56..f1c5f443a89 100644 --- a/model-optimizer/extensions/middle/sparse_reshape_test.py +++ b/model-optimizer/unit_tests/extensions/middle/sparse_reshape_test.py @@ -6,7 +6,7 @@ import unittest from extensions.middle.sparse_reshape import SparseReshapeMiddleReplacer from mo.front.common.partial_infer.utils import int64_array from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class SparseReshapeMiddleReplacerTests(unittest.TestCase): diff --git a/model-optimizer/extensions/ops/ExtractImagePatches_test.py b/model-optimizer/unit_tests/extensions/ops/ExtractImagePatches_test.py similarity index 98% rename from model-optimizer/extensions/ops/ExtractImagePatches_test.py rename to model-optimizer/unit_tests/extensions/ops/ExtractImagePatches_test.py index 490cb82f8a0..12ffa2ed9a1 100644 --- a/model-optimizer/extensions/ops/ExtractImagePatches_test.py +++ b/model-optimizer/unit_tests/extensions/ops/ExtractImagePatches_test.py @@ -9,7 +9,7 @@ from generator import generator, generate from extensions.ops.ExtractImagePatches import ExtractImagePatches from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes = { 'input': {'op': 'Parameter', 'kind': 'op', 'shape': None}, diff --git a/model-optimizer/extensions/ops/LookupTableInsert_test.py b/model-optimizer/unit_tests/extensions/ops/LookupTableInsert_test.py similarity index 98% rename from model-optimizer/extensions/ops/LookupTableInsert_test.py rename to model-optimizer/unit_tests/extensions/ops/LookupTableInsert_test.py index 49f40a37564..598aed1c799 100644 --- a/model-optimizer/extensions/ops/LookupTableInsert_test.py +++ b/model-optimizer/unit_tests/extensions/ops/LookupTableInsert_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.LookupTableInsert import LookupTableInsert from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'table': {'kind': 'op'}, 'table_data': {'shape': None, 'value': None, 'kind': 'data'}, diff --git a/model-optimizer/extensions/ops/MatMul_test.py b/model-optimizer/unit_tests/extensions/ops/MatMul_test.py similarity index 98% rename from model-optimizer/extensions/ops/MatMul_test.py rename to model-optimizer/unit_tests/extensions/ops/MatMul_test.py index 9424a26489c..1706880eaf1 100644 --- a/model-optimizer/extensions/ops/MatMul_test.py +++ b/model-optimizer/unit_tests/extensions/ops/MatMul_test.py @@ -9,7 +9,7 @@ from generator import generator, generate from extensions.ops.MatMul import MatMul from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph_with_attrs +from unit_tests.utils.graph import build_graph_with_attrs @generator diff --git a/model-optimizer/extensions/ops/MatMul_value_propagation_test.py b/model-optimizer/unit_tests/extensions/ops/MatMul_value_propagation_test.py similarity index 98% rename from model-optimizer/extensions/ops/MatMul_value_propagation_test.py rename to model-optimizer/unit_tests/extensions/ops/MatMul_value_propagation_test.py index fe60eec84bc..2cbe836d4fd 100644 --- a/model-optimizer/extensions/ops/MatMul_value_propagation_test.py +++ b/model-optimizer/unit_tests/extensions/ops/MatMul_value_propagation_test.py @@ -9,7 +9,7 @@ from generator import generator, generate from extensions.ops.MatMul import MatMul, transpose from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph graph_nodes_attrs = { 'A': {'type': 'Const', 'op': 'Const', 'kind': 'op', 'shape': None, 'value': None}, diff --git a/model-optimizer/extensions/ops/ONNXResize11_test.py b/model-optimizer/unit_tests/extensions/ops/ONNXResize11_test.py similarity index 99% rename from model-optimizer/extensions/ops/ONNXResize11_test.py rename to model-optimizer/unit_tests/extensions/ops/ONNXResize11_test.py index c19ca15d4e7..b38773b8279 100644 --- a/model-optimizer/extensions/ops/ONNXResize11_test.py +++ b/model-optimizer/unit_tests/extensions/ops/ONNXResize11_test.py @@ -9,7 +9,7 @@ from generator import generator, generate from extensions.ops.ONNXResize11 import ONNXResize11Op from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph graph_node_attrs_sizes = { diff --git a/model-optimizer/extensions/ops/ReduceOps_test.py b/model-optimizer/unit_tests/extensions/ops/ReduceOps_test.py similarity index 95% rename from model-optimizer/extensions/ops/ReduceOps_test.py rename to model-optimizer/unit_tests/extensions/ops/ReduceOps_test.py index 9ca82cc9ccd..507b2cd584f 100644 --- a/model-optimizer/extensions/ops/ReduceOps_test.py +++ b/model-optimizer/unit_tests/extensions/ops/ReduceOps_test.py @@ -9,7 +9,7 @@ from generator import generate, generator from extensions.ops.ReduceOps import reduce_infer from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph, regular_op_with_shaped_data, result, connect, valued_const_with_data +from unit_tests.utils.graph import build_graph, regular_op_with_shaped_data, result, connect, valued_const_with_data nodes_attributes = { **regular_op_with_shaped_data('data', [1, 3, 224, 224], {'type': 'Parameter', 'value': None, diff --git a/model-optimizer/extensions/ops/Reverse_test.py b/model-optimizer/unit_tests/extensions/ops/Reverse_test.py similarity index 97% rename from model-optimizer/extensions/ops/Reverse_test.py rename to model-optimizer/unit_tests/extensions/ops/Reverse_test.py index 892885629d9..0d2364e483f 100644 --- a/model-optimizer/extensions/ops/Reverse_test.py +++ b/model-optimizer/unit_tests/extensions/ops/Reverse_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.Reverse import Reverse from mo.front.common.extractors.utils import layout_attrs from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'type': 'Identity', 'kind': 'op'}, 'node_1_data': {'type': 'Identity', 'kind': 'data', 'value': np.array([[1, 3, 227, 227]])}, diff --git a/model-optimizer/unit_tests/extensions/ops/__init__.py b/model-optimizer/unit_tests/extensions/ops/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/extensions/ops/accum_test.py b/model-optimizer/unit_tests/extensions/ops/accum_test.py similarity index 99% rename from model-optimizer/extensions/ops/accum_test.py rename to model-optimizer/unit_tests/extensions/ops/accum_test.py index c08f0615a71..6b573d7ec9f 100644 --- a/model-optimizer/extensions/ops/accum_test.py +++ b/model-optimizer/unit_tests/extensions/ops/accum_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.ops.accum import AccumOp from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph wrong_attrs_graph = {'node_1': {'type': 'Identity', 'kind': 'op'}, 'accum': {'type': 'Accum', 'kind': 'op'}, diff --git a/model-optimizer/extensions/ops/activation_test.py b/model-optimizer/unit_tests/extensions/ops/activation_test.py similarity index 98% rename from model-optimizer/extensions/ops/activation_test.py rename to model-optimizer/unit_tests/extensions/ops/activation_test.py index 49d59637ab6..2342df9173d 100644 --- a/model-optimizer/extensions/ops/activation_test.py +++ b/model-optimizer/unit_tests/extensions/ops/activation_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.ops.activation_ops import Elu, SoftPlus, Mish from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestActivationOp(unittest.TestCase): diff --git a/model-optimizer/extensions/ops/argmax_test.py b/model-optimizer/unit_tests/extensions/ops/argmax_test.py similarity index 99% rename from model-optimizer/extensions/ops/argmax_test.py rename to model-optimizer/unit_tests/extensions/ops/argmax_test.py index e1f0d42ef08..13361760f01 100644 --- a/model-optimizer/extensions/ops/argmax_test.py +++ b/model-optimizer/unit_tests/extensions/ops/argmax_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.ops.argmax import ArgMaxOp from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'type': 'Identity', 'kind': 'op'}, 'argmax': {'op': 'ArgMax', 'kind': 'op'}, diff --git a/model-optimizer/extensions/ops/assert_test.py b/model-optimizer/unit_tests/extensions/ops/assert_test.py similarity index 96% rename from model-optimizer/extensions/ops/assert_test.py rename to model-optimizer/unit_tests/extensions/ops/assert_test.py index d786b7638e9..847ea5e3df7 100644 --- a/model-optimizer/extensions/ops/assert_test.py +++ b/model-optimizer/unit_tests/extensions/ops/assert_test.py @@ -6,7 +6,7 @@ from unittest.mock import Mock from extensions.ops.assert_op import Assert from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph_with_edge_attrs +from unit_tests.utils.graph import build_graph_with_edge_attrs class TestAssert(unittest.TestCase): diff --git a/model-optimizer/extensions/ops/bucketize_test.py b/model-optimizer/unit_tests/extensions/ops/bucketize_test.py similarity index 98% rename from model-optimizer/extensions/ops/bucketize_test.py rename to model-optimizer/unit_tests/extensions/ops/bucketize_test.py index 6334d362dd5..f4e9c9fcc39 100644 --- a/model-optimizer/extensions/ops/bucketize_test.py +++ b/model-optimizer/unit_tests/extensions/ops/bucketize_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.bucketize import Bucketize from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'input_tensor': {'shape': None, 'value': None, 'kind': 'data'}, 'input_buckets': {'shape': None, 'value': None, 'kind': 'data'}, diff --git a/model-optimizer/extensions/ops/cast_test.py b/model-optimizer/unit_tests/extensions/ops/cast_test.py similarity index 96% rename from model-optimizer/extensions/ops/cast_test.py rename to model-optimizer/unit_tests/extensions/ops/cast_test.py index dc0f6449c99..0fb025756de 100644 --- a/model-optimizer/extensions/ops/cast_test.py +++ b/model-optimizer/unit_tests/extensions/ops/cast_test.py @@ -1,16 +1,16 @@ # Copyright (C) 2018-2021 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -import numpy as np import unittest + +import numpy as np from generator import generator, generate from extensions.ops.Cast import Cast from mo.middle.passes.convert_data_type import packed_U4, packed_I4 from mo.middle.passes.infer import partial_infer from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import valued_const_with_data, regular_op_with_empty_data, \ - result, build_graph, connect +from unit_tests.utils.graph import valued_const_with_data, regular_op_with_empty_data, result, build_graph, connect nodes = lambda value, dst_type: { **valued_const_with_data('value', np.array(value)), diff --git a/model-optimizer/extensions/ops/correlation_test.py b/model-optimizer/unit_tests/extensions/ops/correlation_test.py similarity index 97% rename from model-optimizer/extensions/ops/correlation_test.py rename to model-optimizer/unit_tests/extensions/ops/correlation_test.py index d28835cbc42..d2a60da82c6 100644 --- a/model-optimizer/extensions/ops/correlation_test.py +++ b/model-optimizer/unit_tests/extensions/ops/correlation_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.ops.correlation import CorrelationOp from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'type': 'Identity', 'kind': 'op'}, 'node_2': {'type': 'Identity', 'kind': 'op'}, diff --git a/model-optimizer/extensions/ops/ctc_greedy_decoder_test.py b/model-optimizer/unit_tests/extensions/ops/ctc_greedy_decoder_test.py similarity index 98% rename from model-optimizer/extensions/ops/ctc_greedy_decoder_test.py rename to model-optimizer/unit_tests/extensions/ops/ctc_greedy_decoder_test.py index 6e445ce4ac6..69e17f11642 100644 --- a/model-optimizer/extensions/ops/ctc_greedy_decoder_test.py +++ b/model-optimizer/unit_tests/extensions/ops/ctc_greedy_decoder_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.ctc_greedy_decoder_seq_len import CTCGreedyDecoderSeqLenOp from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'logits': {'kind': 'op'}, diff --git a/model-optimizer/extensions/ops/ctc_loss_test.py b/model-optimizer/unit_tests/extensions/ops/ctc_loss_test.py similarity index 98% rename from model-optimizer/extensions/ops/ctc_loss_test.py rename to model-optimizer/unit_tests/extensions/ops/ctc_loss_test.py index 66562b60d68..aea851673f0 100644 --- a/model-optimizer/extensions/ops/ctc_loss_test.py +++ b/model-optimizer/unit_tests/extensions/ops/ctc_loss_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.ctc_loss import CTCLoss from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'logits': {'kind': 'op'}, 'logits_data': {'shape': None, 'value': None, 'kind': 'data'}, diff --git a/model-optimizer/extensions/ops/cumsum_test.py b/model-optimizer/unit_tests/extensions/ops/cumsum_test.py similarity index 98% rename from model-optimizer/extensions/ops/cumsum_test.py rename to model-optimizer/unit_tests/extensions/ops/cumsum_test.py index c44517e96bf..4ab0e63d375 100644 --- a/model-optimizer/extensions/ops/cumsum_test.py +++ b/model-optimizer/unit_tests/extensions/ops/cumsum_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.cumsum import CumSum from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph, valued_const_with_data, regular_op_with_shaped_data, result, connect +from unit_tests.utils.graph import build_graph, valued_const_with_data, regular_op_with_shaped_data, result, connect nodes_attributes = { **regular_op_with_shaped_data('data', [1, 3, 224, 224], {'type': 'Parameter', 'value': None, diff --git a/model-optimizer/extensions/ops/data_augmentation_test.py b/model-optimizer/unit_tests/extensions/ops/data_augmentation_test.py similarity index 97% rename from model-optimizer/extensions/ops/data_augmentation_test.py rename to model-optimizer/unit_tests/extensions/ops/data_augmentation_test.py index c67fc888b8c..4d2fc8250bc 100644 --- a/model-optimizer/extensions/ops/data_augmentation_test.py +++ b/model-optimizer/unit_tests/extensions/ops/data_augmentation_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.ops.data_augmentation import DataAugmentationOp from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'node_1': {'type': 'Identity', 'kind': 'op'}, diff --git a/model-optimizer/extensions/ops/depth_to_space_test.py b/model-optimizer/unit_tests/extensions/ops/depth_to_space_test.py similarity index 98% rename from model-optimizer/extensions/ops/depth_to_space_test.py rename to model-optimizer/unit_tests/extensions/ops/depth_to_space_test.py index c6f3a2fba97..784d07a8f34 100644 --- a/model-optimizer/extensions/ops/depth_to_space_test.py +++ b/model-optimizer/unit_tests/extensions/ops/depth_to_space_test.py @@ -6,7 +6,7 @@ import numpy as np from extensions.ops.depth_to_space import DepthToSpaceOp from mo.graph.graph import Node from mo.utils.error import Error -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes = { 'in_data_node': {'value': None, 'kind': 'data', 'shape': np.array([1, 1024, 576, 256])}, diff --git a/model-optimizer/extensions/ops/div_value_propagation_test.py b/model-optimizer/unit_tests/extensions/ops/div_value_propagation_test.py similarity index 98% rename from model-optimizer/extensions/ops/div_value_propagation_test.py rename to model-optimizer/unit_tests/extensions/ops/div_value_propagation_test.py index 6ae15b02b06..3caa72e1c2e 100644 --- a/model-optimizer/extensions/ops/div_value_propagation_test.py +++ b/model-optimizer/unit_tests/extensions/ops/div_value_propagation_test.py @@ -9,7 +9,7 @@ from generator import generator, generate from extensions.ops.elementwise import Div from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph graph_nodes_attrs = { 'A': {'type': 'Const', 'op': 'Const', 'kind': 'op', 'shape': None, 'value': None}, diff --git a/model-optimizer/extensions/ops/elementwise_test.py b/model-optimizer/unit_tests/extensions/ops/elementwise_test.py similarity index 98% rename from model-optimizer/extensions/ops/elementwise_test.py rename to model-optimizer/unit_tests/extensions/ops/elementwise_test.py index 36e54000f44..4811e0a76c6 100644 --- a/model-optimizer/extensions/ops/elementwise_test.py +++ b/model-optimizer/unit_tests/extensions/ops/elementwise_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.ops.elementwise import Round from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph def round_test_graph(nodes_attributes, value, mode: str): graph = build_graph(nodes_attributes, diff --git a/model-optimizer/extensions/ops/embedding_bag_test.py b/model-optimizer/unit_tests/extensions/ops/embedding_bag_test.py similarity index 96% rename from model-optimizer/extensions/ops/embedding_bag_test.py rename to model-optimizer/unit_tests/extensions/ops/embedding_bag_test.py index ae04e526356..293c94cdfa8 100644 --- a/model-optimizer/extensions/ops/embedding_bag_test.py +++ b/model-optimizer/unit_tests/extensions/ops/embedding_bag_test.py @@ -8,8 +8,7 @@ import numpy as np from extensions.ops.embedding_bag import EmbeddingBagOffsetsSum, EmbeddingBagPackedSum, EmbeddingSegmentsSum from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph, regular_op_with_shaped_data, valued_const_with_data, result, \ - connect, FakeAttr +from unit_tests.utils.graph import build_graph, regular_op_with_shaped_data, valued_const_with_data, result, connect nodes = { **valued_const_with_data('data', np.random.randn(3000, 8)), diff --git a/model-optimizer/extensions/ops/gather_test.py b/model-optimizer/unit_tests/extensions/ops/gather_test.py similarity index 98% rename from model-optimizer/extensions/ops/gather_test.py rename to model-optimizer/unit_tests/extensions/ops/gather_test.py index bf0b3375ed0..d71445936b0 100644 --- a/model-optimizer/extensions/ops/gather_test.py +++ b/model-optimizer/unit_tests/extensions/ops/gather_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.gather import Gather from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestGatherPartialInfer(unittest.TestCase): diff --git a/model-optimizer/extensions/ops/gatherelements_test.py b/model-optimizer/unit_tests/extensions/ops/gatherelements_test.py similarity index 96% rename from model-optimizer/extensions/ops/gatherelements_test.py rename to model-optimizer/unit_tests/extensions/ops/gatherelements_test.py index f3bae01f83a..2d668de0df5 100644 --- a/model-optimizer/extensions/ops/gatherelements_test.py +++ b/model-optimizer/unit_tests/extensions/ops/gatherelements_test.py @@ -9,7 +9,7 @@ from generator import generator, generate from extensions.ops.gatherelements import GatherElements from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph, regular_op_with_empty_data, result, connect, \ +from unit_tests.utils.graph import build_graph, regular_op_with_empty_data, result, connect, \ valued_const_with_data diff --git a/model-optimizer/extensions/ops/gathernd_test.py b/model-optimizer/unit_tests/extensions/ops/gathernd_test.py similarity index 99% rename from model-optimizer/extensions/ops/gathernd_test.py rename to model-optimizer/unit_tests/extensions/ops/gathernd_test.py index 8a4f52d8ac2..74217e26e53 100644 --- a/model-optimizer/extensions/ops/gathernd_test.py +++ b/model-optimizer/unit_tests/extensions/ops/gathernd_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.gathernd import GatherND from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'data': {'kind': 'op'}, 'data_data': {'shape': None, 'value': None, 'kind': 'data'}, diff --git a/model-optimizer/extensions/ops/grn_test.py b/model-optimizer/unit_tests/extensions/ops/grn_test.py similarity index 96% rename from model-optimizer/extensions/ops/grn_test.py rename to model-optimizer/unit_tests/extensions/ops/grn_test.py index 977560977a8..01b3ead0994 100644 --- a/model-optimizer/extensions/ops/grn_test.py +++ b/model-optimizer/unit_tests/extensions/ops/grn_test.py @@ -7,7 +7,7 @@ import numpy as np from mo.front.common.partial_infer.elemental import copy_shape_infer from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'type': 'Identity', 'kind': 'op'}, 'grn': {'type': 'GRN', 'kind': 'op'}, diff --git a/model-optimizer/extensions/ops/instance_normalization_test.py b/model-optimizer/unit_tests/extensions/ops/instance_normalization_test.py similarity index 100% rename from model-optimizer/extensions/ops/instance_normalization_test.py rename to model-optimizer/unit_tests/extensions/ops/instance_normalization_test.py diff --git a/model-optimizer/extensions/ops/interpolate_test.py b/model-optimizer/unit_tests/extensions/ops/interpolate_test.py similarity index 99% rename from model-optimizer/extensions/ops/interpolate_test.py rename to model-optimizer/unit_tests/extensions/ops/interpolate_test.py index 59f1f7f1c85..e89761d00c3 100644 --- a/model-optimizer/extensions/ops/interpolate_test.py +++ b/model-optimizer/unit_tests/extensions/ops/interpolate_test.py @@ -9,7 +9,7 @@ from generator import generator, generate from extensions.ops.interpolate import Interpolate from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph graph_node_attrs_without_axes = { diff --git a/model-optimizer/extensions/ops/merge_test.py b/model-optimizer/unit_tests/extensions/ops/merge_test.py similarity index 98% rename from model-optimizer/extensions/ops/merge_test.py rename to model-optimizer/unit_tests/extensions/ops/merge_test.py index bb7e3ce30dd..8a395cc178b 100644 --- a/model-optimizer/extensions/ops/merge_test.py +++ b/model-optimizer/unit_tests/extensions/ops/merge_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.merge import Merge from mo.graph.graph import Node from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph_with_attrs +from unit_tests.utils.graph import build_graph_with_attrs class TestMerge(unittest.TestCase): diff --git a/model-optimizer/extensions/ops/non_max_suppression_test.py b/model-optimizer/unit_tests/extensions/ops/non_max_suppression_test.py similarity index 96% rename from model-optimizer/extensions/ops/non_max_suppression_test.py rename to model-optimizer/unit_tests/extensions/ops/non_max_suppression_test.py index 9e167c64f95..7c48e1d267f 100644 --- a/model-optimizer/extensions/ops/non_max_suppression_test.py +++ b/model-optimizer/unit_tests/extensions/ops/non_max_suppression_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.non_max_suppression import NonMaxSuppression from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph, regular_op_with_shaped_data, valued_const_with_data, result, connect +from unit_tests.utils.graph import build_graph, regular_op_with_shaped_data, valued_const_with_data, result, connect class TestNonMaxSuppressionInfer(unittest.TestCase): diff --git a/model-optimizer/extensions/ops/normalize_test.py b/model-optimizer/unit_tests/extensions/ops/normalize_test.py similarity index 96% rename from model-optimizer/extensions/ops/normalize_test.py rename to model-optimizer/unit_tests/extensions/ops/normalize_test.py index 67bcb25f970..d4868296b3d 100644 --- a/model-optimizer/extensions/ops/normalize_test.py +++ b/model-optimizer/unit_tests/extensions/ops/normalize_test.py @@ -7,7 +7,7 @@ import numpy as np from mo.front.common.partial_infer.elemental import copy_shape_infer from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'type': 'Identity', 'kind': 'op'}, 'norm': {'type': 'Normalize', 'kind': 'op'}, diff --git a/model-optimizer/extensions/ops/one_hot_test.py b/model-optimizer/unit_tests/extensions/ops/one_hot_test.py similarity index 95% rename from model-optimizer/extensions/ops/one_hot_test.py rename to model-optimizer/unit_tests/extensions/ops/one_hot_test.py index d712d4e059a..973a540ff24 100644 --- a/model-optimizer/extensions/ops/one_hot_test.py +++ b/model-optimizer/unit_tests/extensions/ops/one_hot_test.py @@ -9,7 +9,7 @@ from generator import generator, generate from extensions.ops.one_hot import OneHot from mo.front.common.partial_infer.utils import int64_array, float_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph, regular_op_with_shaped_data, valued_const_with_data, connect +from unit_tests.utils.graph import build_graph, regular_op_with_shaped_data, valued_const_with_data, connect def generate_nodes(data, axis=-1, depth=4, on_value=1., off_value=0.): diff --git a/model-optimizer/extensions/ops/priorbox_clustered_test.py b/model-optimizer/unit_tests/extensions/ops/priorbox_clustered_test.py similarity index 98% rename from model-optimizer/extensions/ops/priorbox_clustered_test.py rename to model-optimizer/unit_tests/extensions/ops/priorbox_clustered_test.py index b28759bb524..7a8df5aa8ed 100644 --- a/model-optimizer/extensions/ops/priorbox_clustered_test.py +++ b/model-optimizer/unit_tests/extensions/ops/priorbox_clustered_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.ops.priorbox_clustered import PriorBoxClusteredOp from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'type': 'Identity', 'value': None, 'kind': 'data'}, 'node_2': {'type': 'Identity', 'value': None, 'kind': 'data'}, diff --git a/model-optimizer/extensions/ops/priorbox_test.py b/model-optimizer/unit_tests/extensions/ops/priorbox_test.py similarity index 99% rename from model-optimizer/extensions/ops/priorbox_test.py rename to model-optimizer/unit_tests/extensions/ops/priorbox_test.py index a0a7010fd77..a5b7601d7bd 100644 --- a/model-optimizer/extensions/ops/priorbox_test.py +++ b/model-optimizer/unit_tests/extensions/ops/priorbox_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.ops.priorbox import PriorBoxOp from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'type': 'Identity', 'value': None, 'kind': 'data'}, 'pb': {'type': 'PriorBox', 'value': None, 'kind': 'op'}, diff --git a/model-optimizer/extensions/ops/proposal_test.py b/model-optimizer/unit_tests/extensions/ops/proposal_test.py similarity index 98% rename from model-optimizer/extensions/ops/proposal_test.py rename to model-optimizer/unit_tests/extensions/ops/proposal_test.py index a4feb8f6f94..e3a197ef3b3 100644 --- a/model-optimizer/extensions/ops/proposal_test.py +++ b/model-optimizer/unit_tests/extensions/ops/proposal_test.py @@ -7,7 +7,7 @@ from extensions.ops.proposal import ProposalOp from mo.front.common.extractors.utils import layout_attrs from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'proposal_input': {'kind': 'data', 'shape': None, 'value': None}, 'proposal': {'type': 'Proposal', 'kind': 'op'}, diff --git a/model-optimizer/extensions/ops/psroipooling_test.py b/model-optimizer/unit_tests/extensions/ops/psroipooling_test.py similarity index 98% rename from model-optimizer/extensions/ops/psroipooling_test.py rename to model-optimizer/unit_tests/extensions/ops/psroipooling_test.py index 2b9cad7838d..6f552752316 100644 --- a/model-optimizer/extensions/ops/psroipooling_test.py +++ b/model-optimizer/unit_tests/extensions/ops/psroipooling_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.ops.psroipooling import PSROIPoolingOp from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'type': 'Identity', 'kind': 'op'}, 'node_2': {'type': 'Identity', 'kind': 'op'}, diff --git a/model-optimizer/extensions/ops/quantize_test.py b/model-optimizer/unit_tests/extensions/ops/quantize_test.py similarity index 99% rename from model-optimizer/extensions/ops/quantize_test.py rename to model-optimizer/unit_tests/extensions/ops/quantize_test.py index 65d4f2dd336..18630f95c70 100644 --- a/model-optimizer/extensions/ops/quantize_test.py +++ b/model-optimizer/unit_tests/extensions/ops/quantize_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.ops.fakequantize import FakeQuantize, broadcastable from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestBroadcastable(unittest.TestCase): diff --git a/model-optimizer/extensions/ops/regionyolo_test.py b/model-optimizer/unit_tests/extensions/ops/regionyolo_test.py similarity index 99% rename from model-optimizer/extensions/ops/regionyolo_test.py rename to model-optimizer/unit_tests/extensions/ops/regionyolo_test.py index 9ebd2045b1f..64409535dac 100644 --- a/model-optimizer/extensions/ops/regionyolo_test.py +++ b/model-optimizer/unit_tests/extensions/ops/regionyolo_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.regionyolo import RegionYoloOp from mo.front.common.extractors.utils import layout_attrs from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'type': 'Identity', 'kind': 'op'}, 'region': {'type': 'RegionYolo', 'kind': 'op'}, diff --git a/model-optimizer/extensions/ops/reorgyolo_test.py b/model-optimizer/unit_tests/extensions/ops/reorgyolo_test.py similarity index 97% rename from model-optimizer/extensions/ops/reorgyolo_test.py rename to model-optimizer/unit_tests/extensions/ops/reorgyolo_test.py index b21a9336281..1a3f077dfa9 100644 --- a/model-optimizer/extensions/ops/reorgyolo_test.py +++ b/model-optimizer/unit_tests/extensions/ops/reorgyolo_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.reorgyolo import ReorgYoloOp from mo.front.common.extractors.utils import layout_attrs from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'type': 'Identity', 'kind': 'op'}, 'reorg': {'type': 'ReorgYolo', 'kind': 'op'}, diff --git a/model-optimizer/extensions/ops/scatter_test.py b/model-optimizer/unit_tests/extensions/ops/scatter_test.py similarity index 95% rename from model-optimizer/extensions/ops/scatter_test.py rename to model-optimizer/unit_tests/extensions/ops/scatter_test.py index a653140d9bb..6d80ec443cd 100644 --- a/model-optimizer/extensions/ops/scatter_test.py +++ b/model-optimizer/unit_tests/extensions/ops/scatter_test.py @@ -9,8 +9,7 @@ from generator import generator, generate from extensions.ops.scatter import ScatterElementsUpdate from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph, regular_op_with_empty_data, result, connect, \ - valued_const_with_data +from unit_tests.utils.graph import build_graph, regular_op_with_empty_data, result, connect, valued_const_with_data @generator diff --git a/model-optimizer/extensions/ops/scatternd_test.py b/model-optimizer/unit_tests/extensions/ops/scatternd_test.py similarity index 99% rename from model-optimizer/extensions/ops/scatternd_test.py rename to model-optimizer/unit_tests/extensions/ops/scatternd_test.py index a53b020202c..f3f5a92bac0 100644 --- a/model-optimizer/extensions/ops/scatternd_test.py +++ b/model-optimizer/unit_tests/extensions/ops/scatternd_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.scatternd import ScatterNDUpdate from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'input': {'shape': None, 'value': None, 'kind': 'data'}, 'indices': {'shape': None, 'value': None, 'kind': 'data'}, diff --git a/model-optimizer/extensions/ops/select_test.py b/model-optimizer/unit_tests/extensions/ops/select_test.py similarity index 99% rename from model-optimizer/extensions/ops/select_test.py rename to model-optimizer/unit_tests/extensions/ops/select_test.py index 516dcaa71d7..fb12477f033 100644 --- a/model-optimizer/extensions/ops/select_test.py +++ b/model-optimizer/unit_tests/extensions/ops/select_test.py @@ -9,7 +9,7 @@ from generator import generator, generate from extensions.ops.select import Select from mo.graph.graph import Node from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph_with_attrs +from unit_tests.utils.graph import build_graph_with_attrs @generator diff --git a/model-optimizer/extensions/ops/simplernms_test.py b/model-optimizer/unit_tests/extensions/ops/simplernms_test.py similarity index 97% rename from model-optimizer/extensions/ops/simplernms_test.py rename to model-optimizer/unit_tests/extensions/ops/simplernms_test.py index eabb6f09c1e..1301a7532cb 100644 --- a/model-optimizer/extensions/ops/simplernms_test.py +++ b/model-optimizer/unit_tests/extensions/ops/simplernms_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.ops.simplernms import SimplerNMSOp from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'SimplerNMS_1': {'type': 'SimplerNMS', 'kind': 'op'}, 'node_1': {'type': 'Identity', 'kind': 'op'}, diff --git a/model-optimizer/extensions/ops/slice_like_test.py b/model-optimizer/unit_tests/extensions/ops/slice_like_test.py similarity index 98% rename from model-optimizer/extensions/ops/slice_like_test.py rename to model-optimizer/unit_tests/extensions/ops/slice_like_test.py index 92ffa057d79..d178a488b4c 100644 --- a/model-optimizer/extensions/ops/slice_like_test.py +++ b/model-optimizer/unit_tests/extensions/ops/slice_like_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.slice_like import SliceLike from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'input': {'kind': 'op', 'op': 'Const'}, diff --git a/model-optimizer/extensions/ops/space_to_depth_test.py b/model-optimizer/unit_tests/extensions/ops/space_to_depth_test.py similarity index 95% rename from model-optimizer/extensions/ops/space_to_depth_test.py rename to model-optimizer/unit_tests/extensions/ops/space_to_depth_test.py index 7f9c4716ee2..db8da1268ff 100644 --- a/model-optimizer/extensions/ops/space_to_depth_test.py +++ b/model-optimizer/unit_tests/extensions/ops/space_to_depth_test.py @@ -6,7 +6,7 @@ import numpy as np from extensions.ops.space_to_depth import SpaceToDepth from mo.graph.graph import Node from mo.utils.error import Error -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes = { 'in_data_node': {'value': None, 'kind': 'data', 'shape': np.array([1, 2048, 1152, 64])}, diff --git a/model-optimizer/extensions/ops/sparse_fill_empty_rows_test.py b/model-optimizer/unit_tests/extensions/ops/sparse_fill_empty_rows_test.py similarity index 99% rename from model-optimizer/extensions/ops/sparse_fill_empty_rows_test.py rename to model-optimizer/unit_tests/extensions/ops/sparse_fill_empty_rows_test.py index 14fa6d26735..ea26404983e 100644 --- a/model-optimizer/extensions/ops/sparse_fill_empty_rows_test.py +++ b/model-optimizer/unit_tests/extensions/ops/sparse_fill_empty_rows_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.sparse_fill_empty_rows import SparseFillEmptyRows from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'input_indices': {'shape': None, 'value': None, 'kind': 'data'}, 'input_values': {'shape': None, 'value': None, 'kind': 'data'}, diff --git a/model-optimizer/extensions/ops/sparse_reshape_test.py b/model-optimizer/unit_tests/extensions/ops/sparse_reshape_test.py similarity index 98% rename from model-optimizer/extensions/ops/sparse_reshape_test.py rename to model-optimizer/unit_tests/extensions/ops/sparse_reshape_test.py index 26927ae7153..7f16d842397 100644 --- a/model-optimizer/extensions/ops/sparse_reshape_test.py +++ b/model-optimizer/unit_tests/extensions/ops/sparse_reshape_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.sparse_reshape import SparseReshape from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'input_indices': {'shape': None, 'value': None, 'kind': 'data'}, 'input_shape': {'shape': None, 'value': None, 'kind': 'data'}, diff --git a/model-optimizer/extensions/ops/sparse_segment_mean_test.py b/model-optimizer/unit_tests/extensions/ops/sparse_segment_mean_test.py similarity index 98% rename from model-optimizer/extensions/ops/sparse_segment_mean_test.py rename to model-optimizer/unit_tests/extensions/ops/sparse_segment_mean_test.py index 44de3a95f76..d847d52cc26 100644 --- a/model-optimizer/extensions/ops/sparse_segment_mean_test.py +++ b/model-optimizer/unit_tests/extensions/ops/sparse_segment_mean_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.sparse_segment_mean import SparseSegmentMean from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph # graph 1 nodes_attributes1 = {'input_data': {'shape': None, 'value': None, 'kind': 'data'}, diff --git a/model-optimizer/extensions/ops/sparse_segment_sqrtn_test.py b/model-optimizer/unit_tests/extensions/ops/sparse_segment_sqrtn_test.py similarity index 98% rename from model-optimizer/extensions/ops/sparse_segment_sqrtn_test.py rename to model-optimizer/unit_tests/extensions/ops/sparse_segment_sqrtn_test.py index fd7c23577e8..01db696441f 100644 --- a/model-optimizer/extensions/ops/sparse_segment_sqrtn_test.py +++ b/model-optimizer/unit_tests/extensions/ops/sparse_segment_sqrtn_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.sparse_segment_sqrtn import SparseSegmentSqrtN from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph # graph 1 nodes_attributes1 = {'input_data': {'shape': None, 'value': None, 'kind': 'data'}, diff --git a/model-optimizer/extensions/ops/sparse_segment_sum_test.py b/model-optimizer/unit_tests/extensions/ops/sparse_segment_sum_test.py similarity index 98% rename from model-optimizer/extensions/ops/sparse_segment_sum_test.py rename to model-optimizer/unit_tests/extensions/ops/sparse_segment_sum_test.py index b28b83b12af..d42fd398a8f 100644 --- a/model-optimizer/extensions/ops/sparse_segment_sum_test.py +++ b/model-optimizer/unit_tests/extensions/ops/sparse_segment_sum_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.sparse_segment_sum import SparseSegmentSum from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph # graph 1 nodes_attributes1 = {'input_data': {'shape': None, 'value': None, 'kind': 'data'}, diff --git a/model-optimizer/extensions/ops/spatial_transformer_test.py b/model-optimizer/unit_tests/extensions/ops/spatial_transformer_test.py similarity index 98% rename from model-optimizer/extensions/ops/spatial_transformer_test.py rename to model-optimizer/unit_tests/extensions/ops/spatial_transformer_test.py index 2c48b9edb99..93b6f282163 100644 --- a/model-optimizer/extensions/ops/spatial_transformer_test.py +++ b/model-optimizer/unit_tests/extensions/ops/spatial_transformer_test.py @@ -7,7 +7,7 @@ import numpy as np from extensions.ops.spatial_transformer import SpatialTransformOp from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'type': 'Identity', 'kind': 'op'}, 'node_2': {'type': 'Identity', 'kind': 'op'}, diff --git a/model-optimizer/extensions/ops/split_test.py b/model-optimizer/unit_tests/extensions/ops/split_test.py similarity index 99% rename from model-optimizer/extensions/ops/split_test.py rename to model-optimizer/unit_tests/extensions/ops/split_test.py index c5673e93575..0ab4f40d0e3 100644 --- a/model-optimizer/extensions/ops/split_test.py +++ b/model-optimizer/unit_tests/extensions/ops/split_test.py @@ -9,7 +9,7 @@ from extensions.ops.split import AttributedSplit, AttributedVariadicSplit from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestSplitOp(unittest.TestCase): diff --git a/model-optimizer/extensions/ops/switch_test.py b/model-optimizer/unit_tests/extensions/ops/switch_test.py similarity index 99% rename from model-optimizer/extensions/ops/switch_test.py rename to model-optimizer/unit_tests/extensions/ops/switch_test.py index ad7a66861b7..68c196685f4 100644 --- a/model-optimizer/extensions/ops/switch_test.py +++ b/model-optimizer/unit_tests/extensions/ops/switch_test.py @@ -9,7 +9,7 @@ import numpy as np from extensions.ops.switch import Switch from mo.graph.graph import Node from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph_with_edge_attrs, build_graph_with_attrs +from unit_tests.utils.graph import build_graph_with_edge_attrs, build_graph_with_attrs class TestSwitch(unittest.TestCase): diff --git a/model-optimizer/extensions/ops/topk_test.py b/model-optimizer/unit_tests/extensions/ops/topk_test.py similarity index 96% rename from model-optimizer/extensions/ops/topk_test.py rename to model-optimizer/unit_tests/extensions/ops/topk_test.py index a403f133e59..b1123686453 100644 --- a/model-optimizer/extensions/ops/topk_test.py +++ b/model-optimizer/unit_tests/extensions/ops/topk_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.topk import TopK from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph, regular_op_with_shaped_data, valued_const_with_data, result, connect +from unit_tests.utils.graph import build_graph, regular_op_with_shaped_data, valued_const_with_data, result, connect class TestTopKInfer(unittest.TestCase): diff --git a/model-optimizer/extensions/ops/transpose_test.py b/model-optimizer/unit_tests/extensions/ops/transpose_test.py similarity index 98% rename from model-optimizer/extensions/ops/transpose_test.py rename to model-optimizer/unit_tests/extensions/ops/transpose_test.py index dce4ec91fbf..35e4beab719 100644 --- a/model-optimizer/extensions/ops/transpose_test.py +++ b/model-optimizer/unit_tests/extensions/ops/transpose_test.py @@ -9,7 +9,7 @@ from generator import generator, generate from extensions.ops.transpose import Transpose from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph input_shape = np.array([1, 3, 224, 224]) diff --git a/model-optimizer/extensions/ops/unique_test.py b/model-optimizer/unit_tests/extensions/ops/unique_test.py similarity index 99% rename from model-optimizer/extensions/ops/unique_test.py rename to model-optimizer/unit_tests/extensions/ops/unique_test.py index 459bd2824f7..6452a50cc74 100644 --- a/model-optimizer/extensions/ops/unique_test.py +++ b/model-optimizer/unit_tests/extensions/ops/unique_test.py @@ -8,7 +8,7 @@ import numpy as np from extensions.ops.unique import Unique from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph # graph 1 with two outputs: uniques and indices nodes_attributes = {'input': {'shape': None, 'value': None, 'kind': 'data'}, diff --git a/model-optimizer/extensions/ops/upsample_test.py b/model-optimizer/unit_tests/extensions/ops/upsample_test.py similarity index 98% rename from model-optimizer/extensions/ops/upsample_test.py rename to model-optimizer/unit_tests/extensions/ops/upsample_test.py index 215c3c4cd68..2284463a7b5 100644 --- a/model-optimizer/extensions/ops/upsample_test.py +++ b/model-optimizer/unit_tests/extensions/ops/upsample_test.py @@ -4,11 +4,11 @@ import unittest import numpy as np +from generator import generator, generate from extensions.ops.upsample import UpsampleOp -from generator import generator, generate from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'type': 'Identity', 'kind': 'op'}, 'upsample': {'type': 'Upsample', 'kind': 'op'}, diff --git a/model-optimizer/unit_tests/mo/__init__.py b/model-optimizer/unit_tests/mo/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/unit_tests/mo/back/__init__.py b/model-optimizer/unit_tests/mo/back/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/unit_tests/mo/back/ie_ir_ver_2/__init__.py b/model-optimizer/unit_tests/mo/back/ie_ir_ver_2/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/mo/back/ie_ir_ver_2/emitter_test.py b/model-optimizer/unit_tests/mo/back/ie_ir_ver_2/emitter_test.py similarity index 100% rename from model-optimizer/mo/back/ie_ir_ver_2/emitter_test.py rename to model-optimizer/unit_tests/mo/back/ie_ir_ver_2/emitter_test.py diff --git a/model-optimizer/mo/bom_test.py b/model-optimizer/unit_tests/mo/bom_test.py similarity index 93% rename from model-optimizer/mo/bom_test.py rename to model-optimizer/unit_tests/mo/bom_test.py index a9325edbaf5..0bb7118e2a0 100644 --- a/model-optimizer/mo/bom_test.py +++ b/model-optimizer/unit_tests/mo/bom_test.py @@ -8,15 +8,11 @@ import unittest from itertools import islice dir_patterns_to_skip = ['.*__pycache__.*'] -file_patterns_to_skip = ['.*_test\\.py$', - '.*\\.DS_Store$', +file_patterns_to_skip = ['.*\\.DS_Store$', '.*\\.swp', '.*\\.pyc$'] -full_name_patterns_to_skip = ['^mo/utils/unittest/.*\.py$', - '^mo/utils/convert.py$', +full_name_patterns_to_skip = ['^mo/utils/convert.py$', '^extensions/front/caffe/CustomLayersMapping.xml$', - '^mo/utils/unittest/test_data/.*\.xml$', - '^mo/utils/unittest/test_data/.*\.bin$', ] if platform.system() == 'Windows': full_name_patterns_to_skip = [i.replace('/', '\\\\') for i in full_name_patterns_to_skip] @@ -32,7 +28,7 @@ class TestBOMFile(unittest.TestCase): def setUpClass(cls): cls.existing_files = [] cur_path = os.path.join(os.path.realpath(__file__), os.pardir) - cls.output_dir = os.path.abspath(os.path.join(cur_path, os.pardir)) + cls.output_dir = os.path.abspath(os.path.join(cur_path, os.pardir, os.pardir)) with open(os.path.join(cls.output_dir, 'automation', 'package_BOM.txt'), 'r') as bom_file: if platform.system() == 'Windows': cls.existing_files = [name.rstrip().replace('/', '\\') for name in bom_file.readlines()] @@ -72,7 +68,6 @@ class TestBOMFile(unittest.TestCase): def test_bom_does_not_contain_unittest_files(self): for file_name in self.existing_files: self.assertFalse(file_name.endswith('_test.py'), 'BOM file contains test file {}'.format(file_name)) - def test_deleted_files_still_stored_in_bom(self): deleted = list() diff --git a/model-optimizer/unit_tests/mo/front/__init__.py b/model-optimizer/unit_tests/mo/front/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/unit_tests/mo/front/caffe/__init__.py b/model-optimizer/unit_tests/mo/front/caffe/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/mo/front/caffe/custom_layers_mapping_test.py b/model-optimizer/unit_tests/mo/front/caffe/custom_layers_mapping_test.py similarity index 100% rename from model-optimizer/mo/front/caffe/custom_layers_mapping_test.py rename to model-optimizer/unit_tests/mo/front/caffe/custom_layers_mapping_test.py diff --git a/model-optimizer/mo/front/caffe/extractor_test.py b/model-optimizer/unit_tests/mo/front/caffe/extractor_test.py similarity index 97% rename from model-optimizer/mo/front/caffe/extractor_test.py rename to model-optimizer/unit_tests/mo/front/caffe/extractor_test.py index 23bff3237dc..f2183535b63 100644 --- a/model-optimizer/mo/front/caffe/extractor_test.py +++ b/model-optimizer/unit_tests/mo/front/caffe/extractor_test.py @@ -7,8 +7,8 @@ from unittest.mock import patch from mo.front.caffe.extractor import check_phase, register_caffe_python_extractor from mo.front.extractor import CaffePythonFrontExtractorOp from mo.graph.graph import Node -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'type': 'Identity', 'kind': 'op'}, 'node_2': {'type': 'Identity', 'kind': 'op'}} diff --git a/model-optimizer/unit_tests/mo/front/caffe/extractors/__init__.py b/model-optimizer/unit_tests/mo/front/caffe/extractors/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/mo/front/caffe/extractors/utils_test.py b/model-optimizer/unit_tests/mo/front/caffe/extractors/utils_test.py similarity index 97% rename from model-optimizer/mo/front/caffe/extractors/utils_test.py rename to model-optimizer/unit_tests/mo/front/caffe/extractors/utils_test.py index fe420f267b2..8f73aa15b20 100644 --- a/model-optimizer/mo/front/caffe/extractors/utils_test.py +++ b/model-optimizer/unit_tests/mo/front/caffe/extractors/utils_test.py @@ -7,7 +7,7 @@ from unittest.mock import patch, call import numpy as np from mo.front.caffe.extractors.utils import weights_biases, embed_input, get_canonical_axis_index -from mo.utils.unittest.extractors import FakeModelLayer +from unit_tests.utils.extractors import FakeModelLayer class TestWeightsBiases(unittest.TestCase): diff --git a/model-optimizer/mo/front/caffe/loader_test.py b/model-optimizer/unit_tests/mo/front/caffe/loader_test.py similarity index 100% rename from model-optimizer/mo/front/caffe/loader_test.py rename to model-optimizer/unit_tests/mo/front/caffe/loader_test.py diff --git a/model-optimizer/mo/front/caffe/python_layer_extractor_test.py b/model-optimizer/unit_tests/mo/front/caffe/python_layer_extractor_test.py similarity index 94% rename from model-optimizer/mo/front/caffe/python_layer_extractor_test.py rename to model-optimizer/unit_tests/mo/front/caffe/python_layer_extractor_test.py index 78afb932afd..057faaacce4 100644 --- a/model-optimizer/mo/front/caffe/python_layer_extractor_test.py +++ b/model-optimizer/unit_tests/mo/front/caffe/python_layer_extractor_test.py @@ -6,8 +6,8 @@ import unittest from mo.front.caffe.python_layer_extractor import PythonFrontExtractorOp from mo.front.extractor import CaffePythonFrontExtractorOp from mo.graph.graph import Node -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import FakeNode +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import FakeNode class FakePythonProtoLayer: diff --git a/model-optimizer/unit_tests/mo/front/common/__init__.py b/model-optimizer/unit_tests/mo/front/common/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/mo/front/common/layout_test.py b/model-optimizer/unit_tests/mo/front/common/layout_test.py similarity index 100% rename from model-optimizer/mo/front/common/layout_test.py rename to model-optimizer/unit_tests/mo/front/common/layout_test.py diff --git a/model-optimizer/unit_tests/mo/front/common/partial_infer/__init__.py b/model-optimizer/unit_tests/mo/front/common/partial_infer/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/mo/front/common/partial_infer/caffe_fallback_test.py b/model-optimizer/unit_tests/mo/front/common/partial_infer/caffe_fallback_test.py similarity index 96% rename from model-optimizer/mo/front/common/partial_infer/caffe_fallback_test.py rename to model-optimizer/unit_tests/mo/front/common/partial_infer/caffe_fallback_test.py index a1a9646e548..c1c434f236d 100644 --- a/model-optimizer/mo/front/common/partial_infer/caffe_fallback_test.py +++ b/model-optimizer/unit_tests/mo/front/common/partial_infer/caffe_fallback_test.py @@ -7,8 +7,8 @@ from unittest.mock import MagicMock import numpy as np from mo.front.common.partial_infer.caffe_fallback import build_net -from mo.utils.unittest.extractors import FakeMultiParam, FakeValue -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.extractors import FakeMultiParam, FakeValue +from unit_tests.utils.graph import build_graph class Net: diff --git a/model-optimizer/mo/front/common/partial_infer/concat_test.py b/model-optimizer/unit_tests/mo/front/common/partial_infer/concat_test.py similarity index 98% rename from model-optimizer/mo/front/common/partial_infer/concat_test.py rename to model-optimizer/unit_tests/mo/front/common/partial_infer/concat_test.py index 4caa598ef43..a5a2fa0d78a 100644 --- a/model-optimizer/mo/front/common/partial_infer/concat_test.py +++ b/model-optimizer/unit_tests/mo/front/common/partial_infer/concat_test.py @@ -7,7 +7,7 @@ import numpy as np from mo.front.common.partial_infer.concat import concat_infer from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'kind': 'data', 'value': None}, 'node_2': {'kind': 'data', 'value': None}, diff --git a/model-optimizer/mo/front/common/partial_infer/crop_test.py b/model-optimizer/unit_tests/mo/front/common/partial_infer/crop_test.py similarity index 99% rename from model-optimizer/mo/front/common/partial_infer/crop_test.py rename to model-optimizer/unit_tests/mo/front/common/partial_infer/crop_test.py index 4f7f902aff0..00d43fa20aa 100644 --- a/model-optimizer/mo/front/common/partial_infer/crop_test.py +++ b/model-optimizer/unit_tests/mo/front/common/partial_infer/crop_test.py @@ -7,7 +7,7 @@ import numpy as np from mo.front.common.partial_infer.crop import crop_infer from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'value': None, 'kind': 'data'}, 'node_2': {'value': None, 'kind': 'data'}, diff --git a/model-optimizer/mo/front/common/partial_infer/elemental_test.py b/model-optimizer/unit_tests/mo/front/common/partial_infer/elemental_test.py similarity index 100% rename from model-optimizer/mo/front/common/partial_infer/elemental_test.py rename to model-optimizer/unit_tests/mo/front/common/partial_infer/elemental_test.py diff --git a/model-optimizer/mo/front/common/partial_infer/eltwise_test.py b/model-optimizer/unit_tests/mo/front/common/partial_infer/eltwise_test.py similarity index 99% rename from model-optimizer/mo/front/common/partial_infer/eltwise_test.py rename to model-optimizer/unit_tests/mo/front/common/partial_infer/eltwise_test.py index 755509b8ec5..8734433115f 100644 --- a/model-optimizer/mo/front/common/partial_infer/eltwise_test.py +++ b/model-optimizer/unit_tests/mo/front/common/partial_infer/eltwise_test.py @@ -7,7 +7,7 @@ import numpy as np from mo.front.common.partial_infer.eltwise import eltwise_infer from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'value': 2, 'kind': 'data'}, 'node_2': {'value': 3, 'kind': 'data'}, diff --git a/model-optimizer/mo/front/common/partial_infer/multi_box_detection_test.py b/model-optimizer/unit_tests/mo/front/common/partial_infer/multi_box_detection_test.py similarity index 99% rename from model-optimizer/mo/front/common/partial_infer/multi_box_detection_test.py rename to model-optimizer/unit_tests/mo/front/common/partial_infer/multi_box_detection_test.py index b96e1b02744..fcaa9f6cdaf 100644 --- a/model-optimizer/mo/front/common/partial_infer/multi_box_detection_test.py +++ b/model-optimizer/unit_tests/mo/front/common/partial_infer/multi_box_detection_test.py @@ -7,7 +7,7 @@ import numpy as np from mo.front.common.partial_infer.multi_box_detection import multi_box_detection_infer from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'value': None, 'kind': 'data'}, 'node_2': {'value': None, 'kind': 'data'}, diff --git a/model-optimizer/mo/front/common/partial_infer/multi_box_prior_test.py b/model-optimizer/unit_tests/mo/front/common/partial_infer/multi_box_prior_test.py similarity index 97% rename from model-optimizer/mo/front/common/partial_infer/multi_box_prior_test.py rename to model-optimizer/unit_tests/mo/front/common/partial_infer/multi_box_prior_test.py index 10adde2eaba..42604c2c34f 100644 --- a/model-optimizer/mo/front/common/partial_infer/multi_box_prior_test.py +++ b/model-optimizer/unit_tests/mo/front/common/partial_infer/multi_box_prior_test.py @@ -7,7 +7,7 @@ import numpy as np from mo.front.common.partial_infer.multi_box_prior import multi_box_prior_infer_mxnet from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'value': None, 'kind': 'data'}, 'node_2': {'value': None, 'kind': 'data'}, diff --git a/model-optimizer/mo/front/common/partial_infer/roipooling_test.py b/model-optimizer/unit_tests/mo/front/common/partial_infer/roipooling_test.py similarity index 98% rename from model-optimizer/mo/front/common/partial_infer/roipooling_test.py rename to model-optimizer/unit_tests/mo/front/common/partial_infer/roipooling_test.py index fc21b6c32ef..2f6c83979db 100644 --- a/model-optimizer/mo/front/common/partial_infer/roipooling_test.py +++ b/model-optimizer/unit_tests/mo/front/common/partial_infer/roipooling_test.py @@ -7,7 +7,7 @@ import numpy as np from mo.front.common.partial_infer.roipooling import roipooling_infer from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'kind': 'data'}, 'node_2': {'kind': 'data'}, diff --git a/model-optimizer/mo/front/extractor_test.py b/model-optimizer/unit_tests/mo/front/extractor_test.py similarity index 99% rename from model-optimizer/mo/front/extractor_test.py rename to model-optimizer/unit_tests/mo/front/extractor_test.py index 463d344d991..c7fdbc5079c 100644 --- a/model-optimizer/mo/front/extractor_test.py +++ b/model-optimizer/unit_tests/mo/front/extractor_test.py @@ -13,8 +13,8 @@ from mo.front.extractor import spatial_attr_getter, add_input_ops, attr_getter, from mo.graph.graph import Node from mo.utils.error import Error from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.extractors import FakeMultiParam -from mo.utils.unittest.graph import build_graph, build_graph_with_edge_attrs, build_graph_with_attrs +from unit_tests.utils.extractors import FakeMultiParam +from unit_tests.utils.graph import build_graph, build_graph_with_edge_attrs, build_graph_with_attrs class FakePythonParam: diff --git a/model-optimizer/unit_tests/mo/front/kaldi/__init__.py b/model-optimizer/unit_tests/mo/front/kaldi/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/unit_tests/mo/front/kaldi/extractors/__init__.py b/model-optimizer/unit_tests/mo/front/kaldi/extractors/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/mo/front/kaldi/extractors/add_shift_ext_test.py b/model-optimizer/unit_tests/mo/front/kaldi/extractors/add_shift_ext_test.py similarity index 90% rename from model-optimizer/mo/front/kaldi/extractors/add_shift_ext_test.py rename to model-optimizer/unit_tests/mo/front/kaldi/extractors/add_shift_ext_test.py index 8e58a1095fd..4d04112d8b4 100644 --- a/model-optimizer/mo/front/kaldi/extractors/add_shift_ext_test.py +++ b/model-optimizer/unit_tests/mo/front/kaldi/extractors/add_shift_ext_test.py @@ -4,10 +4,10 @@ import numpy as np from mo.front.kaldi.extractors.add_shift_ext import AddShiftFrontExtractor -from mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest -from mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading from mo.ops.op import Op from mo.ops.scale_shift import ScaleShiftOp +from unit_tests.mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest +from unit_tests.mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading class AddShiftFrontExtractorTest(KaldiFrontExtractorTest): diff --git a/model-optimizer/mo/front/kaldi/extractors/affine_component_ext_test.py b/model-optimizer/unit_tests/mo/front/kaldi/extractors/affine_component_ext_test.py similarity index 87% rename from model-optimizer/mo/front/kaldi/extractors/affine_component_ext_test.py rename to model-optimizer/unit_tests/mo/front/kaldi/extractors/affine_component_ext_test.py index 032d22c954d..cbe7bb4f2d8 100644 --- a/model-optimizer/mo/front/kaldi/extractors/affine_component_ext_test.py +++ b/model-optimizer/unit_tests/mo/front/kaldi/extractors/affine_component_ext_test.py @@ -5,9 +5,9 @@ import numpy as np from extensions.ops.MatMul import FullyConnected from mo.front.kaldi.extractors.affine_transform_ext import AffineTransformFrontExtractor -from mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest -from mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading from mo.ops.op import Op +from unit_tests.mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest +from unit_tests.mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading class AffineComponentFrontExtractorTest(KaldiFrontExtractorTest): diff --git a/model-optimizer/mo/front/kaldi/extractors/affine_transform_ext_test.py b/model-optimizer/unit_tests/mo/front/kaldi/extractors/affine_transform_ext_test.py similarity index 87% rename from model-optimizer/mo/front/kaldi/extractors/affine_transform_ext_test.py rename to model-optimizer/unit_tests/mo/front/kaldi/extractors/affine_transform_ext_test.py index 8c2cb06e955..41acd914cf6 100644 --- a/model-optimizer/mo/front/kaldi/extractors/affine_transform_ext_test.py +++ b/model-optimizer/unit_tests/mo/front/kaldi/extractors/affine_transform_ext_test.py @@ -5,9 +5,9 @@ import numpy as np from extensions.ops.MatMul import FullyConnected from mo.front.kaldi.extractors.affine_transform_ext import AffineTransformFrontExtractor -from mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest -from mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading from mo.ops.op import Op +from unit_tests.mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest +from unit_tests.mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading class AffineTransformFrontExtractorTest(KaldiFrontExtractorTest): diff --git a/model-optimizer/mo/front/kaldi/extractors/batchnorm_component_ext_test.py b/model-optimizer/unit_tests/mo/front/kaldi/extractors/batchnorm_component_ext_test.py similarity index 92% rename from model-optimizer/mo/front/kaldi/extractors/batchnorm_component_ext_test.py rename to model-optimizer/unit_tests/mo/front/kaldi/extractors/batchnorm_component_ext_test.py index 380bdd341cf..25b05a02a7d 100644 --- a/model-optimizer/mo/front/kaldi/extractors/batchnorm_component_ext_test.py +++ b/model-optimizer/unit_tests/mo/front/kaldi/extractors/batchnorm_component_ext_test.py @@ -4,10 +4,10 @@ import numpy as np from mo.front.kaldi.extractors.batchnorm_component_ext import BatchNormComponentFrontExtractor -from mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest -from mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading from mo.ops.op import Op from mo.ops.scale_shift import ScaleShiftOp +from unit_tests.mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest +from unit_tests.mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading class BatchNormComponentFrontExtractorTest(KaldiFrontExtractorTest): diff --git a/model-optimizer/mo/front/kaldi/extractors/bias_component_ext_test.py b/model-optimizer/unit_tests/mo/front/kaldi/extractors/bias_component_ext_test.py similarity index 87% rename from model-optimizer/mo/front/kaldi/extractors/bias_component_ext_test.py rename to model-optimizer/unit_tests/mo/front/kaldi/extractors/bias_component_ext_test.py index c604dc75033..e8fd9a5e9cc 100644 --- a/model-optimizer/mo/front/kaldi/extractors/bias_component_ext_test.py +++ b/model-optimizer/unit_tests/mo/front/kaldi/extractors/bias_component_ext_test.py @@ -4,10 +4,10 @@ import numpy as np from mo.front.kaldi.extractors.bias_component_ext import FixedBiasComponentFrontExtractor -from mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest -from mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading from mo.ops.op import Op from mo.ops.scale_shift import ScaleShiftOp +from unit_tests.mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest +from unit_tests.mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading class FixedBiasComponentFrontExtractorTest(KaldiFrontExtractorTest): diff --git a/model-optimizer/mo/front/kaldi/extractors/common_ext_test.py b/model-optimizer/unit_tests/mo/front/kaldi/extractors/common_ext_test.py similarity index 97% rename from model-optimizer/mo/front/kaldi/extractors/common_ext_test.py rename to model-optimizer/unit_tests/mo/front/kaldi/extractors/common_ext_test.py index 188b755e38b..c27170bcb07 100644 --- a/model-optimizer/mo/front/kaldi/extractors/common_ext_test.py +++ b/model-optimizer/unit_tests/mo/front/kaldi/extractors/common_ext_test.py @@ -5,9 +5,9 @@ import unittest import numpy as np -from mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading from mo.graph.graph import Node, Graph -from mo.utils.unittest.graph import build_graph +from unit_tests.mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading +from unit_tests.utils.graph import build_graph class KaldiFrontExtractorTest(unittest.TestCase): diff --git a/model-optimizer/mo/front/kaldi/extractors/concat_ext_test.py b/model-optimizer/unit_tests/mo/front/kaldi/extractors/concat_ext_test.py similarity index 84% rename from model-optimizer/mo/front/kaldi/extractors/concat_ext_test.py rename to model-optimizer/unit_tests/mo/front/kaldi/extractors/concat_ext_test.py index 52ce5fca247..f5055048b4c 100644 --- a/model-optimizer/mo/front/kaldi/extractors/concat_ext_test.py +++ b/model-optimizer/unit_tests/mo/front/kaldi/extractors/concat_ext_test.py @@ -1,10 +1,10 @@ # Copyright (C) 2018-2021 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -from mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest from mo.front.kaldi.extractors.concat_ext import ConcatFrontExtractor from mo.ops.convolution import Convolution from mo.ops.op import Op +from unit_tests.mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest class ConcatFrontExtractorTest(KaldiFrontExtractorTest): diff --git a/model-optimizer/mo/front/kaldi/extractors/convolutional_component_ext_test.py b/model-optimizer/unit_tests/mo/front/kaldi/extractors/convolutional_component_ext_test.py similarity index 92% rename from model-optimizer/mo/front/kaldi/extractors/convolutional_component_ext_test.py rename to model-optimizer/unit_tests/mo/front/kaldi/extractors/convolutional_component_ext_test.py index 5bc1e5763d7..ea236da6cb8 100644 --- a/model-optimizer/mo/front/kaldi/extractors/convolutional_component_ext_test.py +++ b/model-optimizer/unit_tests/mo/front/kaldi/extractors/convolutional_component_ext_test.py @@ -3,11 +3,11 @@ import numpy as np -from mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest from mo.front.kaldi.extractors.convolutional_component_ext import ConvolutionalComponentFrontExtractor -from mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading from mo.ops.convolution import Convolution from mo.ops.op import Op +from unit_tests.mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest +from unit_tests.mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading class ConvolutionalComponentFrontExtractorTest(KaldiFrontExtractorTest): diff --git a/model-optimizer/mo/front/kaldi/extractors/fixed_affine_component_ext_test.py b/model-optimizer/unit_tests/mo/front/kaldi/extractors/fixed_affine_component_ext_test.py similarity index 87% rename from model-optimizer/mo/front/kaldi/extractors/fixed_affine_component_ext_test.py rename to model-optimizer/unit_tests/mo/front/kaldi/extractors/fixed_affine_component_ext_test.py index ec2dac8080d..18e1ac25a17 100644 --- a/model-optimizer/mo/front/kaldi/extractors/fixed_affine_component_ext_test.py +++ b/model-optimizer/unit_tests/mo/front/kaldi/extractors/fixed_affine_component_ext_test.py @@ -4,10 +4,10 @@ import numpy as np from extensions.ops.MatMul import FullyConnected -from mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest from mo.front.kaldi.extractors.fixed_affine_component_ext import FixedAffineComponentFrontExtractor -from mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading from mo.ops.op import Op +from unit_tests.mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest +from unit_tests.mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading class FixedAffineComponentFrontExtractorTest(KaldiFrontExtractorTest): diff --git a/model-optimizer/mo/front/kaldi/extractors/max_pooling_ext_test.py b/model-optimizer/unit_tests/mo/front/kaldi/extractors/max_pooling_ext_test.py similarity index 89% rename from model-optimizer/mo/front/kaldi/extractors/max_pooling_ext_test.py rename to model-optimizer/unit_tests/mo/front/kaldi/extractors/max_pooling_ext_test.py index a139ad330f0..fdc6b9cb627 100644 --- a/model-optimizer/mo/front/kaldi/extractors/max_pooling_ext_test.py +++ b/model-optimizer/unit_tests/mo/front/kaldi/extractors/max_pooling_ext_test.py @@ -1,12 +1,11 @@ # Copyright (C) 2018-2021 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -from mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest - from mo.front.kaldi.extractors.max_pooling_ext import MaxPoolingComponentFrontExtractor -from mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading from mo.ops.op import Op from mo.ops.pooling import Pooling +from unit_tests.mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest +from unit_tests.mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading class MaxPoolingComponentFrontExtractorTest(KaldiFrontExtractorTest): diff --git a/model-optimizer/mo/front/kaldi/extractors/memoryoffset_ext_test.py b/model-optimizer/unit_tests/mo/front/kaldi/extractors/memoryoffset_ext_test.py similarity index 90% rename from model-optimizer/mo/front/kaldi/extractors/memoryoffset_ext_test.py rename to model-optimizer/unit_tests/mo/front/kaldi/extractors/memoryoffset_ext_test.py index a95ea9b4773..cd6c9fef981 100644 --- a/model-optimizer/mo/front/kaldi/extractors/memoryoffset_ext_test.py +++ b/model-optimizer/unit_tests/mo/front/kaldi/extractors/memoryoffset_ext_test.py @@ -1,10 +1,10 @@ # Copyright (C) 2018-2021 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -from mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest from mo.front.kaldi.extractors.memoryoffset_ext import MemoryOffsetFrontExtractor from mo.ops.memoryoffset import MemoryOffset from mo.ops.op import Op +from unit_tests.mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest class MemoryOffsetFrontExtractorTest(KaldiFrontExtractorTest): diff --git a/model-optimizer/mo/front/kaldi/extractors/normalize_component_ext_test.py b/model-optimizer/unit_tests/mo/front/kaldi/extractors/normalize_component_ext_test.py similarity index 86% rename from model-optimizer/mo/front/kaldi/extractors/normalize_component_ext_test.py rename to model-optimizer/unit_tests/mo/front/kaldi/extractors/normalize_component_ext_test.py index 8f2732d9a32..544d700c7e9 100644 --- a/model-optimizer/mo/front/kaldi/extractors/normalize_component_ext_test.py +++ b/model-optimizer/unit_tests/mo/front/kaldi/extractors/normalize_component_ext_test.py @@ -4,10 +4,10 @@ import numpy as np from extensions.ops.normalize import NormalizeOp -from mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest from mo.front.kaldi.extractors.normalize_component_ext import NormalizeComponentFrontExtractor -from mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading from mo.ops.op import Op +from unit_tests.mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest +from unit_tests.mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading class NormalizeComponentFrontExtractorTest(KaldiFrontExtractorTest): diff --git a/model-optimizer/mo/front/kaldi/extractors/pnorm_component_ext_test.py b/model-optimizer/unit_tests/mo/front/kaldi/extractors/pnorm_component_ext_test.py similarity index 85% rename from model-optimizer/mo/front/kaldi/extractors/pnorm_component_ext_test.py rename to model-optimizer/unit_tests/mo/front/kaldi/extractors/pnorm_component_ext_test.py index 2abcda4491e..819f2d51b32 100644 --- a/model-optimizer/mo/front/kaldi/extractors/pnorm_component_ext_test.py +++ b/model-optimizer/unit_tests/mo/front/kaldi/extractors/pnorm_component_ext_test.py @@ -4,10 +4,10 @@ import numpy as np from extensions.ops.pnorm import PNormOp -from mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest from mo.front.kaldi.extractors.pnorm_component_ext import PNormComponentFrontExtractor -from mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading from mo.ops.op import Op +from unit_tests.mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest +from unit_tests.mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading class PNormComponentFrontExtractorTest(KaldiFrontExtractorTest): diff --git a/model-optimizer/mo/front/kaldi/extractors/rescale_ext_test.py b/model-optimizer/unit_tests/mo/front/kaldi/extractors/rescale_ext_test.py similarity index 89% rename from model-optimizer/mo/front/kaldi/extractors/rescale_ext_test.py rename to model-optimizer/unit_tests/mo/front/kaldi/extractors/rescale_ext_test.py index 28edd99b9dd..ba98d6582e7 100644 --- a/model-optimizer/mo/front/kaldi/extractors/rescale_ext_test.py +++ b/model-optimizer/unit_tests/mo/front/kaldi/extractors/rescale_ext_test.py @@ -3,11 +3,11 @@ import numpy as np -from mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest from mo.front.kaldi.extractors.rescale_ext import RescaleFrontExtractor -from mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading from mo.ops.op import Op from mo.ops.scale_shift import ScaleShiftOp +from unit_tests.mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest +from unit_tests.mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading class RescaleFrontExtractorTest(KaldiFrontExtractorTest): diff --git a/model-optimizer/mo/front/kaldi/extractors/scale_component_ext_test.py b/model-optimizer/unit_tests/mo/front/kaldi/extractors/scale_component_ext_test.py similarity index 87% rename from model-optimizer/mo/front/kaldi/extractors/scale_component_ext_test.py rename to model-optimizer/unit_tests/mo/front/kaldi/extractors/scale_component_ext_test.py index eb7b022c8f6..86aed2ac1ab 100644 --- a/model-optimizer/mo/front/kaldi/extractors/scale_component_ext_test.py +++ b/model-optimizer/unit_tests/mo/front/kaldi/extractors/scale_component_ext_test.py @@ -4,10 +4,10 @@ import numpy as np from mo.front.kaldi.extractors.scale_component_ext import FixedScaleComponentFrontExtractor -from mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest -from mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading from mo.ops.op import Op from mo.ops.scale_shift import ScaleShiftOp +from unit_tests.mo.front.kaldi.extractors.common_ext_test import KaldiFrontExtractorTest +from unit_tests.mo.front.kaldi.loader.utils_test import TestKaldiUtilsLoading class FixedScaleComponentFrontExtractorTest(KaldiFrontExtractorTest): diff --git a/model-optimizer/unit_tests/mo/front/kaldi/loader/__init__.py b/model-optimizer/unit_tests/mo/front/kaldi/loader/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/mo/front/kaldi/loader/loader_test.py b/model-optimizer/unit_tests/mo/front/kaldi/loader/loader_test.py similarity index 99% rename from model-optimizer/mo/front/kaldi/loader/loader_test.py rename to model-optimizer/unit_tests/mo/front/kaldi/loader/loader_test.py index 43b20f2ea36..1504017fc02 100644 --- a/model-optimizer/mo/front/kaldi/loader/loader_test.py +++ b/model-optimizer/unit_tests/mo/front/kaldi/loader/loader_test.py @@ -10,7 +10,7 @@ import numpy as np from mo.front.kaldi.loader.loader import load_topology_map, load_components from mo.graph.graph import Graph, Node from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestKaldiModelsLoading(unittest.TestCase): diff --git a/model-optimizer/mo/front/kaldi/loader/utils_test.py b/model-optimizer/unit_tests/mo/front/kaldi/loader/utils_test.py similarity index 100% rename from model-optimizer/mo/front/kaldi/loader/utils_test.py rename to model-optimizer/unit_tests/mo/front/kaldi/loader/utils_test.py diff --git a/model-optimizer/unit_tests/mo/front/mxnet/__init__.py b/model-optimizer/unit_tests/mo/front/mxnet/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/unit_tests/mo/front/mxnet/extractors/__init__.py b/model-optimizer/unit_tests/mo/front/mxnet/extractors/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/mo/front/mxnet/extractors/multibox_prior_test.py b/model-optimizer/unit_tests/mo/front/mxnet/extractors/multibox_prior_test.py similarity index 100% rename from model-optimizer/mo/front/mxnet/extractors/multibox_prior_test.py rename to model-optimizer/unit_tests/mo/front/mxnet/extractors/multibox_prior_test.py diff --git a/model-optimizer/mo/front/mxnet/extractors/relu_test.py b/model-optimizer/unit_tests/mo/front/mxnet/extractors/relu_test.py similarity index 95% rename from model-optimizer/mo/front/mxnet/extractors/relu_test.py rename to model-optimizer/unit_tests/mo/front/mxnet/extractors/relu_test.py index df903c894e4..743210b17bf 100644 --- a/model-optimizer/mo/front/mxnet/extractors/relu_test.py +++ b/model-optimizer/unit_tests/mo/front/mxnet/extractors/relu_test.py @@ -5,7 +5,7 @@ import unittest from mo.front.mxnet.extractors.relu import ReLUFrontExtractor from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestReluFrontExtractorOp(unittest.TestCase): diff --git a/model-optimizer/mo/front/mxnet/extractors/slice_axis_test.py b/model-optimizer/unit_tests/mo/front/mxnet/extractors/slice_axis_test.py similarity index 98% rename from model-optimizer/mo/front/mxnet/extractors/slice_axis_test.py rename to model-optimizer/unit_tests/mo/front/mxnet/extractors/slice_axis_test.py index 78596bc7066..ee91b638f19 100644 --- a/model-optimizer/mo/front/mxnet/extractors/slice_axis_test.py +++ b/model-optimizer/unit_tests/mo/front/mxnet/extractors/slice_axis_test.py @@ -9,7 +9,7 @@ from mo.front.mxnet.extractors.slice_axis import mxnet_slice_axis_infer from mo.front.mxnet.extractors.slice_axis import slice_axis_ext from mo.front.mxnet.extractors.utils import AttrDictionary from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestMXNetSliceAxisExtractorOp(unittest.TestCase): diff --git a/model-optimizer/mo/front/mxnet/extractors/utils_test.py b/model-optimizer/unit_tests/mo/front/mxnet/extractors/utils_test.py similarity index 100% rename from model-optimizer/mo/front/mxnet/extractors/utils_test.py rename to model-optimizer/unit_tests/mo/front/mxnet/extractors/utils_test.py diff --git a/model-optimizer/mo/front/mxnet/loader_test.py b/model-optimizer/unit_tests/mo/front/mxnet/loader_test.py similarity index 100% rename from model-optimizer/mo/front/mxnet/loader_test.py rename to model-optimizer/unit_tests/mo/front/mxnet/loader_test.py diff --git a/model-optimizer/unit_tests/mo/front/tf/__init__.py b/model-optimizer/unit_tests/mo/front/tf/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/unit_tests/mo/front/tf/extractors/__init__.py b/model-optimizer/unit_tests/mo/front/tf/extractors/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/mo/front/tf/extractors/concat_test.py b/model-optimizer/unit_tests/mo/front/tf/extractors/concat_test.py similarity index 90% rename from model-optimizer/mo/front/tf/extractors/concat_test.py rename to model-optimizer/unit_tests/mo/front/tf/extractors/concat_test.py index 576de3f2dfa..3ce99dd40b9 100644 --- a/model-optimizer/mo/front/tf/extractors/concat_test.py +++ b/model-optimizer/unit_tests/mo/front/tf/extractors/concat_test.py @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 from mo.front.tf.extractors.concat import tf_concat_ext -from mo.utils.unittest.extractors import PB, BaseExtractorsTestingClass +from unit_tests.utils.extractors import PB, BaseExtractorsTestingClass class ConcatExtractorTest(BaseExtractorsTestingClass): diff --git a/model-optimizer/mo/front/tf/extractors/identity_test.py b/model-optimizer/unit_tests/mo/front/tf/extractors/identity_test.py similarity index 89% rename from model-optimizer/mo/front/tf/extractors/identity_test.py rename to model-optimizer/unit_tests/mo/front/tf/extractors/identity_test.py index 022c49f2596..5ff3a0b6869 100644 --- a/model-optimizer/mo/front/tf/extractors/identity_test.py +++ b/model-optimizer/unit_tests/mo/front/tf/extractors/identity_test.py @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 from mo.front.tf.extractors.identity import tf_identity_ext -from mo.utils.unittest.extractors import BaseExtractorsTestingClass +from unit_tests.utils.extractors import BaseExtractorsTestingClass class IdentityExtractorTest(BaseExtractorsTestingClass): diff --git a/model-optimizer/mo/front/tf/extractors/utils_test.py b/model-optimizer/unit_tests/mo/front/tf/extractors/utils_test.py similarity index 99% rename from model-optimizer/mo/front/tf/extractors/utils_test.py rename to model-optimizer/unit_tests/mo/front/tf/extractors/utils_test.py index 8024491fd4c..b2ba651fba2 100644 --- a/model-optimizer/mo/front/tf/extractors/utils_test.py +++ b/model-optimizer/unit_tests/mo/front/tf/extractors/utils_test.py @@ -8,7 +8,7 @@ import numpy as np from mo.front.common.partial_infer.utils import int64_array from mo.front.tf.extractors.utils import collect_tf_attrs, tf_tensor_content -from mo.utils.unittest.extractors import PB +from unit_tests.utils.extractors import PB class AttrParsingTest(unittest.TestCase): diff --git a/model-optimizer/mo/front/tf/loader_test.py b/model-optimizer/unit_tests/mo/front/tf/loader_test.py similarity index 100% rename from model-optimizer/mo/front/tf/loader_test.py rename to model-optimizer/unit_tests/mo/front/tf/loader_test.py diff --git a/model-optimizer/unit_tests/mo/graph/__init__.py b/model-optimizer/unit_tests/mo/graph/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/mo/graph/connection_test.py b/model-optimizer/unit_tests/mo/graph/connection_test.py similarity index 99% rename from model-optimizer/mo/graph/connection_test.py rename to model-optimizer/unit_tests/mo/graph/connection_test.py index 067012252aa..ca22e3def70 100644 --- a/model-optimizer/mo/graph/connection_test.py +++ b/model-optimizer/unit_tests/mo/graph/connection_test.py @@ -5,7 +5,7 @@ import unittest from mo.graph.graph import Node, Graph from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph, regular_op +from unit_tests.utils.graph import build_graph, regular_op nodes = { **regular_op('input', {'type': 'Parameter'}), diff --git a/model-optimizer/mo/graph/graph_test.py b/model-optimizer/unit_tests/mo/graph/graph_test.py similarity index 99% rename from model-optimizer/mo/graph/graph_test.py rename to model-optimizer/unit_tests/mo/graph/graph_test.py index 8d82c0a06f1..4d8e5f4813c 100644 --- a/model-optimizer/mo/graph/graph_test.py +++ b/model-optimizer/unit_tests/mo/graph/graph_test.py @@ -6,11 +6,12 @@ import unittest import numpy as np from generator import generator, generate -from mo.graph.graph import Node, Graph, add_opoutput, dict_includes_compare_attrs, get_edge_attribute_between_nodes, set_edge_attribute_between_nodes +from mo.graph.graph import Node, Graph, add_opoutput, dict_includes_compare_attrs, get_edge_attribute_between_nodes, \ + set_edge_attribute_between_nodes from mo.ops.const import Const from mo.utils.error import Error from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes = { '0': {'name': 'input1', 'type': 'Identity', 'value': None, 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/mo/graph/port_test.py b/model-optimizer/unit_tests/mo/graph/port_test.py similarity index 98% rename from model-optimizer/mo/graph/port_test.py rename to model-optimizer/unit_tests/mo/graph/port_test.py index 2064eb77248..524e38dd33e 100644 --- a/model-optimizer/mo/graph/port_test.py +++ b/model-optimizer/unit_tests/mo/graph/port_test.py @@ -4,7 +4,7 @@ import unittest from mo.graph.graph import Node -from mo.utils.unittest.graph import build_graph, regular_op, valued_const_with_data, result, connect +from unit_tests.utils.graph import build_graph, regular_op, valued_const_with_data, result, connect nodes = { **regular_op('input', {'type': 'Parameter'}), diff --git a/model-optimizer/mo/main_test.py b/model-optimizer/unit_tests/mo/main_test.py similarity index 100% rename from model-optimizer/mo/main_test.py rename to model-optimizer/unit_tests/mo/main_test.py diff --git a/model-optimizer/unit_tests/mo/middle/__init__.py b/model-optimizer/unit_tests/mo/middle/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/unit_tests/mo/middle/passes/__init__.py b/model-optimizer/unit_tests/mo/middle/passes/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/mo/middle/passes/convert_data_type_test.py b/model-optimizer/unit_tests/mo/middle/passes/convert_data_type_test.py similarity index 98% rename from model-optimizer/mo/middle/passes/convert_data_type_test.py rename to model-optimizer/unit_tests/mo/middle/passes/convert_data_type_test.py index 34ddaa1a86f..87fca118406 100644 --- a/model-optimizer/mo/middle/passes/convert_data_type_test.py +++ b/model-optimizer/unit_tests/mo/middle/passes/convert_data_type_test.py @@ -8,7 +8,7 @@ import numpy as np from mo.front.common.partial_infer.utils import int64_array from mo.middle.passes.convert_data_type import convert_blobs, SUPPORTED_DATA_TYPES from mo.utils.error import Error -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'data_node': {'kind': 'data', 'value': None, 'shape': int64_array([5])}, 'op_node': { 'kind': 'op', 'op': 'Result'}} diff --git a/model-optimizer/mo/middle/passes/eliminate_test.py b/model-optimizer/unit_tests/mo/middle/passes/eliminate_test.py similarity index 99% rename from model-optimizer/mo/middle/passes/eliminate_test.py rename to model-optimizer/unit_tests/mo/middle/passes/eliminate_test.py index 4d935609565..30ccfe9e19c 100644 --- a/model-optimizer/mo/middle/passes/eliminate_test.py +++ b/model-optimizer/unit_tests/mo/middle/passes/eliminate_test.py @@ -7,7 +7,7 @@ import numpy as np from mo.graph.graph import Node from mo.middle.passes.eliminate import mark_output_reachable_nodes, mark_const_producer_nodes -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'placeholder_1': {'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, 'placeholder_2': {'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/unit_tests/mo/middle/passes/fusing/__init__.py b/model-optimizer/unit_tests/mo/middle/passes/fusing/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/mo/middle/passes/fusing/decomposition_test.py b/model-optimizer/unit_tests/mo/middle/passes/fusing/decomposition_test.py similarity index 99% rename from model-optimizer/mo/middle/passes/fusing/decomposition_test.py rename to model-optimizer/unit_tests/mo/middle/passes/fusing/decomposition_test.py index 8217fe12a3a..3d4050ec096 100644 --- a/model-optimizer/mo/middle/passes/fusing/decomposition_test.py +++ b/model-optimizer/unit_tests/mo/middle/passes/fusing/decomposition_test.py @@ -7,7 +7,7 @@ import numpy as np from mo.middle.passes.fusing.decomposition import convert_scale_shift_to_mul_add, convert_batch_norm from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'placeholder_1': {'shape': None, 'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/mo/middle/passes/fusing/fuse_linear_ops_test.py b/model-optimizer/unit_tests/mo/middle/passes/fusing/fuse_linear_ops_test.py similarity index 99% rename from model-optimizer/mo/middle/passes/fusing/fuse_linear_ops_test.py rename to model-optimizer/unit_tests/mo/middle/passes/fusing/fuse_linear_ops_test.py index a85bedd9336..6626d61dba0 100644 --- a/model-optimizer/mo/middle/passes/fusing/fuse_linear_ops_test.py +++ b/model-optimizer/unit_tests/mo/middle/passes/fusing/fuse_linear_ops_test.py @@ -9,7 +9,7 @@ from mo.front.common.partial_infer.eltwise import eltwise_infer from mo.graph.graph import Node from mo.middle.passes.fusing.fuse_linear_ops import _fuse_mul, fuse_linear_ops from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'placeholder_1': {'shape': None, 'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/mo/middle/passes/fusing/fuse_linear_seq_test.py b/model-optimizer/unit_tests/mo/middle/passes/fusing/fuse_linear_seq_test.py similarity index 99% rename from model-optimizer/mo/middle/passes/fusing/fuse_linear_seq_test.py rename to model-optimizer/unit_tests/mo/middle/passes/fusing/fuse_linear_seq_test.py index 8d10884a504..fa4012227aa 100644 --- a/model-optimizer/mo/middle/passes/fusing/fuse_linear_seq_test.py +++ b/model-optimizer/unit_tests/mo/middle/passes/fusing/fuse_linear_seq_test.py @@ -7,7 +7,7 @@ import numpy as np from mo.middle.passes.fusing.fuse_linear_seq import fuse_mul_add_sequence from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'placeholder_1': {'shape': None, 'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/mo/middle/passes/fusing/helpers_test.py b/model-optimizer/unit_tests/mo/middle/passes/fusing/helpers_test.py similarity index 99% rename from model-optimizer/mo/middle/passes/fusing/helpers_test.py rename to model-optimizer/unit_tests/mo/middle/passes/fusing/helpers_test.py index 1cd97681abb..a95f25d5eb2 100644 --- a/model-optimizer/mo/middle/passes/fusing/helpers_test.py +++ b/model-optimizer/unit_tests/mo/middle/passes/fusing/helpers_test.py @@ -6,7 +6,7 @@ import unittest from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node from mo.middle.passes.fusing.helpers import forward_bfs, backward_bfs, get_next_operation, common_bfs -from mo.utils.unittest.graph import build_graph, regular_op_with_shaped_data, connect, const, result, \ +from unit_tests.utils.graph import build_graph, regular_op_with_shaped_data, connect, result, \ valued_const_with_data, connect_data nodes_attributes = { diff --git a/model-optimizer/mo/middle/passes/fusing/mark_unfused_nodes_test.py b/model-optimizer/unit_tests/mo/middle/passes/fusing/mark_unfused_nodes_test.py similarity index 99% rename from model-optimizer/mo/middle/passes/fusing/mark_unfused_nodes_test.py rename to model-optimizer/unit_tests/mo/middle/passes/fusing/mark_unfused_nodes_test.py index 148863bcb04..b93f75a936f 100644 --- a/model-optimizer/mo/middle/passes/fusing/mark_unfused_nodes_test.py +++ b/model-optimizer/unit_tests/mo/middle/passes/fusing/mark_unfused_nodes_test.py @@ -6,7 +6,7 @@ import unittest import numpy as np from mo.middle.passes.fusing.mark_unfused_nodes import mark_unfused_nodes -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'placeholder_1': {'shape': None, 'type': 'Parameter', 'kind': 'op', 'op': 'Parameter'}, diff --git a/model-optimizer/mo/middle/passes/fusing/resnet_optimization_test.py b/model-optimizer/unit_tests/mo/middle/passes/fusing/resnet_optimization_test.py similarity index 99% rename from model-optimizer/mo/middle/passes/fusing/resnet_optimization_test.py rename to model-optimizer/unit_tests/mo/middle/passes/fusing/resnet_optimization_test.py index db51878bb98..b7129db0b3a 100644 --- a/model-optimizer/mo/middle/passes/fusing/resnet_optimization_test.py +++ b/model-optimizer/unit_tests/mo/middle/passes/fusing/resnet_optimization_test.py @@ -11,7 +11,7 @@ from mo.middle.passes.fusing.resnet_optimization import stride_optimization from mo.ops.convolution import Convolution from mo.ops.pooling import Pooling from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph max_elt_lambda = lambda node: eltwise_infer(node, lambda a, b: np.maximum(a, b)) diff --git a/model-optimizer/mo/middle/passes/infer_test.py b/model-optimizer/unit_tests/mo/middle/passes/infer_test.py similarity index 99% rename from model-optimizer/mo/middle/passes/infer_test.py rename to model-optimizer/unit_tests/mo/middle/passes/infer_test.py index 1745e651775..02b48357f6a 100644 --- a/model-optimizer/mo/middle/passes/infer_test.py +++ b/model-optimizer/unit_tests/mo/middle/passes/infer_test.py @@ -9,7 +9,7 @@ from mo.front.common.partial_infer.concat import concat_infer from mo.graph.graph import Node from mo.middle.passes.infer import override_placeholder_shapes, partial_infer from mo.utils.error import Error -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'type': 'Identity', 'value': None, 'kind': 'op'}, 'node_1_data': {'value': None, 'kind': 'data', 'data_type': None}, diff --git a/model-optimizer/unit_tests/mo/ops/__init__.py b/model-optimizer/unit_tests/mo/ops/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/mo/ops/broadcast_test.py b/model-optimizer/unit_tests/mo/ops/broadcast_test.py similarity index 96% rename from model-optimizer/mo/ops/broadcast_test.py rename to model-optimizer/unit_tests/mo/ops/broadcast_test.py index cbca711ebbb..5b0bc5e6060 100644 --- a/model-optimizer/mo/ops/broadcast_test.py +++ b/model-optimizer/unit_tests/mo/ops/broadcast_test.py @@ -9,7 +9,7 @@ from generator import generator, generate from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node from mo.ops.broadcast import Broadcast -from mo.utils.unittest.graph import build_graph, valued_const_with_data, regular_op_with_empty_data, \ +from unit_tests.utils.graph import build_graph, valued_const_with_data, regular_op_with_empty_data, \ shaped_data diff --git a/model-optimizer/mo/ops/concat_test.py b/model-optimizer/unit_tests/mo/ops/concat_test.py similarity index 95% rename from model-optimizer/mo/ops/concat_test.py rename to model-optimizer/unit_tests/mo/ops/concat_test.py index db92343f10d..d6fa631a31c 100644 --- a/model-optimizer/mo/ops/concat_test.py +++ b/model-optimizer/unit_tests/mo/ops/concat_test.py @@ -7,7 +7,7 @@ import numpy as np from mo.front.common.partial_infer.concat import concat_infer from mo.ops.concat import Concat -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestConcatOp(unittest.TestCase): diff --git a/model-optimizer/mo/ops/convolution_test.py b/model-optimizer/unit_tests/mo/ops/convolution_test.py similarity index 99% rename from model-optimizer/mo/ops/convolution_test.py rename to model-optimizer/unit_tests/mo/ops/convolution_test.py index 2f555c1d42a..68a1d5f6bca 100644 --- a/model-optimizer/mo/ops/convolution_test.py +++ b/model-optimizer/unit_tests/mo/ops/convolution_test.py @@ -9,8 +9,8 @@ from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node from mo.ops.convolution import Convolution from mo.utils.error import Error -from mo.utils.unittest.extractors import FakeValue -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.extractors import FakeValue +from unit_tests.utils.graph import build_graph nodes_attributes = {'conv_input': {'value': None, 'kind': 'data'}, 'conv_node': {'type': 'Convolution', 'kind': 'op'}, diff --git a/model-optimizer/mo/ops/crop_test.py b/model-optimizer/unit_tests/mo/ops/crop_test.py similarity index 99% rename from model-optimizer/mo/ops/crop_test.py rename to model-optimizer/unit_tests/mo/ops/crop_test.py index 4f87b6b5e4f..8a7336ffe0e 100644 --- a/model-optimizer/mo/ops/crop_test.py +++ b/model-optimizer/unit_tests/mo/ops/crop_test.py @@ -8,7 +8,7 @@ import numpy as np from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node from mo.ops.crop import Crop -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestCropPartialInfer(unittest.TestCase): diff --git a/model-optimizer/mo/ops/expand_dims_test.py b/model-optimizer/unit_tests/mo/ops/expand_dims_test.py similarity index 98% rename from model-optimizer/mo/ops/expand_dims_test.py rename to model-optimizer/unit_tests/mo/ops/expand_dims_test.py index af0de5a490e..b31620997d7 100644 --- a/model-optimizer/mo/ops/expand_dims_test.py +++ b/model-optimizer/unit_tests/mo/ops/expand_dims_test.py @@ -8,7 +8,7 @@ from generator import generator, generate from mo.graph.graph import Node from mo.ops.expand_dims import ExpandDims -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'data_1': { diff --git a/model-optimizer/mo/ops/pad_test.py b/model-optimizer/unit_tests/mo/ops/pad_test.py similarity index 98% rename from model-optimizer/mo/ops/pad_test.py rename to model-optimizer/unit_tests/mo/ops/pad_test.py index 3f63d509b9f..efef1d6beb7 100644 --- a/model-optimizer/mo/ops/pad_test.py +++ b/model-optimizer/unit_tests/mo/ops/pad_test.py @@ -7,7 +7,7 @@ import numpy as np from mo.graph.graph import Node from mo.ops.pad import Pad, AttributedPad -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph class TestPadOps(unittest.TestCase): diff --git a/model-optimizer/mo/ops/pooling_test.py b/model-optimizer/unit_tests/mo/ops/pooling_test.py similarity index 99% rename from model-optimizer/mo/ops/pooling_test.py rename to model-optimizer/unit_tests/mo/ops/pooling_test.py index 057963c8ef8..ec378e5565a 100644 --- a/model-optimizer/mo/ops/pooling_test.py +++ b/model-optimizer/unit_tests/mo/ops/pooling_test.py @@ -7,8 +7,8 @@ import numpy as np from mo.graph.graph import Node from mo.ops.pooling import Pooling -from mo.utils.unittest.graph import build_graph from mo.utils.error import Error +from unit_tests.utils.graph import build_graph nodes_attributes = {'node_1': {'value': None, 'kind': 'data'}, 'pool': {'type': 'Pooling', 'value': None, 'kind': 'op'}, diff --git a/model-optimizer/mo/ops/slice_test.py b/model-optimizer/unit_tests/mo/ops/slice_test.py similarity index 98% rename from model-optimizer/mo/ops/slice_test.py rename to model-optimizer/unit_tests/mo/ops/slice_test.py index eb6454d7a6c..b56c9274196 100644 --- a/model-optimizer/mo/ops/slice_test.py +++ b/model-optimizer/unit_tests/mo/ops/slice_test.py @@ -10,7 +10,7 @@ from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node from mo.ops.slice import Slice from mo.utils.error import Error -from mo.utils.unittest.graph import build_graph, valued_const_with_data, valued_data, regular_op_with_empty_data, \ +from unit_tests.utils.graph import build_graph, valued_const_with_data, valued_data, regular_op_with_empty_data, \ connect, shaped_data, shaped_const_with_data diff --git a/model-optimizer/mo/ops/squeeze_test.py b/model-optimizer/unit_tests/mo/ops/squeeze_test.py similarity index 97% rename from model-optimizer/mo/ops/squeeze_test.py rename to model-optimizer/unit_tests/mo/ops/squeeze_test.py index 4961aa6bbb7..440763e674c 100644 --- a/model-optimizer/mo/ops/squeeze_test.py +++ b/model-optimizer/unit_tests/mo/ops/squeeze_test.py @@ -7,7 +7,7 @@ import numpy as np from mo.graph.graph import Node from mo.ops.squeeze import Squeeze -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'data': { diff --git a/model-optimizer/mo/ops/strided_slice_test.py b/model-optimizer/unit_tests/mo/ops/strided_slice_test.py similarity index 99% rename from model-optimizer/mo/ops/strided_slice_test.py rename to model-optimizer/unit_tests/mo/ops/strided_slice_test.py index 3db5e041f0c..c61f30b5d7d 100644 --- a/model-optimizer/mo/ops/strided_slice_test.py +++ b/model-optimizer/unit_tests/mo/ops/strided_slice_test.py @@ -3,15 +3,13 @@ import unittest -import numpy as np import numpy.testing as npt from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node from mo.ops.strided_slice import StridedSlice -from mo.utils.unittest.graph import build_graph -from mo.utils.unittest.graph import valued_const_with_data, result, regular_op_with_empty_data, shaped_const_with_data, \ - connect +from unit_tests.utils.graph import build_graph, valued_const_with_data, result, regular_op_with_empty_data, \ + shaped_const_with_data, connect class TestStridedSliceInfer(unittest.TestCase): diff --git a/model-optimizer/mo/ops/tile_test.py b/model-optimizer/unit_tests/mo/ops/tile_test.py similarity index 99% rename from model-optimizer/mo/ops/tile_test.py rename to model-optimizer/unit_tests/mo/ops/tile_test.py index 4e4be81d7a4..1810acb7a27 100644 --- a/model-optimizer/mo/ops/tile_test.py +++ b/model-optimizer/unit_tests/mo/ops/tile_test.py @@ -7,7 +7,7 @@ import numpy as np from mo.graph.graph import Node from mo.ops.tile import Tile, AttributedTile -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph nodes_attributes = { 'op': {'kind': 'op'}, diff --git a/model-optimizer/mo/ops/unsqueeze_test.py b/model-optimizer/unit_tests/mo/ops/unsqueeze_test.py similarity index 98% rename from model-optimizer/mo/ops/unsqueeze_test.py rename to model-optimizer/unit_tests/mo/ops/unsqueeze_test.py index 75de9de2717..2368ffa603f 100644 --- a/model-optimizer/mo/ops/unsqueeze_test.py +++ b/model-optimizer/unit_tests/mo/ops/unsqueeze_test.py @@ -10,7 +10,7 @@ from mo.front.common.partial_infer.utils import int64_array from mo.graph.graph import Node from mo.ops.unsqueeze import Unsqueeze from mo.utils.ir_engine.compare_graphs import compare_graphs -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph @generator diff --git a/model-optimizer/unit_tests/mo/pipeline/__init__.py b/model-optimizer/unit_tests/mo/pipeline/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/mo/pipeline/common_test.py b/model-optimizer/unit_tests/mo/pipeline/common_test.py similarity index 99% rename from model-optimizer/mo/pipeline/common_test.py rename to model-optimizer/unit_tests/mo/pipeline/common_test.py index 466be2a3c43..60fe74a0d46 100644 --- a/model-optimizer/mo/pipeline/common_test.py +++ b/model-optimizer/unit_tests/mo/pipeline/common_test.py @@ -7,7 +7,7 @@ from generator import generator, generate from mo.graph.graph import Node from mo.pipeline.common import determined_sort, get_fw_tensor_debug_info, get_sorted_outputs -from mo.utils.unittest.graph import build_graph_with_edge_attrs +from unit_tests.utils.graph import build_graph_with_edge_attrs @generator diff --git a/model-optimizer/unit_tests/mo/utils/__init__.py b/model-optimizer/unit_tests/mo/utils/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/mo/utils/broadcasting_test.py b/model-optimizer/unit_tests/mo/utils/broadcasting_test.py similarity index 92% rename from model-optimizer/mo/utils/broadcasting_test.py rename to model-optimizer/unit_tests/mo/utils/broadcasting_test.py index a82bfda615c..34000193f35 100644 --- a/model-optimizer/mo/utils/broadcasting_test.py +++ b/model-optimizer/unit_tests/mo/utils/broadcasting_test.py @@ -1,12 +1,14 @@ # Copyright (C) 2018-2021 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -from mo.front.common.partial_infer.utils import int64_array -from mo.utils.broadcasting import bi_directional_broadcasting, bi_directional_shape_broadcasting, uni_directional_broadcasting, uni_directional_shape_broadcasting -from generator import generator, generate -import numpy as np import unittest +import numpy as np +from generator import generator, generate + +from mo.front.common.partial_infer.utils import int64_array +from mo.utils.broadcasting import uni_directional_broadcasting, uni_directional_shape_broadcasting + @generator class TestingBroadcasting(unittest.TestCase): diff --git a/model-optimizer/mo/utils/cli_parser_test.py b/model-optimizer/unit_tests/mo/utils/cli_parser_test.py similarity index 100% rename from model-optimizer/mo/utils/cli_parser_test.py rename to model-optimizer/unit_tests/mo/utils/cli_parser_test.py diff --git a/model-optimizer/mo/utils/error_test.py b/model-optimizer/unit_tests/mo/utils/error_test.py similarity index 100% rename from model-optimizer/mo/utils/error_test.py rename to model-optimizer/unit_tests/mo/utils/error_test.py diff --git a/model-optimizer/mo/utils/graph_test.py b/model-optimizer/unit_tests/mo/utils/graph_test.py similarity index 100% rename from model-optimizer/mo/utils/graph_test.py rename to model-optimizer/unit_tests/mo/utils/graph_test.py diff --git a/model-optimizer/unit_tests/mo/utils/ir_engine/__init__.py b/model-optimizer/unit_tests/mo/utils/ir_engine/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/mo/utils/ir_engine/ir_engine_test.py b/model-optimizer/unit_tests/mo/utils/ir_engine/ir_engine_test.py similarity index 94% rename from model-optimizer/mo/utils/ir_engine/ir_engine_test.py rename to model-optimizer/unit_tests/mo/utils/ir_engine/ir_engine_test.py index 85d17b6fbba..74f386a38fe 100644 --- a/model-optimizer/mo/utils/ir_engine/ir_engine_test.py +++ b/model-optimizer/unit_tests/mo/utils/ir_engine/ir_engine_test.py @@ -19,10 +19,10 @@ log.basicConfig(format="[ %(levelname)s ] %(message)s", level=log.DEBUG, stream= class TestFunction(unittest.TestCase): def setUp(self): path, _ = os.path.split(os.path.dirname(__file__)) - self.xml = os.path.join(path, - "unittest", "test_data", "mxnet_synthetic_gru_bidirectional_FP16_1_v6.xml") - self.xml_negative = os.path.join(path, - "unittest", "test_data", + self.xml = os.path.join(path, os.pardir, os.pardir, + "utils", "test_data", "mxnet_synthetic_gru_bidirectional_FP16_1_v6.xml") + self.xml_negative = os.path.join(path, os.pardir, os.pardir, + "utils", "test_data", "mxnet_synthetic_gru_bidirectional_FP16_1_v6_negative.xml") self.bin = os.path.splitext(self.xml)[0] + '.bin' self.assertTrue(os.path.exists(self.xml), 'XML file not found: {}'.format(self.xml)) @@ -85,7 +85,7 @@ class TestFunction(unittest.TestCase): @unittest.mock.patch('numpy.savez_compressed') def test_generate_bin_hashes_file_custom_directory(self, numpy_savez): # Generate bin_hashes file in custom directory - directory_for_file = os.path.join(os.path.split(os.path.dirname(__file__))[0], "unittest", "test_data", + directory_for_file = os.path.join(os.path.split(os.path.dirname(__file__))[0], "utils", "test_data", "bin_hash") self.IR.generate_bin_hashes_file(path_for_file=directory_for_file) numpy_savez.assert_called_once() diff --git a/model-optimizer/unit_tests/mo/utils/ir_reader/__init__.py b/model-optimizer/unit_tests/mo/utils/ir_reader/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/mo/utils/ir_reader/layer_to_class_test.py b/model-optimizer/unit_tests/mo/utils/ir_reader/layer_to_class_test.py similarity index 99% rename from model-optimizer/mo/utils/ir_reader/layer_to_class_test.py rename to model-optimizer/unit_tests/mo/utils/ir_reader/layer_to_class_test.py index 123b2ba2e95..b2f602c5de4 100644 --- a/model-optimizer/mo/utils/ir_reader/layer_to_class_test.py +++ b/model-optimizer/unit_tests/mo/utils/ir_reader/layer_to_class_test.py @@ -9,7 +9,7 @@ from generator import generator, generate from mo.graph.graph import Node from mo.utils.ir_engine.compare_graphs import compare_graphs from mo.utils.ir_reader.layer_to_class import groupconv_to_conv, restore_tensor_names -from mo.utils.unittest.graph import build_graph +from unit_tests.utils.graph import build_graph @generator diff --git a/model-optimizer/mo/utils/pipeline_config_test.py b/model-optimizer/unit_tests/mo/utils/pipeline_config_test.py similarity index 100% rename from model-optimizer/mo/utils/pipeline_config_test.py rename to model-optimizer/unit_tests/mo/utils/pipeline_config_test.py diff --git a/model-optimizer/mo/utils/simple_proto_parser_test.py b/model-optimizer/unit_tests/mo/utils/simple_proto_parser_test.py similarity index 100% rename from model-optimizer/mo/utils/simple_proto_parser_test.py rename to model-optimizer/unit_tests/mo/utils/simple_proto_parser_test.py diff --git a/model-optimizer/mo/utils/summarize_graph_test.py b/model-optimizer/unit_tests/mo/utils/summarize_graph_test.py similarity index 100% rename from model-optimizer/mo/utils/summarize_graph_test.py rename to model-optimizer/unit_tests/mo/utils/summarize_graph_test.py diff --git a/model-optimizer/mo/utils/utils_test.py b/model-optimizer/unit_tests/mo/utils/utils_test.py similarity index 100% rename from model-optimizer/mo/utils/utils_test.py rename to model-optimizer/unit_tests/mo/utils/utils_test.py diff --git a/model-optimizer/mo/utils/version_test.py b/model-optimizer/unit_tests/mo/utils/version_test.py similarity index 100% rename from model-optimizer/mo/utils/version_test.py rename to model-optimizer/unit_tests/mo/utils/version_test.py diff --git a/model-optimizer/mo/utils/versions_checker_test.py b/model-optimizer/unit_tests/mo/utils/versions_checker_test.py similarity index 100% rename from model-optimizer/mo/utils/versions_checker_test.py rename to model-optimizer/unit_tests/mo/utils/versions_checker_test.py diff --git a/model-optimizer/unit_tests/utils/__init__.py b/model-optimizer/unit_tests/utils/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/model-optimizer/mo/utils/unittest/extractors.py b/model-optimizer/unit_tests/utils/extractors.py similarity index 100% rename from model-optimizer/mo/utils/unittest/extractors.py rename to model-optimizer/unit_tests/utils/extractors.py diff --git a/model-optimizer/mo/utils/unittest/graph.py b/model-optimizer/unit_tests/utils/graph.py similarity index 100% rename from model-optimizer/mo/utils/unittest/graph.py rename to model-optimizer/unit_tests/utils/graph.py diff --git a/model-optimizer/mo/utils/unittest/test_data/mxnet_synthetic_gru_bidirectional_FP16_1_v6.bin b/model-optimizer/unit_tests/utils/test_data/mxnet_synthetic_gru_bidirectional_FP16_1_v6.bin similarity index 100% rename from model-optimizer/mo/utils/unittest/test_data/mxnet_synthetic_gru_bidirectional_FP16_1_v6.bin rename to model-optimizer/unit_tests/utils/test_data/mxnet_synthetic_gru_bidirectional_FP16_1_v6.bin diff --git a/model-optimizer/mo/utils/unittest/test_data/mxnet_synthetic_gru_bidirectional_FP16_1_v6.xml b/model-optimizer/unit_tests/utils/test_data/mxnet_synthetic_gru_bidirectional_FP16_1_v6.xml similarity index 100% rename from model-optimizer/mo/utils/unittest/test_data/mxnet_synthetic_gru_bidirectional_FP16_1_v6.xml rename to model-optimizer/unit_tests/utils/test_data/mxnet_synthetic_gru_bidirectional_FP16_1_v6.xml diff --git a/model-optimizer/mo/utils/unittest/test_data/mxnet_synthetic_gru_bidirectional_FP16_1_v6_negative.xml b/model-optimizer/unit_tests/utils/test_data/mxnet_synthetic_gru_bidirectional_FP16_1_v6_negative.xml similarity index 100% rename from model-optimizer/mo/utils/unittest/test_data/mxnet_synthetic_gru_bidirectional_FP16_1_v6_negative.xml rename to model-optimizer/unit_tests/utils/test_data/mxnet_synthetic_gru_bidirectional_FP16_1_v6_negative.xml