From 602f8f2e08181fff07c8ce5a217854f0f9beab92 Mon Sep 17 00:00:00 2001 From: Irina Efode Date: Tue, 15 Dec 2020 22:32:00 +0300 Subject: [PATCH] [IE TESTS] Move SLT classes to `SharedTestClasses` lib & add serialization functionality to the common class (#3431) * [IE TESTS] Changing functional test utils structure * Example * Remove extra * Apply comments * fixes * [IE TESTS] Change the structure * Continue * step 3 * [IE TESTS] Complete transition single layer test classes * [IE TESTS] Transition Subgraph * Fix subgraph namespaces * fix * Apply comments * latm fix --- .../tests/functional/core_config.cpp | 8 + .../tests/functional/plugin_config.cpp | 8 - .../tests/functional/CMakeLists.txt | 1 + .../inference_engine/CMakeLists.txt | 2 + .../keep_constant_inputs_tests.cpp | 2 +- .../serialization/core_config.cpp | 8 + .../single_layer/variadic_split.cpp | 39 +++ .../plugin/cpu/bfloat16/bfloat16_helpers.hpp | 2 +- .../cpu/bfloat16/conv_eltwise_depthwise.cpp | 2 +- .../plugin/cpu/bfloat16/memory_conv.cpp | 2 +- .../behavior/set_preprocess.cpp | 2 +- .../{plugin_config.cpp => core_config.cpp} | 4 +- .../layer_transformation.cpp | 8 +- .../subgraph_tests/constant_result.cpp | 2 +- .../subgraph_tests/conv_eltwise_fusion.cpp | 2 +- .../convert_pad_to_group_conv.cpp | 2 +- .../subgraph_tests/matmul_squeeze_add.cpp | 2 +- .../subgraph_tests/multiply_add.cpp | 2 +- .../quantized_convolution_backprop_data.cpp | 2 +- .../quantized_group_convolution.cpp | 2 +- ...ntized_group_convolution_backprop_data.cpp | 2 +- .../subgraph_tests/quantized_mat_mul.cpp | 2 +- .../subgraph_tests/range_add.cpp | 2 +- .../subgraph_tests/relu_shape_of.cpp | 2 +- .../reshape_squeeze_reshape_relu.cpp | 2 +- .../subgraph_tests/split_concat_memory.cpp | 2 +- .../subgraph_tests/split_conv_concat.cpp | 2 +- .../cpu/single_layer_tests/activation.cpp | 2 +- .../plugin/cpu/single_layer_tests/convert.cpp | 2 +- .../plugin/cpu/single_layer_tests/crop.cpp | 2 +- .../plugin/cpu/single_layer_tests/eltwise.cpp | 2 +- .../single_layer_tests/group_convolution.cpp | 5 +- .../cpu/single_layer_tests/interpolate.cpp | 2 +- .../plugin/cpu/single_layer_tests/logical.cpp | 2 +- .../plugin/cpu/single_layer_tests/mvn.cpp | 2 +- .../cpu/single_layer_tests/normalize.cpp | 2 +- .../plugin/cpu/single_layer_tests/permute.cpp | 2 +- .../cpu/single_layer_tests/reduce_ops.cpp | 2 +- .../cpu/single_layer_tests/region_yolo.cpp | 2 +- .../subgraph_tests/include/conv_concat.hpp | 6 +- .../include/fuse_permute_reorder.hpp | 6 +- .../cpu/subgraph_tests/src/conv_concat.cpp | 4 +- .../cpu/subgraph_tests/src/eltwise_chain.cpp | 6 +- .../src/fuse_permute_reorder.cpp | 4 +- ...shape_permute_conv_permute_reshape_act.cpp | 4 +- .../plugin/cpu/test_utils/cpu_test_utils.hpp | 2 +- .../plugin/gna/pass_tests/4d_eltwise.cpp | 2 +- .../eltwise_split_over_channels_pass.cpp | 2 +- .../remove_permutations_NHWC_to_NCHW_pass.cpp | 2 +- .../{plugin_config.cpp => core_config.cpp} | 4 +- .../activation_concats_eltwise.cpp | 2 +- .../subgraph_tests/basic_lstm.cpp | 2 +- .../subgraph_tests/broadcast_power.cpp | 2 +- .../subgraph_tests/cascade_concat.cpp | 2 +- .../subgraph_tests/concat_multi_input.cpp | 2 +- .../subgraph_tests/concat_quantization.cpp | 2 +- .../subgraph_tests/constant_result.cpp | 2 +- .../subgraph_tests/delayed_copy_layer.cpp | 2 +- .../first_connect_input_concat.cpp | 2 +- .../handling_orientation_conv.cpp | 2 +- .../subgraph_tests/input_conv.cpp | 2 +- .../subgraph_tests/matmul_squeeze_add.cpp | 2 +- .../multioutput_eltwise_squeeze_eltwise.cpp | 2 +- .../negative_memory_layer_offset.cpp | 2 +- ...shape_permute_conv_permute_reshape_act.cpp | 4 +- .../reshape_squeeze_reshape_relu.cpp | 2 +- .../reshapre_permute_reshape.cpp | 2 +- .../subgraph_tests/scale_shift.cpp | 2 +- .../subgraph_tests/softsign.cpp | 2 +- .../subgraph_tests/split_conv_concat.cpp | 2 +- .../subgraph_tests/split_relu.cpp | 2 +- .../split_trivial_permute_concat.cpp | 2 +- .../subgraph_tests/trivial_concat.cpp | 2 +- .../two_fake_quantize_to_fullyconnected.cpp | 2 +- .../behavior/set_preprocess.cpp | 2 +- .../shared_tests_instances/core_config.cpp | 8 + .../layer_transformation.cpp | 10 +- .../shared_tests_instances/plugin_config.cpp | 8 - .../subgraph_tests/constant_result.cpp | 2 +- .../subgraph_tests/matmul_squeeze_add.cpp | 2 +- .../subgraph_tests/multiply_add.cpp | 2 +- ...shape_permute_conv_permute_reshape_act.cpp | 4 +- .../reshape_squeeze_reshape_relu.cpp | 2 +- .../subgraph_tests/scale_shift.cpp | 2 +- .../subgraph_tests/split_conv_concat.cpp | 2 +- .../operations/dynamic_shape_resolver.cpp | 2 +- .../behavior/set_preprocess.cpp | 2 +- .../shared_tests_instances/core_config.cpp | 8 + .../shared_tests_instances/plugin_config.cpp | 8 - .../subgraph_tests/constant_result.cpp | 2 +- .../reshape_squeeze_reshape_relu.cpp | 2 +- .../subgraph_tests/split_conv_concat.cpp | 2 +- .../out_shape_of_reshape.cpp | 2 +- .../static_shape_broadcast.cpp | 2 +- .../single_layer_tests/static_shape_nms.cpp | 2 +- .../static_shape_nonzero.cpp | 2 +- .../subgraph_tests/concat_split_transpose.cpp | 2 +- .../subgraph_tests/dsr_binary_elementwise.cpp | 2 +- .../myriad/subgraph_tests/dsr_clamp.cpp | 2 +- .../myriad/subgraph_tests/dsr_concat.cpp | 2 +- .../myriad/subgraph_tests/dsr_convert.cpp | 2 +- .../myriad/subgraph_tests/dsr_gather.cpp | 2 +- .../myriad/subgraph_tests/dsr_gather_nd.cpp | 2 +- .../myriad/subgraph_tests/dsr_matmul.cpp | 2 +- .../myriad/subgraph_tests/dsr_roialign.cpp | 2 +- .../myriad/subgraph_tests/dsr_squeeze.cpp | 2 +- .../subgraph_tests/dsr_strided_slice.cpp | 2 +- .../subgraph_tests/dsr_tests_common.hpp | 2 +- .../subgraph_tests/dsr_unary_elementwise.cpp | 2 +- .../myriad/subgraph_tests/nms_nonzero.cpp | 2 +- .../subgraph_tests/nonzero_transpose.cpp | 2 +- .../functional/plugin/shared/CMakeLists.txt | 1 + .../include/base}/behavior_test_utils.hpp | 0 .../import_export_base/import_export_base.hpp | 2 +- .../plugin/shared/include/behavior/config.hpp | 4 +- .../include/behavior/exec_graph_info.hpp | 4 +- .../shared/include/behavior/infer_request.hpp | 8 +- .../behavior/infer_request_callback.hpp | 4 +- .../behavior/infer_request_cancellation.hpp | 17 +- .../include/behavior/infer_request_config.hpp | 4 +- .../include/behavior/infer_request_input.hpp | 4 +- .../include/behavior/infer_request_output.hpp | 4 +- .../behavior/invalid_cases/proposal.hpp | 2 +- .../shared/include/behavior/perf_counters.hpp | 4 +- .../shared/include/behavior/preprocessing.hpp | 4 +- .../shared/include/behavior/set_blob.hpp | 2 +- .../include/behavior/set_blob_of_kind.hpp | 2 +- .../include/behavior/set_preprocess.hpp | 4 +- .../shared/include/behavior/stress_tests.hpp | 2 +- .../shared/include/behavior/test_plugin.hpp | 4 +- .../shared/include/behavior/version.hpp | 4 +- .../num_inputs_fusing_bin_conv.hpp | 2 +- .../unique_node_names.hpp | 2 +- .../shared/include/hetero/query_network.hpp | 2 +- .../shared/include/hetero/synthetic.hpp | 2 +- .../import_export_tests/import_nonzero.hpp | 2 +- .../import_reshape_permute_conv.hpp | 2 +- .../add_transformation.hpp | 2 +- .../clamp_transformation.hpp | 2 +- .../concat_transformation.hpp | 2 +- ...cat_with_different_precision_on_childs.hpp | 2 +- ...oncat_with_intermediate_transformation.hpp | 2 +- ...at_with_neighbors_graph_transformation.hpp | 2 +- .../concat_with_split_transformation.hpp | 2 +- .../convolution_transformation.hpp | 2 +- .../convolution_with_incorrect_weights.hpp | 2 +- .../depth_to_space_transformation.hpp | 2 +- ...e_quantize_and_avg_pool_transformation.hpp | 2 +- ...e_quantize_and_max_pool_transformation.hpp | 2 +- ...d_two_output_branches_with_convolution.hpp | 2 +- ...ize_precision_selection_transformation.hpp | 2 +- .../fake_quantize_transformation.hpp | 2 +- .../fully_connected_transformation.hpp | 2 +- .../fuse_convert_transformation.hpp | 2 +- ...uantize_and_scale_shift_transformation.hpp | 2 +- .../fuse_fake_quantize_transformation.hpp | 2 +- ...ltiply_to_fake_quantize_transformation.hpp | 2 +- ...btract_to_fake_quantize_transformation.hpp | 2 +- .../gemm_transformation.hpp | 2 +- .../group_convolution_transformation.hpp | 2 +- .../interpolate_transformation.hpp | 2 +- .../mat_mul_transformation.hpp | 2 +- .../mat_mul_with_constant_transformation.hpp | 2 +- ..._constant_fake_quantize_transformation.hpp | 2 +- ...ly_to_group_convolution_transformation.hpp | 2 +- .../multiply_transformation.hpp | 2 +- ...ultiply_with_one_parent_transformation.hpp | 2 +- .../mvn_transformation.hpp | 2 +- .../normalize_transformation.hpp | 2 +- ...put_layers_handling_in_transformations.hpp | 2 +- ...handling_in_transformations_for_concat.hpp | 2 +- ...ansformations_for_concat_multi_channel.hpp | 2 +- .../prelu_transformation.hpp | 2 +- .../relu_transformation.hpp | 2 +- .../reshape_transformation.hpp | 2 +- .../split_transformation.hpp | 2 +- .../squeeze_transformation.hpp | 2 +- ...ultiply_to_multiply_add_transformation.hpp | 2 +- .../subtract_transformation.hpp | 2 +- .../transpose_after_matmul_transformation.hpp | 2 +- .../transpose_transformation.hpp | 2 +- .../unsqueeze_transformation.hpp | 2 +- .../variadic_split_transformation.hpp | 2 +- .../conv_bias_fusion.hpp | 2 +- .../plugin_specific_ngraph_conversion.hpp | 2 +- .../include/single_layer_tests/activation.hpp | 111 +----- .../include/single_layer_tests/batch_norm.hpp | 26 +- .../single_layer_tests/batch_to_space.hpp | 25 +- .../include/single_layer_tests/broadcast.hpp | 31 +- .../include/single_layer_tests/comparison.hpp | 35 +- .../include/single_layer_tests/concat.hpp | 30 +- .../include/single_layer_tests/convert.hpp | 26 +- .../single_layer_tests/convert_like.hpp | 27 +- .../single_layer_tests/convolution.hpp | 42 +-- .../convolution_backprop_data.hpp | 42 +-- .../single_layer_tests/ctc_greedy_decoder.hpp | 47 +-- .../include/single_layer_tests/ctc_loss.hpp | 36 +- .../include/single_layer_tests/cum_sum.hpp | 22 +- .../single_layer_tests/depth_to_space.hpp | 25 +- .../single_layer_tests/detection_output.hpp | 62 +--- .../include/single_layer_tests/eltwise.hpp | 39 +-- .../embedding_bag_offsets_sum.hpp | 32 +- .../embedding_bag_packed_sum.hpp | 30 +- .../embedding_segments_sum.hpp | 33 +- .../extract_image_patches.hpp | 28 +- .../single_layer_tests/fake_quantize.hpp | 55 +-- .../include/single_layer_tests/gather.hpp | 35 +- .../include/single_layer_tests/gather_nd.hpp | 33 +- .../single_layer_tests/gather_tree.hpp | 29 +- .../shared/include/single_layer_tests/grn.hpp | 48 +-- .../single_layer_tests/group_convolution.hpp | 41 +-- .../group_convolution_backprop_data.hpp | 39 +-- .../include/single_layer_tests/gru_cell.hpp | 29 +- .../single_layer_tests/gru_sequence.hpp | 37 +- .../single_layer_tests/interpolate.hpp | 46 +-- .../single_layer_tests/log_softmax.hpp | 33 +- .../include/single_layer_tests/logical.hpp | 48 +-- .../include/single_layer_tests/loop.hpp | 331 +++++++++++------- .../shared/include/single_layer_tests/lrn.hpp | 35 +- .../include/single_layer_tests/lstm_cell.hpp | 28 +- .../single_layer_tests/lstm_sequence.hpp | 34 +- .../include/single_layer_tests/mat_mul.hpp | 34 +- .../single_layer_tests/minimum_maximum.hpp | 30 +- .../shared/include/single_layer_tests/mvn.hpp | 22 +- .../non_max_suppression.hpp | 38 +- .../include/single_layer_tests/nonzero.hpp | 29 +- .../single_layer_tests/normalize_l2.hpp | 28 +- .../shared/include/single_layer_tests/pad.hpp | 32 +- .../include/single_layer_tests/pooling.hpp | 67 +--- .../include/single_layer_tests/power.hpp | 28 +- .../prior_box_clustered.hpp | 64 +--- .../include/single_layer_tests/proposal.hpp | 60 +--- .../single_layer_tests/psroi_pooling.hpp | 40 +-- .../include/single_layer_tests/range.hpp | 43 +-- .../include/single_layer_tests/reduce_ops.hpp | 41 +-- .../single_layer_tests/region_yolo.hpp | 29 +- .../include/single_layer_tests/reorg_yolo.hpp | 23 +- .../include/single_layer_tests/reshape.hpp | 32 +- .../single_layer_tests/reverse_sequence.hpp | 27 +- .../include/single_layer_tests/rnn_cell.hpp | 28 +- .../single_layer_tests/rnn_sequence.hpp | 35 +- .../single_layer_tests/roi_pooling.hpp | 35 +- .../single_layer_tests/scatter_ND_update.hpp | 30 +- .../scatter_elements_update.hpp | 30 +- .../single_layer_tests/scatter_update.hpp | 31 +- .../include/single_layer_tests/select.hpp | 22 +- .../include/single_layer_tests/shape_of.hpp | 25 +- .../single_layer_tests/shuffle_channels.hpp | 34 +- .../include/single_layer_tests/softmax.hpp | 33 +- .../single_layer_tests/space_to_batch.hpp | 29 +- .../single_layer_tests/space_to_depth.hpp | 23 +- .../include/single_layer_tests/split.hpp | 30 +- .../single_layer_tests/squeeze_unsqueeze.hpp | 30 +- .../single_layer_tests/strided_slice.hpp | 42 +-- .../single_layer_tests/tensor_iterator.hpp | 33 +- .../include/single_layer_tests/tile.hpp | 33 +- .../include/single_layer_tests/topk.hpp | 29 +- .../include/single_layer_tests/transpose.hpp | 28 +- .../single_layer_tests/variadic_split.hpp | 33 +- .../activation_concats_eltwise.hpp | 28 +- .../include/subgraph_tests/basic_lstm.hpp | 89 +++-- .../subgraph_tests/broadcast_power.hpp | 30 +- .../include/subgraph_tests/cascade_concat.hpp | 30 +- .../subgraph_tests/concat_multi_input.hpp | 42 +-- .../subgraph_tests/concat_quantization.hpp | 38 +- .../subgraph_tests/constant_result.hpp | 25 +- .../subgraph_tests/conv_eltwise_fusion.hpp | 37 +- .../convert_pad_to_group_conv.hpp | 33 +- .../subgraph_tests/delayed_copy_layer.hpp | 32 +- .../first_connect_input_concat.hpp | 28 +- .../get_output_before_activation.hpp | 29 +- .../handling_orientation_conv.hpp | 28 +- .../include/subgraph_tests/input_conv.hpp | 38 +- .../subgraph_tests/matmul_squeeze_add.hpp | 30 +- .../subgraph_tests/memory_LSTMCell.hpp | 43 +-- .../memory_eltwise_reshape_concat.hpp | 32 +- .../multioutput_eltwise_squeeze_eltwise.hpp | 29 +- .../subgraph_tests/multiple_LSTMCell.hpp | 44 +-- .../subgraph_tests/multiple_concat.hpp | 20 +- .../include/subgraph_tests/multiply_add.hpp | 28 +- .../negative_memory_layer_offset.hpp | 35 +- .../subgraph_tests/perm_conv_perm_concat.hpp | 29 +- .../quantized_convolution_backprop_data.hpp | 40 +-- .../quantized_group_convolution.hpp | 41 +-- ...ntized_group_convolution_backprop_data.hpp | 41 +-- .../subgraph_tests/quantized_mat_mul.hpp | 31 +- .../include/subgraph_tests/range_add.hpp | 38 +- .../include/subgraph_tests/relu_shape_of.hpp | 23 +- ...shape_permute_conv_permute_reshape_act.hpp | 34 +- .../reshape_permute_reshape.hpp | 28 +- .../reshape_squeeze_reshape_relu.hpp | 30 +- .../include/subgraph_tests/scaleshift.hpp | 27 +- .../include/subgraph_tests/softsign.hpp | 34 +- .../subgraph_tests/split_concat_memory.hpp | 68 +++- .../subgraph_tests/split_conv_concat.hpp | 22 +- .../include/subgraph_tests/split_relu.hpp | 31 +- .../split_trivial_permute_concat.hpp | 32 +- .../include/subgraph_tests/trivial_concat.hpp | 27 +- .../two_fake_quantize_to_fullyconnected.hpp | 49 +-- .../import_export_base/import_export_base.cpp | 2 +- .../plugin/shared/src/behavior/set_blob.cpp | 2 +- .../shared/src/behavior/set_blob_of_kind.cpp | 3 +- .../num_inputs_fusing_bin_conv.cpp | 2 +- .../unique_node_names.cpp | 2 +- .../convolution_transformation.cpp | 2 +- .../convolution_with_incorrect_weights.cpp | 2 +- .../depth_to_space_transformation.cpp | 2 +- ...d_two_output_branches_with_convolution.cpp | 2 +- .../fully_connected_transformation.cpp | 2 +- .../fuse_convert_transformation.cpp | 2 +- .../gemm_transformation.cpp | 2 +- .../group_convolution_transformation.cpp | 2 +- ..._constant_fake_quantize_transformation.cpp | 2 +- ...ly_to_group_convolution_transformation.cpp | 2 +- .../mvn_transformation.cpp | 2 +- .../normalize_transformation.cpp | 2 +- ...put_layers_handling_in_transformations.cpp | 2 +- ...handling_in_transformations_for_concat.cpp | 2 +- ...ansformations_for_concat_multi_channel.cpp | 2 +- .../transpose_after_matmul_transformation.cpp | 2 +- .../functional/plugin/shared/src/main.cpp | 2 +- .../shared_test_classes/CMakeLists.txt | 33 ++ .../base}/layer_test_utils.hpp | 5 + .../layer_transformation.hpp | 2 +- .../single_layer/activation.hpp | 114 ++++++ .../single_layer/batch_norm.hpp | 33 ++ .../single_layer/batch_to_space.hpp | 37 ++ .../single_layer/broadcast.hpp | 35 ++ .../single_layer/comparison.hpp | 41 +++ .../single_layer/concat.hpp | 39 +++ .../single_layer/convert.hpp | 35 ++ .../single_layer/convert_like.hpp | 36 ++ .../single_layer/convolution.hpp | 49 +++ .../convolution_backprop_data.hpp | 48 +++ .../single_layer/ctc_greedy_decoder.hpp | 56 +++ .../single_layer/ctc_loss.hpp | 42 +++ .../single_layer/cum_sum.hpp | 31 ++ .../single_layer/depth_to_space.hpp | 32 ++ .../single_layer/detection_output.hpp | 71 ++++ .../single_layer/eltwise.hpp | 42 +++ .../embedding_bag_offsets_sum.hpp | 39 +++ .../single_layer/embedding_bag_packed_sum.hpp | 37 ++ .../single_layer/embedding_segments_sum.hpp | 40 +++ .../single_layer/extract_image_patches.hpp | 37 ++ .../single_layer/fake_quantize.hpp | 64 ++++ .../single_layer/gather.hpp | 44 +++ .../single_layer/gather_nd.hpp | 39 +++ .../single_layer/gather_tree.hpp | 38 ++ .../shared_test_classes/single_layer/grn.hpp | 55 +++ .../single_layer/group_convolution.hpp | 45 +++ .../group_convolution_backprop_data.hpp | 46 +++ .../single_layer/gru_cell.hpp | 38 ++ .../single_layer/gru_sequence.hpp | 46 +++ .../single_layer/interpolate.hpp | 53 +++ .../single_layer/log_softmax.hpp | 41 +++ .../single_layer/logical.hpp | 53 +++ .../shared_test_classes/single_layer/loop.hpp | 148 ++++++++ .../shared_test_classes/single_layer/lrn.hpp | 43 +++ .../single_layer/lstm_cell.hpp | 37 ++ .../single_layer/lstm_sequence.hpp | 43 +++ .../single_layer/mat_mul.hpp | 42 +++ .../single_layer/minimum_maximum.hpp | 36 ++ .../shared_test_classes/single_layer/mvn.hpp | 31 ++ .../single_layer/non_max_suppression.hpp | 47 +++ .../single_layer/nonzero.hpp | 37 ++ .../single_layer/normalize_l2.hpp | 35 ++ .../shared_test_classes/single_layer/pad.hpp | 38 ++ .../single_layer/pooling.hpp | 70 ++++ .../single_layer/power.hpp | 34 ++ .../single_layer/prior_box_clustered.hpp | 74 ++++ .../single_layer/proposal.hpp | 67 ++++ .../single_layer/psroi_pooling.hpp | 48 +++ .../single_layer/range.hpp | 50 +++ .../single_layer/reduce_ops.hpp | 45 +++ .../single_layer/region_yolo.hpp | 38 ++ .../single_layer/reorg_yolo.hpp | 32 ++ .../single_layer/reshape.hpp | 39 +++ .../single_layer/reverse_sequence.hpp | 36 ++ .../single_layer/rnn_cell.hpp | 37 ++ .../single_layer/rnn_sequence.hpp | 44 +++ .../single_layer/roi_pooling.hpp | 43 +++ .../single_layer/scatter_ND_update.hpp | 37 ++ .../single_layer/scatter_elements_update.hpp | 37 ++ .../single_layer/scatter_update.hpp | 38 ++ .../single_layer/select.hpp | 29 ++ .../single_layer/shape_of.hpp | 32 ++ .../single_layer/shuffle_channels.hpp | 41 +++ .../single_layer/softmax.hpp | 41 +++ .../single_layer/space_to_batch.hpp | 36 ++ .../single_layer/space_to_depth.hpp | 32 ++ .../single_layer/split.hpp | 39 +++ .../single_layer/squeeze_unsqueeze.hpp | 37 ++ .../single_layer/strided_slice.hpp | 47 +++ .../single_layer/tensor_iterator.hpp | 41 +++ .../shared_test_classes/single_layer/tile.hpp | 38 ++ .../shared_test_classes/single_layer/topk.hpp | 36 ++ .../single_layer/transpose.hpp | 37 ++ .../single_layer/variadic_split.hpp | 38 ++ .../subgraph/activation_concats_eltwise.hpp | 31 ++ .../subgraph/basic_lstm.hpp | 43 +++ .../subgraph/broadcast_power.hpp | 33 ++ .../subgraph/cascade_concat.hpp | 31 ++ .../subgraph/concat_multi_input.hpp | 41 +++ .../subgraph/concat_quantization.hpp | 33 ++ .../subgraph/constant_result.hpp | 29 ++ .../subgraph/conv_eltwise_fusion.hpp | 37 ++ .../subgraph/convert_pad_to_group_conv.hpp | 33 ++ .../subgraph/delayed_copy_layer.hpp | 33 ++ .../subgraph/first_connect_input_concat.hpp | 34 ++ .../subgraph/get_output_before_activation.hpp | 34 ++ .../subgraph/handling_orientation_conv.hpp | 31 ++ .../subgraph/input_conv.hpp | 43 +++ .../subgraph/matmul_squeeze_add.hpp | 35 ++ .../subgraph/memory_LSTMCell.hpp | 39 +++ .../memory_eltwise_reshape_concat.hpp | 37 ++ .../multioutput_eltwise_squeeze_eltwise.hpp | 30 ++ .../subgraph/multiple_LSTMCell.hpp | 41 +++ .../subgraph/multiple_concat.hpp | 25 ++ .../subgraph/multiply_add.hpp | 32 ++ .../subgraph/negative_memory_layer_offset.hpp | 36 ++ .../subgraph/perm_conv_perm_concat.hpp | 36 ++ .../quantized_convolution_backprop_data.hpp | 43 +++ .../subgraph/quantized_group_convolution.hpp | 44 +++ ...ntized_group_convolution_backprop_data.hpp | 44 +++ .../subgraph/quantized_mat_mul.hpp | 36 ++ .../subgraph/range_add.hpp | 39 +++ .../subgraph/relu_shape_of.hpp | 26 ++ ...shape_permute_conv_permute_reshape_act.hpp | 37 ++ .../subgraph/reshape_permute_reshape.hpp | 30 ++ .../subgraph/reshape_squeeze_reshape_relu.hpp | 31 ++ .../subgraph/scaleshift.hpp | 30 ++ .../shared_test_classes/subgraph/softsign.hpp | 39 +++ .../subgraph/split_concat_memory.hpp | 32 ++ .../subgraph/split_conv_concat.hpp | 27 ++ .../subgraph/split_relu.hpp | 33 ++ .../subgraph/split_trivial_permute_concat.hpp | 33 ++ .../subgraph/trivial_concat.hpp | 32 ++ .../two_fake_quantize_to_fullyconnected.hpp | 53 +++ .../src/base}/layer_test_utils.cpp | 48 ++- .../layer_transformation.cpp | 11 +- .../shared_test_classes/src/precomp.hpp | 36 ++ .../src/single_layer}/activation.cpp | 27 +- .../src/single_layer}/batch_norm.cpp | 7 +- .../src/single_layer}/batch_to_space.cpp | 21 +- .../src/single_layer}/broadcast.cpp | 9 +- .../src/single_layer}/comparison.cpp | 16 +- .../src/single_layer}/concat.cpp | 23 +- .../src/single_layer}/convert.cpp | 15 +- .../src/single_layer}/convert_like.cpp | 15 +- .../src/single_layer}/convolution.cpp | 20 +- .../convolution_backprop_data.cpp | 20 +- .../src/single_layer}/ctc_greedy_decoder.cpp | 22 +- .../src/single_layer}/ctc_loss.cpp | 11 +- .../src/single_layer}/cum_sum.cpp | 20 +- .../src/single_layer}/depth_to_space.cpp | 26 +- .../src/single_layer}/detection_output.cpp | 12 +- .../src/single_layer}/eltwise.cpp | 13 +- .../embedding_bag_offsets_sum.cpp | 14 +- .../embedding_bag_packed_sum.cpp | 15 +- .../single_layer}/embedding_segments_sum.cpp | 14 +- .../single_layer}/extract_image_patches.cpp | 16 +- .../src/single_layer}/fake_quantize.cpp | 44 +-- .../src/single_layer}/gather.cpp | 21 +- .../src/single_layer}/gather_nd.cpp | 11 +- .../src/single_layer}/gather_tree.cpp | 16 +- .../src/single_layer}/grn.cpp | 22 +- .../src/single_layer}/group_convolution.cpp | 20 +- .../group_convolution_backprop_data.cpp | 20 +- .../src/single_layer}/gru_cell.cpp | 21 +- .../src/single_layer}/gru_sequence.cpp | 24 +- .../src/single_layer}/interpolate.cpp | 15 +- .../src/single_layer}/log_softmax.cpp | 18 +- .../src/single_layer}/logical.cpp | 14 +- .../src/single_layer}/loop.cpp | 233 +----------- .../src/single_layer}/lrn.cpp | 11 +- .../src/single_layer}/lstm_cell.cpp | 23 +- .../src/single_layer}/lstm_sequence.cpp | 26 +- .../src/single_layer}/mat_mul.cpp | 12 +- .../src/single_layer}/minimum_maximum.cpp | 15 +- .../src/single_layer}/mvn.cpp | 22 +- .../src/single_layer}/non_max_suppression.cpp | 6 +- .../src/single_layer}/nonzero.cpp | 17 +- .../src/single_layer}/normalize_l2.cpp | 7 +- .../src/single_layer}/pad.cpp | 14 +- .../src/single_layer}/pooling.cpp | 29 +- .../src/single_layer}/power.cpp | 9 +- .../src/single_layer}/prior_box_clustered.cpp | 22 +- .../src/single_layer}/proposal.cpp | 20 +- .../src/single_layer}/psroi_pooling.cpp | 20 +- .../src/single_layer}/range.cpp | 17 +- .../src/single_layer}/reduce_ops.cpp | 23 +- .../src/single_layer}/region_yolo.cpp | 14 +- .../src/single_layer}/reorg_yolo.cpp | 14 +- .../src/single_layer}/reshape.cpp | 17 +- .../src/single_layer}/reverse_sequence.cpp | 15 +- .../src/single_layer}/rnn_cell.cpp | 23 +- .../src/single_layer}/rnn_sequence.cpp | 24 +- .../src/single_layer}/roi_pooling.cpp | 20 +- .../src/single_layer}/scatter_ND_update.cpp | 24 +- .../single_layer}/scatter_elements_update.cpp | 24 +- .../src/single_layer}/scatter_update.cpp | 25 +- .../src/single_layer}/select.cpp | 21 +- .../src/single_layer}/shape_of.cpp | 21 +- .../src/single_layer}/shuffle_channels.cpp | 12 +- .../src/single_layer}/softmax.cpp | 20 +- .../src/single_layer}/space_to_batch.cpp | 22 +- .../src/single_layer}/space_to_depth.cpp | 26 +- .../src/single_layer}/split.cpp | 22 +- .../src/single_layer}/squeeze_unsqueeze.cpp | 18 +- .../src/single_layer}/strided_slice.cpp | 20 +- .../src/single_layer}/tensor_iterator.cpp | 20 +- .../src/single_layer}/tile.cpp | 13 +- .../src/single_layer}/topk.cpp | 6 +- .../src/single_layer}/transpose.cpp | 19 +- .../src/single_layer}/variadic_split.cpp | 23 +- .../subgraph}/activation_concats_eltwise.cpp | 24 +- .../src/subgraph}/basic_lstm.cpp | 85 +---- .../src/subgraph}/broadcast_power.cpp | 14 +- .../src/subgraph}/cascade_concat.cpp | 15 +- .../src/subgraph}/concat_multi_input.cpp | 32 +- .../src/subgraph}/concat_qunatization.cpp | 33 +- .../src/subgraph}/constant_result.cpp | 10 +- .../src/subgraph}/conv_eltwise_fusion.cpp | 23 +- .../subgraph}/convert_pad_to_group_conv.cpp | 15 +- .../src/subgraph}/delayed_copy_layer.cpp | 17 +- .../subgraph}/first_connect_input_concat.cpp | 24 +- .../get_output_before_activation.cpp | 19 +- .../subgraph}/handling_orientation_conv.cpp | 18 +- .../src/subgraph}/input_conv.cpp | 25 +- .../src/subgraph}/matmul_squeeze_add.cpp | 25 +- .../src/subgraph}/memory_LSTMCell.cpp | 37 +- .../memory_eltwise_reshape_concat.cpp | 23 +- .../multioutput_eltwise_squeeze_eltwise.cpp | 18 +- .../src/subgraph}/multiple_LSTMCell.cpp | 34 +- .../src/subgraph}/multiple_concat.cpp | 20 +- .../src/subgraph}/multiply_add.cpp | 24 +- .../negative_memory_layer_offset.cpp | 19 +- .../src/subgraph}/perm_conv_perm_concat.cpp | 15 +- .../quantized_convolution_backprop_data.cpp | 25 +- .../subgraph}/quantized_group_convolution.cpp | 24 +- ...ntized_group_convolution_backprop_data.cpp | 25 +- .../src/subgraph}/quantized_mat_mul.cpp | 19 +- .../src/subgraph}/range_add.cpp | 19 +- .../src/subgraph}/relu_shape_of.cpp | 12 +- ...shape_permute_conv_permute_reshape_act.cpp | 19 +- .../src/subgraph}/reshape_permute_reshape.cpp | 17 +- .../reshape_squeeze_reshape_relu.cpp | 20 +- .../src/subgraph}/scale_shift.cpp | 13 +- .../src/subgraph}/softsign.cpp | 24 +- .../src/subgraph}/split_concat_memory.cpp | 60 +--- .../src/subgraph}/split_conv_concat.cpp | 25 +- .../src/subgraph}/split_relu.cpp | 19 +- .../split_trivial_permute_concat.cpp | 20 +- .../src/subgraph}/trivial_concat.cpp | 26 +- .../two_fake_quantize_to_fullyconnected.cpp | 25 +- .../functional_test_utils/CMakeLists.txt | 10 +- .../functional_test_utils}/blob_utils.hpp | 0 .../functional_test_utils/core_config.hpp | 9 + .../functional_test_utils}/network_utils.hpp | 0 .../functional_test_utils}/plugin_cache.hpp | 0 .../precision_utils.hpp | 0 .../skip_tests_config.hpp | 0 .../test_model/test_model.hpp | 0 .../functional_test_utils/plugin_config.hpp | 9 - .../{ => src}/network_utils.cpp | 4 +- .../{ => src}/plugin_cache.cpp | 2 +- .../{ => src}/precomp.hpp | 0 .../{ => src}/skip_tests_config.cpp | 0 .../{ => src}/test_model/test_model.cpp | 2 +- 569 files changed, 6242 insertions(+), 6052 deletions(-) create mode 100644 docs/template_plugin/tests/functional/core_config.cpp delete mode 100644 docs/template_plugin/tests/functional/plugin_config.cpp create mode 100644 inference-engine/tests/functional/inference_engine/serialization/core_config.cpp create mode 100644 inference-engine/tests/functional/inference_engine/serialization/single_layer/variadic_split.cpp rename inference-engine/tests/functional/plugin/cpu/shared_tests_instances/{plugin_config.cpp => core_config.cpp} (78%) rename inference-engine/tests/functional/plugin/gna/shared_tests_instances/{plugin_config.cpp => core_config.cpp} (94%) create mode 100644 inference-engine/tests/functional/plugin/gpu/shared_tests_instances/core_config.cpp delete mode 100644 inference-engine/tests/functional/plugin/gpu/shared_tests_instances/plugin_config.cpp create mode 100644 inference-engine/tests/functional/plugin/myriad/shared_tests_instances/core_config.cpp delete mode 100644 inference-engine/tests/functional/plugin/myriad/shared_tests_instances/plugin_config.cpp rename inference-engine/tests/{ie_test_utils/functional_test_utils => functional/plugin/shared/include/base}/behavior_test_utils.hpp (100%) rename inference-engine/tests/{ie_test_utils/functional_test_utils => functional/plugin/shared/include/base}/import_export_base/import_export_base.hpp (94%) rename inference-engine/tests/{ie_test_utils/functional_test_utils => functional/plugin/shared/src/base}/import_export_base/import_export_base.cpp (97%) create mode 100644 inference-engine/tests/functional/shared_test_classes/CMakeLists.txt rename inference-engine/tests/{ie_test_utils/functional_test_utils => functional/shared_test_classes/include/shared_test_classes/base}/layer_test_utils.hpp (97%) rename inference-engine/tests/{ie_test_utils/functional_test_utils => functional/shared_test_classes/include/shared_test_classes/base}/low_precision_transformations/layer_transformation.hpp (97%) create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/activation.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/batch_norm.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/batch_to_space.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/broadcast.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/comparison.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/concat.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convert.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convert_like.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convolution.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convolution_backprop_data.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/ctc_greedy_decoder.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/ctc_loss.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/cum_sum.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/depth_to_space.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/detection_output.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/eltwise.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/embedding_bag_offsets_sum.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/embedding_bag_packed_sum.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/embedding_segments_sum.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/extract_image_patches.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/fake_quantize.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gather.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gather_nd.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gather_tree.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/grn.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/group_convolution.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/group_convolution_backprop_data.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gru_cell.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gru_sequence.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/interpolate.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/log_softmax.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/logical.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/loop.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/lrn.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/lstm_cell.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/lstm_sequence.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/mat_mul.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/minimum_maximum.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/mvn.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/non_max_suppression.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/nonzero.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/normalize_l2.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/pad.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/pooling.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/power.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/prior_box_clustered.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/proposal.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/psroi_pooling.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/range.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reduce_ops.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/region_yolo.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reorg_yolo.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reshape.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reverse_sequence.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/rnn_cell.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/rnn_sequence.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/roi_pooling.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/scatter_ND_update.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/scatter_elements_update.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/scatter_update.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/select.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/shape_of.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/shuffle_channels.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/softmax.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/space_to_batch.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/space_to_depth.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/split.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/squeeze_unsqueeze.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/strided_slice.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/tensor_iterator.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/tile.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/topk.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/transpose.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/variadic_split.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/activation_concats_eltwise.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/basic_lstm.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/broadcast_power.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/cascade_concat.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/concat_multi_input.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/concat_quantization.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/constant_result.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/conv_eltwise_fusion.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/convert_pad_to_group_conv.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/delayed_copy_layer.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/first_connect_input_concat.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/get_output_before_activation.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/handling_orientation_conv.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/input_conv.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/matmul_squeeze_add.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/memory_LSTMCell.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/memory_eltwise_reshape_concat.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multioutput_eltwise_squeeze_eltwise.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiple_LSTMCell.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiple_concat.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiply_add.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/negative_memory_layer_offset.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/perm_conv_perm_concat.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_convolution_backprop_data.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_group_convolution.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_group_convolution_backprop_data.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_mat_mul.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/range_add.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/relu_shape_of.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/reshape_permute_conv_permute_reshape_act.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/reshape_permute_reshape.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/reshape_squeeze_reshape_relu.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/scaleshift.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/softsign.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_concat_memory.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_conv_concat.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_relu.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_trivial_permute_concat.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/trivial_concat.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/two_fake_quantize_to_fullyconnected.hpp rename inference-engine/tests/{ie_test_utils/functional_test_utils => functional/shared_test_classes/src/base}/layer_test_utils.cpp (92%) rename inference-engine/tests/{ie_test_utils/functional_test_utils => functional/shared_test_classes/src/base}/low_precision_transformations/layer_transformation.cpp (91%) create mode 100644 inference-engine/tests/functional/shared_test_classes/src/precomp.hpp rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/activation.cpp (95%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/batch_norm.cpp (95%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/batch_to_space.cpp (82%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/broadcast.cpp (93%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/comparison.cpp (91%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/concat.cpp (77%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/convert.cpp (81%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/convert_like.cpp (83%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/convolution.cpp (86%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/convolution_backprop_data.cpp (86%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/ctc_greedy_decoder.cpp (79%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/ctc_loss.cpp (94%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/cum_sum.cpp (80%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/depth_to_space.cpp (83%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/detection_output.cpp (96%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/eltwise.cpp (95%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/embedding_bag_offsets_sum.cpp (90%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/embedding_bag_packed_sum.cpp (89%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/embedding_segments_sum.cpp (91%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/extract_image_patches.cpp (88%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/fake_quantize.cpp (80%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/gather.cpp (84%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/gather_nd.cpp (93%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/gather_tree.cpp (90%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/grn.cpp (78%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/group_convolution.cpp (86%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/group_convolution_backprop_data.cpp (86%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/gru_cell.cpp (87%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/gru_sequence.cpp (90%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/interpolate.cpp (93%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/log_softmax.cpp (84%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/logical.cpp (92%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/loop.cpp (63%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/lrn.cpp (92%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/lstm_cell.cpp (85%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/lstm_sequence.cpp (89%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/mat_mul.cpp (95%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/minimum_maximum.cpp (86%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/mvn.cpp (76%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/non_max_suppression.cpp (98%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/nonzero.cpp (82%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/normalize_l2.cpp (93%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/pad.cpp (90%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/pooling.cpp (92%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/power.cpp (89%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/prior_box_clustered.cpp (92%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/proposal.cpp (92%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/psroi_pooling.cpp (92%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/range.cpp (93%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/reduce_ops.cpp (86%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/region_yolo.cpp (82%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/reorg_yolo.cpp (77%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/reshape.cpp (83%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/reverse_sequence.cpp (86%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/rnn_cell.cpp (83%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/rnn_sequence.cpp (89%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/roi_pooling.cpp (89%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/scatter_ND_update.cpp (87%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/scatter_elements_update.cpp (84%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/scatter_update.cpp (89%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/select.cpp (82%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/shape_of.cpp (71%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/shuffle_channels.cpp (91%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/softmax.cpp (83%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/space_to_batch.cpp (82%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/space_to_depth.cpp (83%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/split.cpp (82%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/squeeze_unsqueeze.cpp (82%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/strided_slice.cpp (86%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/tensor_iterator.cpp (96%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/tile.cpp (90%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/topk.cpp (94%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/transpose.cpp (84%) rename inference-engine/tests/functional/{plugin/shared/src/single_layer_tests => shared_test_classes/src/single_layer}/variadic_split.cpp (80%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/activation_concats_eltwise.cpp (81%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/basic_lstm.cpp (66%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/broadcast_power.cpp (85%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/cascade_concat.cpp (90%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/concat_multi_input.cpp (86%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/concat_qunatization.cpp (77%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/constant_result.cpp (84%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/conv_eltwise_fusion.cpp (87%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/convert_pad_to_group_conv.cpp (83%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/delayed_copy_layer.cpp (88%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/first_connect_input_concat.cpp (74%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/get_output_before_activation.cpp (84%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/handling_orientation_conv.cpp (89%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/input_conv.cpp (88%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/matmul_squeeze_add.cpp (82%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/memory_LSTMCell.cpp (94%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/memory_eltwise_reshape_concat.cpp (91%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/multioutput_eltwise_squeeze_eltwise.cpp (84%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/multiple_LSTMCell.cpp (96%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/multiple_concat.cpp (80%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/multiply_add.cpp (75%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/negative_memory_layer_offset.cpp (90%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/perm_conv_perm_concat.cpp (92%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/quantized_convolution_backprop_data.cpp (87%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/quantized_group_convolution.cpp (88%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/quantized_group_convolution_backprop_data.cpp (88%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/quantized_mat_mul.cpp (92%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/range_add.cpp (92%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/relu_shape_of.cpp (85%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/reshape_permute_conv_permute_reshape_act.cpp (90%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/reshape_permute_reshape.cpp (85%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/reshape_squeeze_reshape_relu.cpp (85%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/scale_shift.cpp (86%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/softsign.cpp (84%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/split_concat_memory.cpp (62%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/split_conv_concat.cpp (77%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/split_relu.cpp (81%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/split_trivial_permute_concat.cpp (82%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/trivial_concat.cpp (82%) rename inference-engine/tests/functional/{plugin/shared/src/subgraph_tests => shared_test_classes/src/subgraph}/two_fake_quantize_to_fullyconnected.cpp (92%) rename inference-engine/tests/ie_test_utils/functional_test_utils/{ => include/functional_test_utils}/blob_utils.hpp (100%) create mode 100644 inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/core_config.hpp rename inference-engine/tests/ie_test_utils/functional_test_utils/{ => include/functional_test_utils}/network_utils.hpp (100%) rename inference-engine/tests/ie_test_utils/functional_test_utils/{ => include/functional_test_utils}/plugin_cache.hpp (100%) rename inference-engine/tests/ie_test_utils/functional_test_utils/{ => include/functional_test_utils}/precision_utils.hpp (100%) rename inference-engine/tests/ie_test_utils/functional_test_utils/{ => include/functional_test_utils}/skip_tests_config.hpp (100%) rename inference-engine/tests/ie_test_utils/functional_test_utils/{ => include/functional_test_utils}/test_model/test_model.hpp (100%) delete mode 100644 inference-engine/tests/ie_test_utils/functional_test_utils/plugin_config.hpp rename inference-engine/tests/ie_test_utils/functional_test_utils/{ => src}/network_utils.cpp (99%) rename inference-engine/tests/ie_test_utils/functional_test_utils/{ => src}/plugin_cache.cpp (98%) rename inference-engine/tests/ie_test_utils/functional_test_utils/{ => src}/precomp.hpp (100%) rename inference-engine/tests/ie_test_utils/functional_test_utils/{ => src}/skip_tests_config.cpp (100%) rename inference-engine/tests/ie_test_utils/functional_test_utils/{ => src}/test_model/test_model.cpp (99%) diff --git a/docs/template_plugin/tests/functional/core_config.cpp b/docs/template_plugin/tests/functional/core_config.cpp new file mode 100644 index 00000000000..25bc749cc4f --- /dev/null +++ b/docs/template_plugin/tests/functional/core_config.cpp @@ -0,0 +1,8 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "functional_test_utils/core_config.hpp" + +void CoreConfiguration(LayerTestsUtils::LayerTestsCommon* test) { +} diff --git a/docs/template_plugin/tests/functional/plugin_config.cpp b/docs/template_plugin/tests/functional/plugin_config.cpp deleted file mode 100644 index 53e2dd7baa3..00000000000 --- a/docs/template_plugin/tests/functional/plugin_config.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (C) 2020 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#include "functional_test_utils/plugin_config.hpp" - -void PreparePluginConfiguration(LayerTestsUtils::LayerTestsCommon* test) { -} diff --git a/inference-engine/tests/functional/CMakeLists.txt b/inference-engine/tests/functional/CMakeLists.txt index fb196cf893c..dc9106b772f 100644 --- a/inference-engine/tests/functional/CMakeLists.txt +++ b/inference-engine/tests/functional/CMakeLists.txt @@ -2,5 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 # +add_subdirectory(shared_test_classes) add_subdirectory(inference_engine) add_subdirectory(plugin) diff --git a/inference-engine/tests/functional/inference_engine/CMakeLists.txt b/inference-engine/tests/functional/inference_engine/CMakeLists.txt index e0ca1f9f80c..854c2d74814 100644 --- a/inference-engine/tests/functional/inference_engine/CMakeLists.txt +++ b/inference-engine/tests/functional/inference_engine/CMakeLists.txt @@ -14,6 +14,7 @@ set(LINK_LIBRARIES inference_engine_transformations openvino::itt openvino::conditional_compilation + sharedTestClasses ) set(DEPENDENCIES mock_engine @@ -21,6 +22,7 @@ set(DEPENDENCIES inference_engine_ir_v7_reader template_extension lptNgraphFunctions + sharedTestClasses ) if (NGRAPH_ONNX_IMPORT_ENABLE) diff --git a/inference-engine/tests/functional/inference_engine/keep_constant_inputs_tests.cpp b/inference-engine/tests/functional/inference_engine/keep_constant_inputs_tests.cpp index 703b4fcdddf..b7c9cf840fc 100644 --- a/inference-engine/tests/functional/inference_engine/keep_constant_inputs_tests.cpp +++ b/inference-engine/tests/functional/inference_engine/keep_constant_inputs_tests.cpp @@ -21,7 +21,7 @@ #include #include #include "generic_ie.hpp" -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" using namespace testing; using namespace InferenceEngine; diff --git a/inference-engine/tests/functional/inference_engine/serialization/core_config.cpp b/inference-engine/tests/functional/inference_engine/serialization/core_config.cpp new file mode 100644 index 00000000000..25bc749cc4f --- /dev/null +++ b/inference-engine/tests/functional/inference_engine/serialization/core_config.cpp @@ -0,0 +1,8 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "functional_test_utils/core_config.hpp" + +void CoreConfiguration(LayerTestsUtils::LayerTestsCommon* test) { +} diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/variadic_split.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/variadic_split.cpp new file mode 100644 index 00000000000..d0ce2f9748e --- /dev/null +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/variadic_split.cpp @@ -0,0 +1,39 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include + +#include "shared_test_classes/single_layer/variadic_split.hpp" +#include "common_test_utils/test_constants.hpp" + +using namespace LayerTestsDefinitions; + +namespace { + TEST_P(VariadicSplitLayerTest, Serialize) { + Serialize(); + } + + const std::vector netPrecisions = { + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::FP16 + }; + + // Sum of elements numSplits = inputShapes[Axis] + const std::vector> numSplits = { + {1, 16, 5, 8}, + }; + + INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck, VariadicSplitLayerTest, + ::testing::Combine( + ::testing::ValuesIn(numSplits), + ::testing::Values(0, 1, 2, 3), + ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(std::vector({30, 30, 30, 30})), + ::testing::Values(CommonTestUtils::DEVICE_CPU)), + VariadicSplitLayerTest::getTestCaseName); +} // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/bfloat16_helpers.hpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/bfloat16_helpers.hpp index fa9500f9529..8a73c3f1143 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/bfloat16_helpers.hpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/bfloat16_helpers.hpp @@ -16,7 +16,7 @@ #include #include "ngraph/opsets/opset1.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_eltwise_depthwise.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_eltwise_depthwise.cpp index acad0fdc6ee..8636624b8ea 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_eltwise_depthwise.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_eltwise_depthwise.cpp @@ -16,7 +16,7 @@ #include "functional_test_utils/blob_utils.hpp" #include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "ngraph/opsets/opset1.hpp" using namespace std; diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/memory_conv.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/memory_conv.cpp index 839022a082d..ca5ca33c134 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/memory_conv.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/memory_conv.cpp @@ -5,7 +5,7 @@ #include #include -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "ie_system_conf.h" #include diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/set_preprocess.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/set_preprocess.cpp index 14b59c4ef72..a11831dd560 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/set_preprocess.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/set_preprocess.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include "multi-device/multi_device_config.hpp" #include "behavior/set_preprocess.hpp" diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/plugin_config.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/core_config.cpp similarity index 78% rename from inference-engine/tests/functional/plugin/cpu/shared_tests_instances/plugin_config.cpp rename to inference-engine/tests/functional/plugin/cpu/shared_tests_instances/core_config.cpp index 4ad085c318f..fa4330ed1d5 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/plugin_config.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/core_config.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "functional_test_utils/plugin_config.hpp" +#include "functional_test_utils/core_config.hpp" -void PreparePluginConfiguration(LayerTestsUtils::LayerTestsCommon* test) { +void CoreConfiguration(LayerTestsUtils::LayerTestsCommon* test) { // Within the test scope we don't need any implicit bf16 optimisations, so let's run the network as is. auto& configuration = test->GetConfiguration(); if (!configuration.count(InferenceEngine::PluginConfigParams::KEY_ENFORCE_BF16)) { diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/layer_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/layer_transformation.cpp index e1ac9b24b05..36554c84cca 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/layer_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/layer_transformation.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include #include @@ -34,10 +34,10 @@ #include #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include #include diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/constant_result.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/constant_result.cpp index 82150153f21..7fe22027d0b 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/constant_result.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/constant_result.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/constant_result.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { INSTANTIATE_TEST_CASE_P(smoke_Check, ConstantResultSubgraphTest, diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/conv_eltwise_fusion.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/conv_eltwise_fusion.cpp index 490f8861951..2590c5d1df1 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/conv_eltwise_fusion.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/conv_eltwise_fusion.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/conv_eltwise_fusion.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { const std::vector types{ngraph::element::f32, ngraph::element::f16}; diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/convert_pad_to_group_conv.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/convert_pad_to_group_conv.cpp index 8d71b16371c..609361bd215 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/convert_pad_to_group_conv.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/convert_pad_to_group_conv.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/convert_pad_to_group_conv.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { const std::vector> pads_1d{ diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp index 5472a14ef8a..80ddeed8cdc 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp @@ -7,7 +7,7 @@ #include "common_test_utils/test_constants.hpp" #include "subgraph_tests/matmul_squeeze_add.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { const std::vector netPrecisions = { diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/multiply_add.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/multiply_add.cpp index 9b78f8d6a06..d7660a3bd5e 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/multiply_add.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/multiply_add.cpp @@ -6,7 +6,7 @@ #include "subgraph_tests/multiply_add.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_convolution_backprop_data.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_convolution_backprop_data.cpp index 7f7ca14814f..197dd0255f2 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_convolution_backprop_data.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/quantized_convolution_backprop_data.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; using namespace ngraph::helpers; namespace { diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_group_convolution.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_group_convolution.cpp index deb6bb28765..a0471488b78 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_group_convolution.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_group_convolution.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/quantized_group_convolution.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; using namespace ngraph::helpers; namespace { diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp index af691052234..dce213590b0 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/quantized_group_convolution_backprop_data.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; using namespace ngraph::helpers; namespace { diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_mat_mul.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_mat_mul.cpp index b55be38b61a..da7209db211 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_mat_mul.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_mat_mul.cpp @@ -6,7 +6,7 @@ #include "subgraph_tests/quantized_mat_mul.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; using namespace ngraph::helpers; namespace { diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/range_add.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/range_add.cpp index 0f16373c665..32bd836b6ae 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/range_add.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/range_add.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/range_add.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/relu_shape_of.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/relu_shape_of.cpp index bc65c540049..4ad89667ca8 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/relu_shape_of.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/relu_shape_of.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/relu_shape_of.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { const std::vector netPrecisions = { diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp index 87274d0a892..cd23adb208c 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp @@ -4,7 +4,7 @@ #include "subgraph_tests/reshape_squeeze_reshape_relu.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { std::vector inputs{ diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/split_concat_memory.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/split_concat_memory.cpp index 3e5685b99c6..78e1af80759 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/split_concat_memory.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/split_concat_memory.cpp @@ -6,7 +6,7 @@ #include "subgraph_tests/split_concat_memory.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/split_conv_concat.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/split_conv_concat.cpp index 0d5159a08e5..5a698376e31 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/split_conv_concat.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/split_conv_concat.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/split_conv_concat.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/activation.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/activation.cpp index 975f790a4fa..3305a75a453 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/activation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/activation.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include "test_utils/cpu_test_utils.hpp" using namespace InferenceEngine; diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convert.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convert.cpp index 89159652129..6cb49c0265c 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convert.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convert.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include using namespace LayerTestsDefinitions; using namespace InferenceEngine; diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/crop.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/crop.cpp index 920ca6fba15..643cf7dfe3a 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/crop.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/crop.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include "ngraph_functions/builders.hpp" #include "test_utils/cpu_test_utils.hpp" diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/eltwise.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/eltwise.cpp index b968545b7df..069ee624f67 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/eltwise.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/eltwise.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include #include "test_utils/cpu_test_utils.hpp" diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/group_convolution.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/group_convolution.cpp index 784ced4c226..a4d8f75fdf3 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/group_convolution.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/group_convolution.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include "test_utils/cpu_test_utils.hpp" using namespace InferenceEngine; @@ -10,6 +10,9 @@ using namespace CPUTestUtils; namespace CPULayerTestsDefinitions { +using groupConvLayerTestParamsSet = LayerTestsDefinitions::groupConvLayerTestParamsSet; +using groupConvSpecificParams = LayerTestsDefinitions::groupConvSpecificParams; + typedef std::tuple< groupConvLayerTestParamsSet, CPUSpecificParams> groupConvLayerCPUTestParamsSet; diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/interpolate.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/interpolate.cpp index a1cebccf2a6..b15ec88e7bb 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/interpolate.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/interpolate.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include "test_utils/cpu_test_utils.hpp" using namespace InferenceEngine; diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/logical.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/logical.cpp index a968df20a18..52b65d4d1c3 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/logical.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/logical.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include "ngraph_functions/builders.hpp" #include "test_utils/cpu_test_utils.hpp" diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/mvn.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/mvn.cpp index ad120a1b940..09fcaaf24c9 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/mvn.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/mvn.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include "ngraph_functions/builders.hpp" #include "test_utils/cpu_test_utils.hpp" diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/normalize.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/normalize.cpp index 75faae5cc92..8731275825e 100755 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/normalize.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/normalize.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include "ngraph_functions/builders.hpp" #include "test_utils/cpu_test_utils.hpp" diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/permute.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/permute.cpp index a0bf5578153..82bb9a72092 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/permute.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/permute.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include "ngraph_functions/builders.hpp" #include "test_utils/cpu_test_utils.hpp" diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/reduce_ops.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/reduce_ops.cpp index becf723a81f..b2985ec6147 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/reduce_ops.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/reduce_ops.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include "ngraph_functions/builders.hpp" #include "test_utils/cpu_test_utils.hpp" diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/region_yolo.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/region_yolo.cpp index 2fedfd2b280..2a67767e993 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/region_yolo.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/region_yolo.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include "ngraph_functions/builders.hpp" #include "test_utils/cpu_test_utils.hpp" diff --git a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/include/conv_concat.hpp b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/include/conv_concat.hpp index 311f97dd057..949f3b90b89 100644 --- a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/include/conv_concat.hpp +++ b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/include/conv_concat.hpp @@ -9,13 +9,13 @@ #include #include "test_utils/cpu_test_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "ngraph_functions/utils/ngraph_helpers.hpp" #include "ngraph_functions/builders.hpp" using namespace CPUTestUtils; -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { enum class nodeType { convolution, @@ -70,4 +70,4 @@ protected: std::string pluginTypeNode; }; -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace SubgraphTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/include/fuse_permute_reorder.hpp b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/include/fuse_permute_reorder.hpp index 22a57efa609..fa6aeaa2aac 100644 --- a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/include/fuse_permute_reorder.hpp +++ b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/include/fuse_permute_reorder.hpp @@ -9,13 +9,13 @@ #include #include "test_utils/cpu_test_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "ngraph_functions/utils/ngraph_helpers.hpp" #include "ngraph_functions/builders.hpp" using namespace CPUTestUtils; -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { using FusePermuteAndReorderParams = std::tuple< InferenceEngine::SizeVector, // Input shape @@ -46,4 +46,4 @@ protected: void CreateGraph() override; }; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/conv_concat.cpp b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/conv_concat.cpp index 0df806f7f86..74a4193acfa 100644 --- a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/conv_concat.cpp +++ b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/conv_concat.cpp @@ -7,7 +7,7 @@ using namespace InferenceEngine; using namespace CPUTestUtils; -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string ConvConcatSubgraphTest::getTestCaseName(testing::TestParamInfo obj) { std::ostringstream result; @@ -422,4 +422,4 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBackpropData3D, ConvConcatSubgraph } // namespace GroupConvolutionBackpropDataConcat -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/eltwise_chain.cpp b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/eltwise_chain.cpp index fad90688b70..5c44c892be5 100644 --- a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/eltwise_chain.cpp +++ b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/eltwise_chain.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include "common_test_utils/common_utils.hpp" @@ -20,7 +20,7 @@ using InferenceEngine::Precision; using ngraph::helpers::EltwiseTypes; using FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc; -namespace CPULayerTestsDefinitions { +namespace CPUSubgraphTestsDefinitions { typedef std::tuple< std::vector>, // Input shapes @@ -181,4 +181,4 @@ INSTANTIATE_TEST_CASE_P(smoke_EltwiseChainWithFQ, EltwiseChainTest, EltwiseChainTest::getTestCaseName); } // namespace -} // namespace CPULayerTestsDefinitions +} // namespace CPUSubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/fuse_permute_reorder.cpp b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/fuse_permute_reorder.cpp index 44c2d818473..1697000c860 100644 --- a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/fuse_permute_reorder.cpp +++ b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/fuse_permute_reorder.cpp @@ -7,7 +7,7 @@ using namespace InferenceEngine; using namespace CPUTestUtils; -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string FusePermuteAndReorderTest::getTestCaseName(testing::TestParamInfo obj) { std::ostringstream result; @@ -236,4 +236,4 @@ TEST_P(FusePermuteAndReorderTest2, CompareWithRefs) { INSTANTIATE_TEST_CASE_P(smoke_Basic, FusePermuteAndReorderTest2, fusePermuteAndReorderCommonParams, FusePermuteAndReorderTest::getTestCaseName); -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/reshape_permute_conv_permute_reshape_act.cpp b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/reshape_permute_conv_permute_reshape_act.cpp index 6b7e90b8d04..96f954e7a46 100644 --- a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/reshape_permute_conv_permute_reshape_act.cpp +++ b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/reshape_permute_conv_permute_reshape_act.cpp @@ -29,7 +29,7 @@ std::vector netPrecisions = { std::map additional_config = { }; -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { INSTANTIATE_TEST_CASE_P(smoke_basic, ConvReshapeAct, ::testing::Combine( ::testing::ValuesIn(netPrecisions), @@ -39,6 +39,6 @@ namespace LayerTestsDefinitions { ::testing::ValuesIn(output_channels), ::testing::Values(additional_config)), ConvReshapeAct::getTestCaseName); -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/cpu/test_utils/cpu_test_utils.hpp b/inference-engine/tests/functional/plugin/cpu/test_utils/cpu_test_utils.hpp index 70e3d1c9183..8b980da6062 100644 --- a/inference-engine/tests/functional/plugin/cpu/test_utils/cpu_test_utils.hpp +++ b/inference-engine/tests/functional/plugin/cpu/test_utils/cpu_test_utils.hpp @@ -7,7 +7,7 @@ #include #include #include "ie_system_conf.h" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include #include diff --git a/inference-engine/tests/functional/plugin/gna/pass_tests/4d_eltwise.cpp b/inference-engine/tests/functional/plugin/gna/pass_tests/4d_eltwise.cpp index 47cc39b296f..eee419401ec 100644 --- a/inference-engine/tests/functional/plugin/gna/pass_tests/4d_eltwise.cpp +++ b/inference-engine/tests/functional/plugin/gna/pass_tests/4d_eltwise.cpp @@ -12,7 +12,7 @@ #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/utils/ngraph_helpers.hpp" #include "ngraph_functions/builders.hpp" diff --git a/inference-engine/tests/functional/plugin/gna/pass_tests/eltwise_split_over_channels_pass.cpp b/inference-engine/tests/functional/plugin/gna/pass_tests/eltwise_split_over_channels_pass.cpp index bfea02441d2..a0c987a66fe 100644 --- a/inference-engine/tests/functional/plugin/gna/pass_tests/eltwise_split_over_channels_pass.cpp +++ b/inference-engine/tests/functional/plugin/gna/pass_tests/eltwise_split_over_channels_pass.cpp @@ -9,7 +9,7 @@ #include -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/utils/ngraph_helpers.hpp" #include "ngraph_functions/builders.hpp" diff --git a/inference-engine/tests/functional/plugin/gna/pass_tests/remove_permutations_NHWC_to_NCHW_pass.cpp b/inference-engine/tests/functional/plugin/gna/pass_tests/remove_permutations_NHWC_to_NCHW_pass.cpp index f8e4cb5bacd..267b830d7ad 100644 --- a/inference-engine/tests/functional/plugin/gna/pass_tests/remove_permutations_NHWC_to_NCHW_pass.cpp +++ b/inference-engine/tests/functional/plugin/gna/pass_tests/remove_permutations_NHWC_to_NCHW_pass.cpp @@ -12,7 +12,7 @@ #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/utils/ngraph_helpers.hpp" #include "ngraph_functions/builders.hpp" diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/plugin_config.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/core_config.cpp similarity index 94% rename from inference-engine/tests/functional/plugin/gna/shared_tests_instances/plugin_config.cpp rename to inference-engine/tests/functional/plugin/gna/shared_tests_instances/core_config.cpp index 18db70a7fea..2604d37d061 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/plugin_config.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/core_config.cpp @@ -4,11 +4,11 @@ #include -#include "functional_test_utils/plugin_config.hpp" +#include "functional_test_utils/core_config.hpp" #include "functional_test_utils/blob_utils.hpp" #include -void PreparePluginConfiguration(LayerTestsUtils::LayerTestsCommon* test) { +void CoreConfiguration(LayerTestsUtils::LayerTestsCommon* test) { const float MAX_VAL_2B_FEAT = 16384.0f; auto inputParameters = test->GetFunction()->get_parameters(); auto& configuration = test->GetConfiguration(); diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/activation_concats_eltwise.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/activation_concats_eltwise.cpp index 2e40aa8dd63..c86fb626390 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/activation_concats_eltwise.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/activation_concats_eltwise.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/activation_concats_eltwise.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { std::vector input_sizes = { 7, diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/basic_lstm.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/basic_lstm.cpp index ff9a43e4b2b..bf32ee22ad0 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/basic_lstm.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/basic_lstm.cpp @@ -7,7 +7,7 @@ #include "common_test_utils/test_constants.hpp" #include "subgraph_tests/basic_lstm.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { const std::vector netPrecisions = { diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/broadcast_power.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/broadcast_power.cpp index ebd357ff5a8..2a890505f01 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/broadcast_power.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/broadcast_power.cpp @@ -6,7 +6,7 @@ #include #include -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { const std::vector netPrecisions = { diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/cascade_concat.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/cascade_concat.cpp index b944401726a..2e9e3a9659e 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/cascade_concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/cascade_concat.cpp @@ -5,7 +5,7 @@ #include #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { std::vector>> shape1{ diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_multi_input.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_multi_input.cpp index 1fae328d4d4..0e45793eeb9 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_multi_input.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_multi_input.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/concat_multi_input.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_quantization.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_quantization.cpp index fc880b1527c..a55c0950df4 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_quantization.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_quantization.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/concat_quantization.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; const std::vector netPrecisions = { InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16, diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/constant_result.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/constant_result.cpp index 370e662b60f..8ba56773cf8 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/constant_result.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/constant_result.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/constant_result.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { INSTANTIATE_TEST_CASE_P(smoke_Check, ConstantResultSubgraphTest, diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/delayed_copy_layer.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/delayed_copy_layer.cpp index 59dfb27b79e..5c660b4a248 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/delayed_copy_layer.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/delayed_copy_layer.cpp @@ -5,7 +5,7 @@ #include "common_test_utils/test_constants.hpp" #include "gna/gna_config.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { std::vector netPrecisions = {InferenceEngine::Precision::FP32, diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/first_connect_input_concat.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/first_connect_input_concat.cpp index d9fa0ebeb7a..703e212de16 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/first_connect_input_concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/first_connect_input_concat.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/first_connect_input_concat.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/handling_orientation_conv.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/handling_orientation_conv.cpp index da23d774826..c71852a4fee 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/handling_orientation_conv.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/handling_orientation_conv.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/handling_orientation_conv.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; const std::vector netPrecisions = { InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16, diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/input_conv.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/input_conv.cpp index aee0b7711d1..8bb654c4afb 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/input_conv.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/input_conv.cpp @@ -7,7 +7,7 @@ #include "common_test_utils/test_constants.hpp" #include "subgraph_tests/input_conv.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { const std::vector netPrecisions = { diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp index 17d94480e72..b6874daac9f 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp @@ -7,7 +7,7 @@ #include "common_test_utils/test_constants.hpp" #include "subgraph_tests/matmul_squeeze_add.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { const std::vector netPrecisions = { diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/multioutput_eltwise_squeeze_eltwise.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/multioutput_eltwise_squeeze_eltwise.cpp index cd49f8adc22..eff09008cf9 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/multioutput_eltwise_squeeze_eltwise.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/multioutput_eltwise_squeeze_eltwise.cpp @@ -4,7 +4,7 @@ #include "subgraph_tests/multioutput_eltwise_squeeze_eltwise.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { std::vector>> inputs{ diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/negative_memory_layer_offset.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/negative_memory_layer_offset.cpp index 5659c22eab5..e88f0587681 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/negative_memory_layer_offset.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/negative_memory_layer_offset.cpp @@ -5,7 +5,7 @@ #include "common_test_utils/test_constants.hpp" #include "gna/gna_config.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { std::vector netPrecisions = { InferenceEngine::Precision::FP32, diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshape_permute_conv_permute_reshape_act.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshape_permute_conv_permute_reshape_act.cpp index 22e79a90071..1c7ba8b2960 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshape_permute_conv_permute_reshape_act.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshape_permute_conv_permute_reshape_act.cpp @@ -32,7 +32,7 @@ std::map additional_config = { {"GNA_SCALE_FACTOR_0", "2340"} }; -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { INSTANTIATE_TEST_CASE_P(smoke_basic, ConvReshapeAct, ::testing::Combine( ::testing::ValuesIn(netPrecisions), @@ -42,6 +42,6 @@ namespace LayerTestsDefinitions { ::testing::ValuesIn(output_channels), ::testing::Values(additional_config)), ConvReshapeAct::getTestCaseName); -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp index f002f5fc17b..456ab0aa130 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp @@ -4,7 +4,7 @@ #include "subgraph_tests/reshape_squeeze_reshape_relu.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { std::vector inputs{ diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshapre_permute_reshape.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshapre_permute_reshape.cpp index 7b39da8d9f6..ab5c5f0bb35 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshapre_permute_reshape.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshapre_permute_reshape.cpp @@ -4,7 +4,7 @@ #include "subgraph_tests/reshape_permute_reshape.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { std::vector>> inputs{ diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/scale_shift.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/scale_shift.cpp index 8fc45c20305..9b4c56ae148 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/scale_shift.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/scale_shift.cpp @@ -6,7 +6,7 @@ #include "subgraph_tests/scaleshift.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/softsign.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/softsign.cpp index 8bc43c55fe3..d92aa166175 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/softsign.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/softsign.cpp @@ -7,7 +7,7 @@ #include "common_test_utils/test_constants.hpp" #include "subgraph_tests/softsign.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { const std::vector netPrecisions = { diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_conv_concat.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_conv_concat.cpp index 5e25cb1e8a2..c95f6855f96 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_conv_concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_conv_concat.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/split_conv_concat.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; const std::vector netPrecisions = { InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16 diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_relu.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_relu.cpp index a24a2ff26f9..a2bf744e85f 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_relu.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_relu.cpp @@ -5,7 +5,7 @@ #include "common_test_utils/test_constants.hpp" #include "gna/gna_config.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { std::vector>> inputs{ diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_trivial_permute_concat.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_trivial_permute_concat.cpp index 686c72c5b54..aca05e343fe 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_trivial_permute_concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_trivial_permute_concat.cpp @@ -5,7 +5,7 @@ #include "common_test_utils/test_constants.hpp" #include "gna/gna_config.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { std::vector netPrecisions = { InferenceEngine::Precision::FP32, diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/trivial_concat.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/trivial_concat.cpp index 0438d852b22..46395c3fce5 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/trivial_concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/trivial_concat.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/trivial_concat.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { std::vector> inShapes = { diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/two_fake_quantize_to_fullyconnected.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/two_fake_quantize_to_fullyconnected.cpp index 35c82543f91..84e913e99f5 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/two_fake_quantize_to_fullyconnected.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/two_fake_quantize_to_fullyconnected.cpp @@ -8,7 +8,7 @@ #include "subgraph_tests/two_fake_quantize_to_fullyconnected.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/set_preprocess.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/set_preprocess.cpp index 97d69dbb659..6b61105c648 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/set_preprocess.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/set_preprocess.cpp @@ -3,7 +3,7 @@ // #include "multi-device/multi_device_config.hpp" -#include +#include #include "behavior/set_preprocess.hpp" using namespace BehaviorTestsDefinitions; diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/core_config.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/core_config.cpp new file mode 100644 index 00000000000..25bc749cc4f --- /dev/null +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/core_config.cpp @@ -0,0 +1,8 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "functional_test_utils/core_config.hpp" + +void CoreConfiguration(LayerTestsUtils::LayerTestsCommon* test) { +} diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/layer_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/layer_transformation.cpp index b0f0d13bc1b..661688835bf 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/layer_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/layer_transformation.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include #include @@ -34,15 +34,15 @@ #include #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" using namespace InferenceEngine::details; #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" namespace LayerTestsUtils { diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/plugin_config.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/plugin_config.cpp deleted file mode 100644 index 53e2dd7baa3..00000000000 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/plugin_config.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (C) 2020 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#include "functional_test_utils/plugin_config.hpp" - -void PreparePluginConfiguration(LayerTestsUtils::LayerTestsCommon* test) { -} diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/constant_result.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/constant_result.cpp index 611e8fc38a0..56a4b0b601b 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/constant_result.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/constant_result.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/constant_result.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { INSTANTIATE_TEST_CASE_P(smoke_Check, ConstantResultSubgraphTest, diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp index 5494c69993d..a4245531320 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp @@ -7,7 +7,7 @@ #include "common_test_utils/test_constants.hpp" #include "subgraph_tests/matmul_squeeze_add.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { const std::vector netPrecisions = { diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/multiply_add.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/multiply_add.cpp index 81eece12718..d8edd91ac88 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/multiply_add.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/multiply_add.cpp @@ -6,7 +6,7 @@ #include "subgraph_tests/multiply_add.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reshape_permute_conv_permute_reshape_act.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reshape_permute_conv_permute_reshape_act.cpp index 892a395a472..8210dccc0c9 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reshape_permute_conv_permute_reshape_act.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reshape_permute_conv_permute_reshape_act.cpp @@ -29,7 +29,7 @@ std::vector netPrecisions = { std::map additional_config = {}; -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { INSTANTIATE_TEST_CASE_P(smoke_basic, ConvReshapeAct, ::testing::Combine( ::testing::ValuesIn(netPrecisions), @@ -39,6 +39,6 @@ namespace LayerTestsDefinitions { ::testing::ValuesIn(output_channels), ::testing::Values(additional_config)), ConvReshapeAct::getTestCaseName); -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp index c8f4cd1b803..ba5ac2df9a2 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp @@ -4,7 +4,7 @@ #include "subgraph_tests/reshape_squeeze_reshape_relu.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { std::vector inputs_squeeze { diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/scale_shift.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/scale_shift.cpp index 06587796e84..f28fdc26c0a 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/scale_shift.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/scale_shift.cpp @@ -6,7 +6,7 @@ #include "subgraph_tests/scaleshift.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/split_conv_concat.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/split_conv_concat.cpp index 6b051edd0f7..6d360c801f1 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/split_conv_concat.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/split_conv_concat.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/split_conv_concat.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { const std::vector netPrecisions = { diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/operations/dynamic_shape_resolver.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/operations/dynamic_shape_resolver.cpp index 3f0f8e7d086..ef2838dd399 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/operations/dynamic_shape_resolver.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/operations/dynamic_shape_resolver.cpp @@ -15,7 +15,7 @@ #include "vpu/ngraph/operations/dynamic_shape_resolver.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" namespace { diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/set_preprocess.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/set_preprocess.cpp index 0193450bdea..bb808547256 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/set_preprocess.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/set_preprocess.cpp @@ -3,7 +3,7 @@ // #include "multi-device/multi_device_config.hpp" -#include +#include #include "behavior/set_preprocess.hpp" using namespace BehaviorTestsDefinitions; diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/core_config.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/core_config.cpp new file mode 100644 index 00000000000..25bc749cc4f --- /dev/null +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/core_config.cpp @@ -0,0 +1,8 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "functional_test_utils/core_config.hpp" + +void CoreConfiguration(LayerTestsUtils::LayerTestsCommon* test) { +} diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/plugin_config.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/plugin_config.cpp deleted file mode 100644 index 53e2dd7baa3..00000000000 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/plugin_config.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (C) 2020 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#include "functional_test_utils/plugin_config.hpp" - -void PreparePluginConfiguration(LayerTestsUtils::LayerTestsCommon* test) { -} diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/constant_result.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/constant_result.cpp index ebc2f5fe6d0..07ad29d2e79 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/constant_result.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/constant_result.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/constant_result.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { INSTANTIATE_TEST_CASE_P(smoke_Check, ConstantResultSubgraphTest, diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp index 0182282d244..0dd02849e29 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp @@ -4,7 +4,7 @@ #include "subgraph_tests/reshape_squeeze_reshape_relu.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { std::vector inputs = { diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/split_conv_concat.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/split_conv_concat.cpp index e5c987d8c8d..043c27d9ccd 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/split_conv_concat.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/split_conv_concat.cpp @@ -7,7 +7,7 @@ #include "subgraph_tests/split_conv_concat.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +using namespace SubgraphTestsDefinitions; namespace { diff --git a/inference-engine/tests/functional/plugin/myriad/single_layer_tests/out_shape_of_reshape.cpp b/inference-engine/tests/functional/plugin/myriad/single_layer_tests/out_shape_of_reshape.cpp index 00a0cea319e..3fd4d151175 100644 --- a/inference-engine/tests/functional/plugin/myriad/single_layer_tests/out_shape_of_reshape.cpp +++ b/inference-engine/tests/functional/plugin/myriad/single_layer_tests/out_shape_of_reshape.cpp @@ -6,7 +6,7 @@ #include "vpu/private_plugin_config.hpp" -#include +#include #include #include #include diff --git a/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_broadcast.cpp b/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_broadcast.cpp index 570393e5c58..22caeaa0059 100644 --- a/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_broadcast.cpp +++ b/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_broadcast.cpp @@ -6,7 +6,7 @@ #include "vpu/private_plugin_config.hpp" -#include +#include #include #include diff --git a/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_nms.cpp b/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_nms.cpp index f3ba04d5460..2d471918c8d 100644 --- a/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_nms.cpp +++ b/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_nms.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include #include diff --git a/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_nonzero.cpp b/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_nonzero.cpp index 021fa03bd34..098fa4f2a63 100644 --- a/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_nonzero.cpp +++ b/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_nonzero.cpp @@ -6,7 +6,7 @@ #include "vpu/private_plugin_config.hpp" -#include +#include #include #include #include diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/concat_split_transpose.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/concat_split_transpose.cpp index 58ac64b80ba..6a9c27f86ab 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/concat_split_transpose.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/concat_split_transpose.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include "vpu/private_plugin_config.hpp" #include diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_binary_elementwise.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_binary_elementwise.cpp index ae4f600d33f..ee159c6db3e 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_binary_elementwise.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_binary_elementwise.cpp @@ -4,7 +4,7 @@ #include "dsr_tests_common.hpp" -#include +#include #include #include diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_clamp.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_clamp.cpp index 196fd1167ac..6c68311ca55 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_clamp.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_clamp.cpp @@ -4,7 +4,7 @@ #include "dsr_tests_common.hpp" -#include +#include #include #include diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_concat.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_concat.cpp index 2926e30783c..1ec0a3b15d5 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_concat.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_concat.cpp @@ -4,7 +4,7 @@ #include "dsr_tests_common.hpp" -#include +#include #include #include diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_convert.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_convert.cpp index 372e79d0dc2..846c135a2da 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_convert.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_convert.cpp @@ -4,7 +4,7 @@ #include "dsr_tests_common.hpp" -#include +#include #include #include diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather.cpp index 199f8010de0..b6938c767ed 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather.cpp @@ -4,7 +4,7 @@ #include "dsr_tests_common.hpp" -#include +#include #include #include diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather_nd.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather_nd.cpp index 48216541396..7e9d0016507 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather_nd.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather_nd.cpp @@ -4,7 +4,7 @@ #include "dsr_tests_common.hpp" -#include +#include #include namespace { diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_matmul.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_matmul.cpp index 67873fd9e9d..a54d05826f4 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_matmul.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_matmul.cpp @@ -4,7 +4,7 @@ #include "dsr_tests_common.hpp" -#include +#include #include #include diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_roialign.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_roialign.cpp index 1a627e488e5..1c70d4bdfd3 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_roialign.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_roialign.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include #include diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_squeeze.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_squeeze.cpp index 053bb48b7a7..f7931c8805f 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_squeeze.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_squeeze.cpp @@ -4,7 +4,7 @@ #include "dsr_tests_common.hpp" -#include +#include #include #include diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_strided_slice.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_strided_slice.cpp index fe9b619cc0b..3d0190639b9 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_strided_slice.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_strided_slice.cpp @@ -4,7 +4,7 @@ #include "dsr_tests_common.hpp" -#include +#include #include #include diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_tests_common.hpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_tests_common.hpp index 6a68373c3db..cc8ef1caa42 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_tests_common.hpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_tests_common.hpp @@ -11,7 +11,7 @@ #include "vpu/private_plugin_config.hpp" -#include +#include #include namespace LayerTestsUtils { diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_unary_elementwise.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_unary_elementwise.cpp index 4d3e8033200..25800e0fa70 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_unary_elementwise.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_unary_elementwise.cpp @@ -4,7 +4,7 @@ #include "dsr_tests_common.hpp" -#include +#include #include #include diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nms_nonzero.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nms_nonzero.cpp index bcec6448e42..92323d1e10c 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nms_nonzero.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nms_nonzero.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include namespace { diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nonzero_transpose.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nonzero_transpose.cpp index 29a4fc11b2e..75aba419890 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nonzero_transpose.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nonzero_transpose.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include #include #include diff --git a/inference-engine/tests/functional/plugin/shared/CMakeLists.txt b/inference-engine/tests/functional/plugin/shared/CMakeLists.txt index 2b50e312a7d..d80bb2ba6e7 100644 --- a/inference-engine/tests/functional/plugin/shared/CMakeLists.txt +++ b/inference-engine/tests/functional/plugin/shared/CMakeLists.txt @@ -9,6 +9,7 @@ list(APPEND EXPORT_DEPENDENCIES funcTestUtils ngraphFunctions lptNgraphFunctions + sharedTestClasses ) set(PUBLIC_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include") diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/behavior_test_utils.hpp b/inference-engine/tests/functional/plugin/shared/include/base/behavior_test_utils.hpp similarity index 100% rename from inference-engine/tests/ie_test_utils/functional_test_utils/behavior_test_utils.hpp rename to inference-engine/tests/functional/plugin/shared/include/base/behavior_test_utils.hpp diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/import_export_base/import_export_base.hpp b/inference-engine/tests/functional/plugin/shared/include/base/import_export_base/import_export_base.hpp similarity index 94% rename from inference-engine/tests/ie_test_utils/functional_test_utils/import_export_base/import_export_base.hpp rename to inference-engine/tests/functional/plugin/shared/include/base/import_export_base/import_export_base.hpp index 4bb5da58bae..8c954e01f46 100644 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/import_export_base/import_export_base.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/base/import_export_base/import_export_base.hpp @@ -4,7 +4,7 @@ #pragma once -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/config.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/config.hpp index 31f6bdf2c0d..b6110ae7651 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/config.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/config.hpp @@ -10,7 +10,7 @@ #include #include "ie_extension.h" #include -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "ngraph_functions/utils/ngraph_helpers.hpp" #include "ngraph_functions/builders.hpp" #include @@ -23,7 +23,7 @@ #include "functional_test_utils/plugin_cache.hpp" #include "functional_test_utils/blob_utils.hpp" #include -#include +#include #include "ngraph_functions/pass/convert_prc.hpp" #include "ngraph_functions/subgraph_builders.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/exec_graph_info.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/exec_graph_info.hpp index e8d85ef8c5e..d1065d2e027 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/exec_graph_info.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/exec_graph_info.hpp @@ -6,7 +6,7 @@ #include #include "ie_extension.h" #include -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "ngraph_functions/utils/ngraph_helpers.hpp" #include "ngraph_functions/builders.hpp" #include @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request.hpp index 5e2c62b2abd..c371abf39df 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request.hpp @@ -12,7 +12,7 @@ #include #include "ie_extension.h" #include -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "ngraph_functions/utils/ngraph_helpers.hpp" #include "ngraph_functions/builders.hpp" #include "multi-device/multi_device_config.hpp" @@ -20,12 +20,12 @@ #include #include #include -#include +#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/subgraph_builders.hpp" -#include "subgraph_tests/basic_lstm.hpp" +#include "shared_test_classes/subgraph/basic_lstm.hpp" namespace BehaviorTestsDefinitions { using InferRequestTests = BehaviorTestsUtils::BehaviorTestsBasic; @@ -637,7 +637,7 @@ TEST_P(InferRequestTestsResultNotReady, ReturnResultNotReadyFromWaitInAsyncModeF // return ngrpah::Function // GetNetwork(3000, 380) make inference around 20ms on GNA SW // so increases chances for getting RESULT_NOT_READY - function = LayerTestsDefinitions::Basic_LSTM_S::GetNetwork(300, 38); + function = SubgraphTestsDefinitions::Basic_LSTM_S::GetNetwork(300, 38); InferenceEngine::CNNNetwork cnnNet(function); // Load CNNNetwork to target plugins auto execNet = ie->LoadNetwork(cnnNet, targetDevice, configuration); diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_callback.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_callback.hpp index 873fa1b3878..ad1b27d6bca 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_callback.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_callback.hpp @@ -11,11 +11,11 @@ #include #include "ie_extension.h" #include -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "ngraph_functions/utils/ngraph_helpers.hpp" #include "ngraph_functions/builders.hpp" #include -#include +#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" #include "functional_test_utils/blob_utils.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_cancellation.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_cancellation.hpp index 6b6e2f22284..da4429c9fe1 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_cancellation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_cancellation.hpp @@ -8,19 +8,24 @@ #include #include #include -#include -#include "ie_extension.h" #include -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "ngraph_functions/builders.hpp" +#include + #include -#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" #include "functional_test_utils/blob_utils.hpp" + #include "ngraph_functions/pass/convert_prc.hpp" #include "ngraph_functions/subgraph_builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "ngraph_functions/builders.hpp" + +#include "base/behavior_test_utils.hpp" #include "behavior/infer_request_cancellation.hpp" namespace BehaviorTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_config.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_config.hpp index 984b19463f1..b2f2008cd25 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_config.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_config.hpp @@ -10,7 +10,7 @@ #include #include "ie_extension.h" #include -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "ngraph_functions/utils/ngraph_helpers.hpp" #include "ngraph_functions/builders.hpp" #include @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" #include "functional_test_utils/blob_utils.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_input.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_input.hpp index d91c022cdd8..d066f8ef80e 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_input.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_input.hpp @@ -10,13 +10,13 @@ #include #include "ie_extension.h" #include -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "ngraph_functions/utils/ngraph_helpers.hpp" #include "ngraph_functions/builders.hpp" #include "multi-device/multi_device_config.hpp" #include #include -#include +#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" #include "functional_test_utils/blob_utils.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_output.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_output.hpp index 5f06c664b13..a68deeba4a0 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_output.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_output.hpp @@ -10,13 +10,13 @@ #include #include "ie_extension.h" #include -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "ngraph_functions/utils/ngraph_helpers.hpp" #include "ngraph_functions/builders.hpp" #include "multi-device/multi_device_config.hpp" #include #include -#include +#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" #include "functional_test_utils/blob_utils.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/invalid_cases/proposal.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/invalid_cases/proposal.hpp index 3f07be3acbd..880f9d1fda6 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/invalid_cases/proposal.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/invalid_cases/proposal.hpp @@ -4,7 +4,7 @@ #pragma once -#include "single_layer_tests/proposal.hpp" +#include "shared_test_classes/single_layer/proposal.hpp" namespace BehaviorTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/perf_counters.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/perf_counters.hpp index 15859049ec2..9f77230eff4 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/perf_counters.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/perf_counters.hpp @@ -8,10 +8,10 @@ #include "common_test_utils/test_assertions.hpp" #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ie_preprocess.hpp" -#include "functional_test_utils/behavior_test_utils.hpp" +#include "base/behavior_test_utils.hpp" namespace BehaviorTestsDefinitions { using PerfCountersTest = BehaviorTestsUtils::BehaviorTestsBasic; diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/preprocessing.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/preprocessing.hpp index d5b322c1cbe..ae825d49c5a 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/preprocessing.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/preprocessing.hpp @@ -8,10 +8,10 @@ #include "common_test_utils/test_assertions.hpp" #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ie_preprocess.hpp" -#include "functional_test_utils/behavior_test_utils.hpp" +#include "base/behavior_test_utils.hpp" namespace { void setInputNetworkPrecision(InferenceEngine::CNNNetwork &network, InferenceEngine::InputsDataMap &inputs_info, diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/set_blob.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/set_blob.hpp index 151078ac115..6ed62ff5947 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/set_blob.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/set_blob.hpp @@ -4,7 +4,7 @@ #pragma once -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "common_test_utils/data_utils.hpp" #include "common_test_utils/common_utils.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/set_blob_of_kind.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/set_blob_of_kind.hpp index 4f305a74b99..8271cbcf88e 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/set_blob_of_kind.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/set_blob_of_kind.hpp @@ -4,7 +4,7 @@ #pragma once -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "common_test_utils/common_utils.hpp" namespace BehaviorTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/set_preprocess.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/set_preprocess.hpp index d7e44523b1b..3ca9ab37c2c 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/set_preprocess.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/set_preprocess.hpp @@ -9,10 +9,10 @@ #include "common_test_utils/test_assertions.hpp" #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ie_preprocess.hpp" -#include "functional_test_utils/behavior_test_utils.hpp" +#include "base/behavior_test_utils.hpp" namespace BehaviorTestsDefinitions { using PreprocessTest = BehaviorTestsUtils::BehaviorTestsBasic; diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/stress_tests.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/stress_tests.hpp index 54aa04b9c7b..52a39037f85 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/stress_tests.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/stress_tests.hpp @@ -9,7 +9,7 @@ #include #include -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/test_plugin.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/test_plugin.hpp index 9e299eebc96..36468505a85 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/test_plugin.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/test_plugin.hpp @@ -15,9 +15,9 @@ #include #include #include -#include +#include #include -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "ngraph_functions/utils/ngraph_helpers.hpp" #include "ngraph_functions/builders.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/version.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/version.hpp index 095147b690f..d663262822b 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/version.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/version.hpp @@ -8,10 +8,10 @@ #include "common_test_utils/test_assertions.hpp" #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ie_preprocess.hpp" -#include "functional_test_utils/behavior_test_utils.hpp" +#include "base/behavior_test_utils.hpp" namespace BehaviorTestsDefinitions { using VersionTest = BehaviorTestsUtils::BehaviorTestsBasic; diff --git a/inference-engine/tests/functional/plugin/shared/include/execution_graph_tests/num_inputs_fusing_bin_conv.hpp b/inference-engine/tests/functional/plugin/shared/include/execution_graph_tests/num_inputs_fusing_bin_conv.hpp index 9f47b4ecc5f..e198ef69903 100644 --- a/inference-engine/tests/functional/plugin/shared/include/execution_graph_tests/num_inputs_fusing_bin_conv.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/execution_graph_tests/num_inputs_fusing_bin_conv.hpp @@ -7,7 +7,7 @@ #include #include "ngraph_functions/builders.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" namespace ExecutionGraphTests { diff --git a/inference-engine/tests/functional/plugin/shared/include/execution_graph_tests/unique_node_names.hpp b/inference-engine/tests/functional/plugin/shared/include/execution_graph_tests/unique_node_names.hpp index 2c51f91281c..353e09f87d1 100644 --- a/inference-engine/tests/functional/plugin/shared/include/execution_graph_tests/unique_node_names.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/execution_graph_tests/unique_node_names.hpp @@ -9,7 +9,7 @@ #include #include -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "ngraph_functions/builders.hpp" namespace ExecutionGraphTests { diff --git a/inference-engine/tests/functional/plugin/shared/include/hetero/query_network.hpp b/inference-engine/tests/functional/plugin/shared/include/hetero/query_network.hpp index 1e9b9fd9786..a8feb88a67d 100644 --- a/inference-engine/tests/functional/plugin/shared/include/hetero/query_network.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/hetero/query_network.hpp @@ -7,7 +7,7 @@ #include #include #include -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "ngraph_functions/utils/ngraph_helpers.hpp" namespace HeteroTests { diff --git a/inference-engine/tests/functional/plugin/shared/include/hetero/synthetic.hpp b/inference-engine/tests/functional/plugin/shared/include/hetero/synthetic.hpp index a944ad44cf2..59da21acfb4 100644 --- a/inference-engine/tests/functional/plugin/shared/include/hetero/synthetic.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/hetero/synthetic.hpp @@ -8,7 +8,7 @@ #include #include #include -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "ngraph_functions/utils/ngraph_helpers.hpp" namespace HeteroTests { diff --git a/inference-engine/tests/functional/plugin/shared/include/import_export_tests/import_nonzero.hpp b/inference-engine/tests/functional/plugin/shared/include/import_export_tests/import_nonzero.hpp index 58d863f3b88..2172697cc55 100644 --- a/inference-engine/tests/functional/plugin/shared/include/import_export_tests/import_nonzero.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/import_export_tests/import_nonzero.hpp @@ -4,7 +4,7 @@ #pragma once -#include "functional_test_utils/import_export_base/import_export_base.hpp" +#include "base/import_export_base/import_export_base.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/import_export_tests/import_reshape_permute_conv.hpp b/inference-engine/tests/functional/plugin/shared/include/import_export_tests/import_reshape_permute_conv.hpp index e08d4e5dcc5..1b12cc6589d 100644 --- a/inference-engine/tests/functional/plugin/shared/include/import_export_tests/import_reshape_permute_conv.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/import_export_tests/import_reshape_permute_conv.hpp @@ -4,7 +4,7 @@ #pragma once -#include "functional_test_utils/import_export_base/import_export_base.hpp" +#include "base/import_export_base/import_export_base.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/add_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/add_transformation.hpp index 3df460c1c29..866d6d2da3a 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/add_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/add_transformation.hpp @@ -6,7 +6,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/clamp_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/clamp_transformation.hpp index aed62adabeb..97ff925b9ea 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/clamp_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/clamp_transformation.hpp @@ -4,7 +4,7 @@ #pragma once -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp index edb659d66af..46f66663d28 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_childs.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_childs.hpp index 2993c9224f7..9ef385d1447 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_childs.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_childs.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp index b85d9eb8b00..29633c8738f 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp index bde200ce9c9..c83f9339a14 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp index 3a3810daf07..97f7028faa7 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/convolution_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/convolution_transformation.hpp index fa008401cdf..90cfd756675 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/convolution_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/convolution_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_weights.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/convolution_with_incorrect_weights.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/convolution_with_incorrect_weights.hpp index 0e0c297b418..c501166e0de 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/convolution_with_incorrect_weights.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/convolution_with_incorrect_weights.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_weights.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/depth_to_space_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/depth_to_space_transformation.hpp index f47565e6eea..6874278c25c 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/depth_to_space_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/depth_to_space_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_avg_pool_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_avg_pool_transformation.hpp index dff852f7431..d3ca0b12eab 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_avg_pool_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_avg_pool_transformation.hpp @@ -8,7 +8,7 @@ #include #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_max_pool_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_max_pool_transformation.hpp index ecd09bd3fe1..4aef7c28182 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_max_pool_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_max_pool_transformation.hpp @@ -8,7 +8,7 @@ #include #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.hpp index 12584f01c5e..d065259e2af 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_weights.hpp" #include "lpt_ngraph_functions/fake_quantize_and_two_output_branches_with_convolution_function.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_precision_selection_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_precision_selection_transformation.hpp index 6631331577a..7a57360d9f8 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_precision_selection_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_precision_selection_transformation.hpp @@ -7,7 +7,7 @@ #include #include #include "lpt_ngraph_functions/fake_quantize_function.hpp" -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_weights.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_transformation.hpp index 3d4a68122ec..8c9cb2cbc23 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_transformation.hpp @@ -7,7 +7,7 @@ #include #include #include "lpt_ngraph_functions/fake_quantize_function.hpp" -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fully_connected_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fully_connected_transformation.hpp index bc8efc5cec1..2004b77be12 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fully_connected_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fully_connected_transformation.hpp @@ -7,7 +7,7 @@ #include #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" class MatMulShapes { public: diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_convert_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_convert_transformation.hpp index e6367c6e418..fe6cebbcc36 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_convert_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_convert_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.hpp index 5a7144ddc6a..48bd9ae6053 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.hpp @@ -7,7 +7,7 @@ #include #include #include "lpt_ngraph_functions/fuse_fake_quantize_and_scale_shift_function.hpp" -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_transformation.hpp index 290b6f11a28..a1d5b94e74d 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_transformation.hpp @@ -10,7 +10,7 @@ #include "lpt_ngraph_functions/common/add.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.hpp index fbdbebfeb38..549249a8419 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.hpp @@ -10,7 +10,7 @@ #include "lpt_ngraph_functions/common/add.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.hpp index 11744d81610..c8d6d273a80 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.hpp @@ -10,7 +10,7 @@ #include "lpt_ngraph_functions/common/add.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/gemm_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/gemm_transformation.hpp index d66b2ebb17a..dedd5fd0322 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/gemm_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/gemm_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/group_convolution_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/group_convolution_transformation.hpp index 6f7f1d6af96..448cfcae64e 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/group_convolution_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/group_convolution_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_weights.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/interpolate_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/interpolate_transformation.hpp index 4045bfb8759..a94291142a9 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/interpolate_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/interpolate_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp index 43ecdec5a7f..45357d54b88 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp @@ -9,7 +9,7 @@ #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "lpt_ngraph_functions/mat_mul_function.hpp" -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp index b3d7c668db0..42ae7cca2f8 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp @@ -10,7 +10,7 @@ #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_weights.hpp" #include "lpt_ngraph_functions/mat_mul_function.hpp" -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.hpp index 76e14249b53..0df49f02c09 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_to_group_convolution_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_to_group_convolution_transformation.hpp index 332fbcffc8d..8a7cc2117ba 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_to_group_convolution_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_to_group_convolution_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_transformation.hpp index c1b4cb9a9d0..3f2f03714c3 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_with_one_parent_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_with_one_parent_transformation.hpp index f9bf9e87c4a..2f8ddaa55bb 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_with_one_parent_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_with_one_parent_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mvn_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mvn_transformation.hpp index 3c25a9c6de2..081049829c2 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mvn_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mvn_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" using namespace ngraph; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/normalize_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/normalize_transformation.hpp index 5cc801890d5..8512169b336 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/normalize_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/normalize_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_handling_in_transformations.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_handling_in_transformations.hpp index 5e1bf632e16..9236c19e73c 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_handling_in_transformations.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_handling_in_transformations.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_handling_in_transformations_for_concat.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_handling_in_transformations_for_concat.hpp index 962fc4e4de1..1afed305212 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_handling_in_transformations_for_concat.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_handling_in_transformations_for_concat.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_handling_in_transformations_for_concat_multi_channel.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_handling_in_transformations_for_concat_multi_channel.hpp index efda48775e6..1c3696e1c56 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_handling_in_transformations_for_concat_multi_channel.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_handling_in_transformations_for_concat_multi_channel.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp index b7108d25815..399256b5ee2 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp @@ -6,7 +6,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp index 8e817dff562..6f920a37962 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp @@ -6,7 +6,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reshape_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reshape_transformation.hpp index 8b8ea38c52b..b74fffed8b0 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reshape_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reshape_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp index 39e2a7f612f..ae71cfca2b7 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp @@ -4,7 +4,7 @@ #pragma once -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp index 4b09c063bf1..00d7cc51094 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.hpp index 593602eea68..d99db9477ae 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/subtract_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/subtract_transformation.hpp index 6388c20a0dd..49fc0367f0f 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/subtract_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/subtract_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/transpose_after_matmul_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/transpose_after_matmul_transformation.hpp index 9159944edbe..5982a3f6ab6 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/transpose_after_matmul_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/transpose_after_matmul_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/transpose_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/transpose_transformation.hpp index 00e261ddc5a..72abdfa57d1 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/transpose_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/transpose_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp index db3ecb9992e..d54ac53c8e3 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp index e30e8aeae29..53f264ca37e 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp @@ -4,7 +4,7 @@ #pragma once -#include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/ngraph_conversion_tests/conv_bias_fusion.hpp b/inference-engine/tests/functional/plugin/shared/include/ngraph_conversion_tests/conv_bias_fusion.hpp index f6344ffda0c..80e3e8dd3ef 100644 --- a/inference-engine/tests/functional/plugin/shared/include/ngraph_conversion_tests/conv_bias_fusion.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/ngraph_conversion_tests/conv_bias_fusion.hpp @@ -16,7 +16,7 @@ #include "functional_test_utils/blob_utils.hpp" #include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" namespace NGraphConversionTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/ngraph_conversion_tests/plugin_specific_ngraph_conversion.hpp b/inference-engine/tests/functional/plugin/shared/include/ngraph_conversion_tests/plugin_specific_ngraph_conversion.hpp index 44497ac8a75..bfe3eff73a9 100644 --- a/inference-engine/tests/functional/plugin/shared/include/ngraph_conversion_tests/plugin_specific_ngraph_conversion.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/ngraph_conversion_tests/plugin_specific_ngraph_conversion.hpp @@ -16,7 +16,7 @@ #include "functional_test_utils/blob_utils.hpp" #include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" namespace NGraphConversionTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/activation.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/activation.hpp index 97d3c7d346e..809fd94d53d 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/activation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/activation.hpp @@ -4,113 +4,16 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include - - -#include "ie_core.hpp" -#include "ie_precision.hpp" -#include "details/ie_exception.hpp" - -#include "ngraph/opsets/opset1.hpp" - -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "common_test_utils/common_utils.hpp" - -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "ngraph_functions/builders.hpp" - +#include "shared_test_classes/single_layer/activation.hpp" namespace LayerTestsDefinitions { -static std::map activationNames = { - {ngraph::helpers::ActivationTypes::Sigmoid, "Sigmoid"}, - {ngraph::helpers::ActivationTypes::Tanh, "Tanh"}, - {ngraph::helpers::ActivationTypes::Relu, "Relu"}, - {ngraph::helpers::ActivationTypes::LeakyRelu, "LeakyRelu"}, - {ngraph::helpers::ActivationTypes::Exp, "Exp"}, - {ngraph::helpers::ActivationTypes::Log, "Log"}, - {ngraph::helpers::ActivationTypes::Sign, "Sign"}, - {ngraph::helpers::ActivationTypes::Abs, "Abs"}, - {ngraph::helpers::ActivationTypes::Gelu, "Gelu"}, - {ngraph::helpers::ActivationTypes::Clamp, "Clamp"}, - {ngraph::helpers::ActivationTypes::Negative, "Negative"}, - {ngraph::helpers::ActivationTypes::Acos, "Acos"}, - {ngraph::helpers::ActivationTypes::Asin, "Asin"}, - {ngraph::helpers::ActivationTypes::Atan, "Atan"}, - {ngraph::helpers::ActivationTypes::Cos, "Cos"}, - {ngraph::helpers::ActivationTypes::Cosh, "Cosh"}, - {ngraph::helpers::ActivationTypes::Floor, "Floor"}, - {ngraph::helpers::ActivationTypes::Sin, "Sin"}, - {ngraph::helpers::ActivationTypes::Sinh, "Sinh"}, - {ngraph::helpers::ActivationTypes::Sqrt, "Sqrt"}, - {ngraph::helpers::ActivationTypes::Tan, "Tan"}, - {ngraph::helpers::ActivationTypes::Elu, "Elu"}, - {ngraph::helpers::ActivationTypes::Erf, "Erf"}, - {ngraph::helpers::ActivationTypes::HardSigmoid, "HardSigmoid"}, - {ngraph::helpers::ActivationTypes::Selu, "Selu"}, - {ngraph::helpers::ActivationTypes::Sigmoid, "Sigmoid"}, - {ngraph::helpers::ActivationTypes::Tanh, "Tanh"}, - {ngraph::helpers::ActivationTypes::Relu, "Relu"}, - {ngraph::helpers::ActivationTypes::LeakyRelu, "LeakyRelu"}, - {ngraph::helpers::ActivationTypes::Exp, "Exp"}, - {ngraph::helpers::ActivationTypes::Log, "Log"}, - {ngraph::helpers::ActivationTypes::Sign, "Sign"}, - {ngraph::helpers::ActivationTypes::Abs, "Abs"}, - {ngraph::helpers::ActivationTypes::Gelu, "Gelu"}, - {ngraph::helpers::ActivationTypes::Ceiling, "Ceiling"}, - {ngraph::helpers::ActivationTypes::PReLu, "PReLu"}, - {ngraph::helpers::ActivationTypes::Mish, "Mish"}, - {ngraph::helpers::ActivationTypes::HSwish, "HSwish"}, - {ngraph::helpers::ActivationTypes::SoftPlus, "SoftPlus"}, - {ngraph::helpers::ActivationTypes::Swish, "Swish"}, - {ngraph::helpers::ActivationTypes::HSigmoid, "HSigmoid"}, - {ngraph::helpers::ActivationTypes::RoundHalfToEven, "RoundHalfToEven"}, - {ngraph::helpers::ActivationTypes::RoundHalfAwayFromZero, "RoundHalfAwayFromZero"} -}; +TEST_P(ActivationLayerTest, CompareWithRefs) { + Run(); +} -typedef std::tuple< - std::pair>, // Activation type and constant value - InferenceEngine::Precision, - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - std::pair, std::vector>, - std::string> activationParams; - -class ActivationLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - ngraph::helpers::ActivationTypes activationType; - static std::string getTestCaseName(const testing::TestParamInfo &obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; - -protected: - void SetUp() override; -}; - -class ActivationParamLayerTest : public ActivationLayerTest { -public: - void Infer() override; - -protected: - void SetUp() override; - -private: - void generateActivationBlob(std::vector constantsValue); - ngraph::ParameterVector createActivationParams( - ngraph::element::Type ngPrc, std::vector inShape = {}); - -private: - std::vector constantsValue; -}; +TEST_P(ActivationParamLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/batch_norm.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/batch_norm.hpp index c9820403202..502dc523169 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/batch_norm.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/batch_norm.hpp @@ -4,31 +4,13 @@ #pragma once -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/batch_norm.hpp" #include "ngraph_functions/builders.hpp" -typedef std::tuple< - double, // epsilon - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - InferenceEngine::SizeVector, // Input shapes - LayerTestsUtils::TargetDevice // Target device name -> BatchNormLayerTestParams; - namespace LayerTestsDefinitions { -class BatchNormLayerTest : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo& obj); - - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; - -protected: - void SetUp() override; -}; +TEST_P(BatchNormLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/batch_to_space.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/batch_to_space.hpp index 04dec5d8c79..248372ffbfd 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/batch_to_space.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/batch_to_space.hpp @@ -9,29 +9,12 @@ #include #include -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/batch_to_space.hpp" namespace LayerTestsDefinitions { -using batchToSpaceParamsTuple = typename std::tuple< - std::vector, // block shape - std::vector, // crops begin - std::vector, // crops end - std::vector, // Input shapes - InferenceEngine::Precision, // Network precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - std::string>; // Device name>; - -class BatchToSpaceLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; +TEST_P(BatchToSpaceLayerTest, CompareWithRefs) { + Run(); }; -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/broadcast.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/broadcast.hpp index 3634fc0d39b..30062c0464b 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/broadcast.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/broadcast.hpp @@ -4,32 +4,11 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/broadcast.hpp" namespace LayerTestsDefinitions { -using BroadcastParamsTuple = typename std::tuple< - InferenceEngine::SizeVector, // target shape - ngraph::AxisSet, // axes mapping - ngraph::op::BroadcastType, // broadcast mode - InferenceEngine::SizeVector, // Input shape - InferenceEngine::Precision, // Network precision - std::string>; // Device name - -class BroadcastLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; -}; - -} // namespace LayerTestsDefinitions \ No newline at end of file +TEST_P(BroadcastLayerTest, CompareWithRefs) { + Run(); +} +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/comparison.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/comparison.hpp index 817a4226021..c40325b0c76 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/comparison.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/comparison.hpp @@ -2,38 +2,13 @@ // // SPDX-License-Identifier: Apache-2.0 -#include +#pragma once -#include -#include - -#include "common_test_utils/common_utils.hpp" -#include "common_test_utils/test_common.hpp" -#include "common_test_utils/test_constants.hpp" -#include "ie_core.hpp" +#include namespace LayerTestsDefinitions { -namespace ComparisonParams { -using InputShapesTuple = std::pair, std::vector>; -} // ComparisonParams -typedef std::tuple< - ComparisonParams::InputShapesTuple, // Input shapes tuple - InferenceEngine::Precision, // NG Inputs precision - ngraph::helpers::ComparisonTypes, // Comparison op type - ngraph::helpers::InputLayerType, // Second input type - InferenceEngine::Precision, // IE in precision - InferenceEngine::Precision, // IE out precision - std::string, // Device name - std::map // Additional network configuration -> ComparisonTestParams; - -class ComparisonLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -protected: - void SetUp() override; - -public: - static std::string getTestCaseName(testing::TestParamInfo obj); -}; +TEST_P(ComparisonLayerTest, ComparisonTests) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/concat.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/concat.hpp index 85c47a95418..60603dc8318 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/concat.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/concat.hpp @@ -4,36 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/concat.hpp" namespace LayerTestsDefinitions { -using concatParamsTuple = typename std::tuple< - //TODO: according to specification axis have to be int, negative values are allowed - size_t, // Concat axis - std::vector>, // Input shapes - InferenceEngine::Precision, // Network precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - std::string>; // Device name - -// Multichannel -class ConcatLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; +TEST_P(ConcatLayerTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert.hpp index ede69da9102..5c82419454f 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert.hpp @@ -4,32 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/convert.hpp" namespace LayerTestsDefinitions { -using ConvertParamsTuple = typename std::tuple< - std::vector>, // Input shapes - InferenceEngine::Precision, // Source precision - InferenceEngine::Precision, // Target precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - std::string>; // Device name - -class ConvertLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; +TEST_P(ConvertLayerTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert_like.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert_like.hpp index 5619810b1e9..fcefd26cf88 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert_like.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert_like.hpp @@ -4,33 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/convert_like.hpp" namespace LayerTestsDefinitions { -using ConvertLikeParamsTuple = typename std::tuple< - std::vector>, // Input1 shapes - InferenceEngine::Precision, // Input1 precision - std::vector>, // Input2 shapes - InferenceEngine::Precision, // Input2 precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - std::string>; // Device name - -class ConvertLikeLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; +TEST_P(ConvertLikeLayerTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convolution.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convolution.hpp index 3e982e4ee0f..ddde8ac0606 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convolution.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convolution.hpp @@ -4,46 +4,12 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/single_layer/convolution.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -// ! [test_convolution:definition] -typedef std::tuple< - InferenceEngine::SizeVector, // Kernel size - InferenceEngine::SizeVector, // Strides - std::vector, // Pad begin - std::vector, // Pad end - InferenceEngine::SizeVector, // Dilation - size_t, // Num out channels - ngraph::op::PadType // Padding type -> convSpecificParams; -typedef std::tuple< - convSpecificParams, - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - InferenceEngine::SizeVector, // Input shapes - LayerTestsUtils::TargetDevice // Device name -> convLayerTestParamsSet; namespace LayerTestsDefinitions { - -class ConvolutionLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; -// ! [test_convolution:definition] +TEST_P(ConvolutionLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convolution_backprop_data.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convolution_backprop_data.hpp index 18809f8113e..4c71061464a 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convolution_backprop_data.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convolution_backprop_data.hpp @@ -4,44 +4,12 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/single_layer/convolution_backprop_data.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -typedef std::tuple< - InferenceEngine::SizeVector, // Kernel size - InferenceEngine::SizeVector, // Strides - std::vector, // Pad begin - std::vector, // Pad end - InferenceEngine::SizeVector, // Dilation - size_t, // Num out channels - ngraph::op::PadType // Padding type -> convBackpropDataSpecificParams; -typedef std::tuple< - convBackpropDataSpecificParams, - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - InferenceEngine::SizeVector, // Input shapes - LayerTestsUtils::TargetDevice // Device name -> convBackpropDataLayerTestParamsSet; namespace LayerTestsDefinitions { +TEST_P(ConvolutionBackpropDataLayerTest, CompareWithRefs) { + Run(); +} -class ConvolutionBackpropDataLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; - -} // namespace LayerTestsDefinitions +} diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/ctc_greedy_decoder.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/ctc_greedy_decoder.hpp index d564f553cc5..b24f62be408 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/ctc_greedy_decoder.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/ctc_greedy_decoder.hpp @@ -4,53 +4,12 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include - - -#include "ie_core.hpp" -#include "ie_precision.hpp" -#include "details/ie_exception.hpp" - -#include "ngraph/opsets/opset1.hpp" - -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "common_test_utils/common_utils.hpp" - -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "ngraph_functions/builders.hpp" - +#include "shared_test_classes/single_layer/ctc_greedy_decoder.hpp" namespace LayerTestsDefinitions { -typedef std::tuple< - InferenceEngine::Precision, - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - InferenceEngine::SizeVector, - bool, - std::string> ctcGreedyDecoderParams; -class CTCGreedyDecoderLayerTest - : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo& obj); - -protected: - InferenceEngine::SizeVector inputShapes; - InferenceEngine::SizeVector sequenceLengths; - bool mergeRepeated; - - void SetUp() override; +TEST_P(CTCGreedyDecoderLayerTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/ctc_loss.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/ctc_loss.hpp index 6b16c9517cc..be7276ceace 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/ctc_loss.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/ctc_loss.hpp @@ -4,40 +4,12 @@ #pragma once -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" - - -typedef std::tuple< - std::vector, // Logits shapes - std::vector, // logits lenght - std::vector>, // labels - std::vector, // labels length - int, // blank index - bool, // preprocessCollapseRepeated - bool, // ctcMergeRepeated - bool // Unique -> CTCLossParamsSubset; - -typedef std::tuple< - CTCLossParamsSubset, - InferenceEngine::Precision, // Float point precision - InferenceEngine::Precision, // Integer precision - LayerTestsUtils::TargetDevice // Device name -> CTCLossParams; +#include "shared_test_classes/single_layer/ctc_loss.hpp" namespace LayerTestsDefinitions { -class CTCLossLayerTest : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; -}; +TEST_P(CTCLossLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/cum_sum.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/cum_sum.hpp index 2f170cab9d4..8be3dfee954 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/cum_sum.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/cum_sum.hpp @@ -4,28 +4,12 @@ #pragma once -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/cum_sum.hpp" namespace LayerTestsDefinitions { -typedef std::tuple< - InferenceEngine::SizeVector, // Input shapes - InferenceEngine::Precision, // Input precision - int64_t, // Axis - bool, // Exclusive - bool, // Reverse - std::string> cumSumParams; // Device name - -class CumSumLayerTest : public testing::WithParamInterface, virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; +TEST_P(CumSumLayerTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/depth_to_space.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/depth_to_space.hpp index adfbb305afc..3f63b3d06cf 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/depth_to_space.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/depth_to_space.hpp @@ -4,29 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/depth_to_space.hpp" namespace LayerTestsDefinitions { -using depthToSpaceParamsTuple = typename std::tuple< - std::vector, // Input shape - InferenceEngine::Precision, // Input precision - ngraph::opset3::DepthToSpace::DepthToSpaceMode, // Mode - std::size_t, // Block size - std::string>; // Device name> - -class DepthToSpaceLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; +TEST_P(DepthToSpaceLayerTest, CompareWithRefs) { + Run(); }; -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/detection_output.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/detection_output.hpp index cddc56c45ee..1348434c802 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/detection_output.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/detection_output.hpp @@ -4,68 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "ngraph/op/detection_output.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/detection_output.hpp" namespace LayerTestsDefinitions { -enum { - idxLocation, - idxConfidence, - idxPriors, - idxArmConfidence, - idxArmLocation, - numInputs -}; - -using DetectionOutputAttributes = std::tuple< - int, // numClasses - int, // backgroundLabelId - int, // topK - std::vector, // keepTopK - std::string, // codeType - float, // nmsThreshold - float, // confidenceThreshold - bool, // clip_afterNms - bool, // clip_beforeNms - bool // decreaseLabelId ->; - -using ParamsWhichSizeDepends = std::tuple< - bool, // varianceEncodedInTarget - bool, // shareLocation - bool, // normalized - size_t, // inputHeight - size_t, // inputWidth - InferenceEngine::SizeVector, // "Location" input - InferenceEngine::SizeVector, // "Confidence" input - InferenceEngine::SizeVector, // "Priors" input - InferenceEngine::SizeVector, // "ArmConfidence" input - InferenceEngine::SizeVector // "ArmLocation" input ->; - -using DetectionOutputParams = std::tuple< - DetectionOutputAttributes, - ParamsWhichSizeDepends, - size_t, // Number of batch - float, // objectnessScore - std::string // Device name ->; - -class DetectionOutputLayerTest : public testing::WithParamInterface, virtual public LayerTestsUtils::LayerTestsCommon { - public: - static std::string getTestCaseName(testing::TestParamInfo obj); - ngraph::op::DetectionOutputAttrs attrs; - std::vector inShapes; - void Infer() override; - void Compare(const std::vector &expected, const InferenceEngine::Blob::Ptr &actual) override; - protected: - void SetUp() override; +TEST_P(DetectionOutputLayerTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/eltwise.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/eltwise.hpp index 83823bd33d1..fb4e3bf3a64 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/eltwise.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/eltwise.hpp @@ -2,41 +2,12 @@ // // SPDX-License-Identifier: Apache-2.0 // -// NOTE: WILL BE REWORKED (31905) +#pragma once -#include - -#include -#include - -#include "common_test_utils/common_utils.hpp" -#include "common_test_utils/test_common.hpp" -#include "common_test_utils/test_constants.hpp" -#include "common_test_utils/common_layers_params.hpp" -#include "ie_core.hpp" +#include namespace LayerTestsDefinitions { - -typedef std::tuple< - std::vector>, // input shapes - ngraph::helpers::EltwiseTypes, // eltwise op type - ngraph::helpers::InputLayerType, // secondary input type - CommonTestUtils::OpType, // op type - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - std::string, // Device name - std::map // Additional network configuration -> EltwiseTestParams; - -class EltwiseLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -protected: - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; - void SetUp() override; - -public: - static std::string getTestCaseName(testing::TestParamInfo obj); -}; +TEST_P(EltwiseLayerTest, EltwiseTests) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/embedding_bag_offsets_sum.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/embedding_bag_offsets_sum.hpp index dae948b951f..275ca8aa7fe 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/embedding_bag_offsets_sum.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/embedding_bag_offsets_sum.hpp @@ -4,36 +4,12 @@ #pragma once -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" - -typedef std::tuple< - std::vector, // emb_table_shape - std::vector, // indices - std::vector, // offsets - size_t, // default_index - bool, // with_weights - bool // with_def_index - > embeddingBagOffsetsSumParams; - -typedef std::tuple< - embeddingBagOffsetsSumParams, - InferenceEngine::Precision, // embedding table - InferenceEngine::Precision, // indices - LayerTestsUtils::TargetDevice> embeddingBagOffsetsSumLayerTestParamsSet; +#include "shared_test_classes/single_layer/embedding_bag_offsets_sum.hpp" namespace LayerTestsDefinitions { -class EmbeddingBagOffsetsSumLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; +TEST_P(EmbeddingBagOffsetsSumLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/embedding_bag_packed_sum.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/embedding_bag_packed_sum.hpp index e1ab3cc4203..3971bcecf3a 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/embedding_bag_packed_sum.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/embedding_bag_packed_sum.hpp @@ -4,33 +4,11 @@ #pragma once -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" - -typedef std::tuple< - std::vector, // emb_table_shape - std::vector>, // indices - bool // with_weights - > embeddingBagPackedSumParams; - -typedef std::tuple< - embeddingBagPackedSumParams, - InferenceEngine::Precision, // embedding table - InferenceEngine::Precision, // indices - LayerTestsUtils::TargetDevice> embeddingBagPackedSumLayerTestParamsSet; +#include "shared_test_classes/single_layer/embedding_bag_packed_sum.hpp" namespace LayerTestsDefinitions { -class EmbeddingBagPackedSumLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; - +TEST_P(EmbeddingBagPackedSumLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/embedding_segments_sum.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/embedding_segments_sum.hpp index c848f7f1392..d78df051142 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/embedding_segments_sum.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/embedding_segments_sum.hpp @@ -4,37 +4,12 @@ #pragma once -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" - -typedef std::tuple< - std::vector, // emb_table_shape - std::vector, // indices - std::vector, // segment_ids - size_t, // num_segments - size_t, // default_index - bool, // with_weights - bool // with_def_index - > embeddingSegmentsSumParams; - -typedef std::tuple< - embeddingSegmentsSumParams, - InferenceEngine::Precision, // embedding table - InferenceEngine::Precision, // indices - LayerTestsUtils::TargetDevice> embeddingSegmentsSumLayerTestParamsSet; +#include "shared_test_classes/single_layer/embedding_segments_sum.hpp" namespace LayerTestsDefinitions { -class EmbeddingSegmentsSumLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; +TEST_P(EmbeddingSegmentsSumLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/extract_image_patches.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/extract_image_patches.hpp index b910997e7d8..077ea6fcc55 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/extract_image_patches.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/extract_image_patches.hpp @@ -4,34 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/extract_image_patches.hpp" namespace LayerTestsDefinitions { -using extractImagePatchesTuple = typename std::tuple< - std::vector, // input shape - std::vector, // kernel size - std::vector, // strides - std::vector, // rates - ngraph::op::PadType, // pad type - InferenceEngine::Precision, // Network precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - LayerTestsUtils::TargetDevice>; // Device name - -class ExtractImagePatchesTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; +TEST_P(ExtractImagePatchesTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/fake_quantize.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/fake_quantize.hpp index 18412b31fa2..a4fa5e7666b 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/fake_quantize.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/fake_quantize.hpp @@ -4,50 +4,25 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/single_layer/fake_quantize.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -typedef std::tuple< - size_t, // levels - std::vector, // const inputs shape - std::vector, // fake quantize inputLow, inputHigh, outputLow, outputHigh or empty for random - std::vector // input generator data: low, high, resolution -> fqSpecificParams; -typedef std::tuple< - fqSpecificParams, - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - InferenceEngine::SizeVector, // Input shapes - LayerTestsUtils::TargetDevice, // Device name - - std::pair> // Additional backend configuration and alis name to it -> fqLayerTestParamsSet; namespace LayerTestsDefinitions { +TEST_P(FakeQuantizeLayerTest, CompareWithRefs) { + Run(); + SKIP_IF_CURRENT_TEST_IS_DISABLED(); -class FakeQuantizeLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; -protected: - void SetUp() override; - void UpdateSeed(); + if (BASE_SEED != USE_CLOCK_TIME && + BASE_SEED != USE_INCREMENTAL_SEED) { + return; + } - protected: - float inputDataMin = 0.0; - float inputDataMax = 10.0; - float inputDataResolution = 1.0; - int32_t seed = 1; -}; + size_t nIterations = 1; + for (; nIterations != 0; nIterations--) { + UpdateSeed(); + Infer(); + Validate(); + } +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather.hpp index c4be4ca64c5..91d47c046ea 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather.hpp @@ -4,41 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/gather.hpp" namespace LayerTestsDefinitions { -typedef std::tuple< - std::vector, // Indices - std::vector, // Indices shape - int, // Gather axis - std::vector, // Input shapes - InferenceEngine::Precision, // Network precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - std::string // Device name -> gatherParamsTuple; - -class GatherLayerTestBase : virtual public LayerTestsUtils::LayerTestsCommon { -protected: - void SetUp(const gatherParamsTuple& params); -}; - -class GatherLayerTest : public testing::WithParamInterface, public GatherLayerTestBase { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; +TEST_P(GatherLayerTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather_nd.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather_nd.hpp index 81113616378..f366a7f82f9 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather_nd.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather_nd.hpp @@ -4,37 +4,12 @@ #pragma once -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" - -using Config = std::map; - -typedef std::tuple< - std::vector, // Data shapes - std::vector, // Indices shape - int // batch dims -> GatherNDParamsSubset; - -typedef std::tuple< - GatherNDParamsSubset, - InferenceEngine::Precision, // Data precision - InferenceEngine::Precision, // Indices precision - LayerTestsUtils::TargetDevice, // Device name - Config // Plugin config -> GatherNDParams; +#include "shared_test_classes/single_layer/gather_nd.hpp" namespace LayerTestsDefinitions { -class GatherNDLayerTest : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; -}; +TEST_P(GatherNDLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather_tree.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather_tree.hpp index 56ce9d7de32..d153f6ed9d1 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather_tree.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather_tree.hpp @@ -4,35 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/gather_tree.hpp" namespace LayerTestsDefinitions { -using GatherTreeParamsTuple = typename std::tuple< - std::vector, // Input tensors shape - ngraph::helpers::InputLayerType, // Secondary input type - InferenceEngine::Precision, // Network precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - std::string>; // Device name - -class GatherTreeLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; - -protected: - void SetUp() override; +TEST_P(GatherTreeLayerTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/grn.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/grn.hpp index 41e4d484f6d..8ef6aef818c 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/grn.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/grn.hpp @@ -4,52 +4,10 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include - - -#include "ie_core.hpp" -#include "ie_precision.hpp" -#include "details/ie_exception.hpp" - -#include "ngraph/opsets/opset1.hpp" - -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "common_test_utils/common_utils.hpp" - -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "ngraph_functions/builders.hpp" - +#include "shared_test_classes/single_layer/grn.hpp" namespace LayerTestsDefinitions { -typedef std::tuple< - InferenceEngine::Precision, - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - InferenceEngine::SizeVector, - float, - std::string> grnParams; - -class GrnLayerTest - : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon{ -public: - static std::string getTestCaseName(const testing::TestParamInfo& obj); - -protected: - InferenceEngine::SizeVector inputShapes; - float bias; - - void SetUp() override; +TEST_P(GrnLayerTest, CompareWithRefs) { + Run(); }; - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/group_convolution.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/group_convolution.hpp index d853838ef59..57d3c06790e 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/group_convolution.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/group_convolution.hpp @@ -4,43 +4,10 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -typedef std::tuple< - InferenceEngine::SizeVector, - InferenceEngine::SizeVector, - std::vector, - std::vector, - InferenceEngine::SizeVector, - size_t, - size_t, - ngraph::op::PadType> groupConvSpecificParams; -typedef std::tuple< - groupConvSpecificParams, - InferenceEngine::Precision, - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - InferenceEngine::SizeVector, - LayerTestsUtils::TargetDevice> groupConvLayerTestParamsSet; +#include "shared_test_classes/single_layer/group_convolution.hpp" namespace LayerTestsDefinitions { - -class GroupConvolutionLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; - +TEST_P(GroupConvolutionLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/group_convolution_backprop_data.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/group_convolution_backprop_data.hpp index 9d06059ce72..aa2277ee26b 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/group_convolution_backprop_data.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/group_convolution_backprop_data.hpp @@ -4,43 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -typedef std::tuple< - InferenceEngine::SizeVector, - InferenceEngine::SizeVector, - std::vector, - std::vector, - InferenceEngine::SizeVector, - size_t, - size_t, - ngraph::op::PadType> groupConvBackpropDataSpecificParams; -typedef std::tuple< - groupConvBackpropDataSpecificParams, - InferenceEngine::Precision, - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - InferenceEngine::SizeVector, - LayerTestsUtils::TargetDevice> groupConvBackpropDataLayerTestParamsSet; +#include "shared_test_classes/single_layer/group_convolution_backprop_data.hpp" namespace LayerTestsDefinitions { -class GroupConvBackpropDataLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; +TEST_P(GroupConvBackpropDataLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gru_cell.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gru_cell.hpp index af8587a30b3..ba4fd51f77f 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gru_cell.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gru_cell.hpp @@ -4,35 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/gru_cell.hpp" namespace LayerTestsDefinitions { -using GRUCellParams = typename std::tuple< - bool, // using decompose to sub-ops transformation - size_t, // batch - size_t, // hidden size - size_t, // input size - std::vector, // activations - float, // clip - bool, // linear_before_reset - InferenceEngine::Precision, // Network precision - std::string>; // Device name - -class GRUCellTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; +TEST_P(GRUCellTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gru_sequence.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gru_sequence.hpp index 9953b88ef22..4ecb0014a1b 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gru_sequence.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gru_sequence.hpp @@ -4,43 +4,12 @@ #pragma once -#include -#include -#include -#include -#include -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/gru_sequence.hpp" namespace LayerTestsDefinitions { -using GRUSequenceParams = typename std::tuple< - ngraph::helpers::SequenceTestsMode, // pure Sequence or TensorIterator - size_t, // seq_lengths - size_t, // batch - size_t, // hidden size - // todo: fix. input size hardcoded to 10 due to limitation (10 args) of gtests Combine() func. - //size_t, // input size - std::vector, // activations - float, // clip - bool, // linear_before_reset - ngraph::op::RecurrentSequenceDirection, // direction - InferenceEngine::Precision, // Network precision - std::string>; // Device name - -class GRUSequenceTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; - void Infer() override; - -private: - ngraph::helpers::SequenceTestsMode m_mode; - int64_t m_max_seq_len = 0; +TEST_P(GRUSequenceTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/interpolate.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/interpolate.hpp index b5484c58ea1..28a079aebe6 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/interpolate.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/interpolate.hpp @@ -4,50 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" - -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/interpolate.hpp" namespace LayerTestsDefinitions { -typedef std::tuple< - ngraph::op::v4::Interpolate::InterpolateMode, // InterpolateMode - ngraph::op::v4::Interpolate::ShapeCalcMode, // ShapeCalculationMode - ngraph::op::v4::Interpolate::CoordinateTransformMode, // CoordinateTransformMode - ngraph::op::v4::Interpolate::NearestMode, // NearestMode - bool, // AntiAlias - std::vector, // PadBegin - std::vector, // PadEnd - double, // Cube coef - std::vector, // Axes - std::vector // Scales -> InterpolateSpecificParams; - -typedef std::tuple< - InterpolateSpecificParams, - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - InferenceEngine::SizeVector, // Input shapes - InferenceEngine::SizeVector, // Target shapes - LayerTestsUtils::TargetDevice // Device name -> InterpolateLayerTestParams; - -class InterpolateLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; +TEST_P(InterpolateLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/log_softmax.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/log_softmax.hpp index 0c2231d098e..5c5459f9a0a 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/log_softmax.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/log_softmax.hpp @@ -5,37 +5,12 @@ #pragma once -#include -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/log_softmax.hpp" namespace LayerTestsDefinitions { -using logSoftmaxLayerTestParams = std::tuple< - InferenceEngine::Precision, // netPrecision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - InferenceEngine::SizeVector, // inputShape - int64_t, // axis - std::string, // targetDevice - std::map // config ->; - -class LogSoftmaxLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; +TEST_P(LogSoftmaxLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/logical.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/logical.hpp index a2807b4244c..e4b70e5d1b1 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/logical.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/logical.hpp @@ -2,50 +2,12 @@ // // SPDX-License-Identifier: Apache-2.0 -#include +#pragma once -#include -#include - -#include "common_test_utils/common_utils.hpp" -#include "common_test_utils/test_common.hpp" -#include "common_test_utils/test_constants.hpp" -#include "ie_core.hpp" +#include namespace LayerTestsDefinitions { -namespace LogicalParams { -using InputShapesTuple = std::pair, std::vector>; -} // LogicalParams - -typedef std::tuple< - LogicalParams::InputShapesTuple, // Input shapes tuple - ngraph::helpers::LogicalTypes, // Logical op type - ngraph::helpers::InputLayerType, // Second input type - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - std::string, // Device name - std::map // Additional network configuration -> LogicalTestParams; - -class LogicalLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -protected: - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; - void SetupParams(); - void SetUp() override; - -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - static std::vector combineShapes(const std::map, std::vector>>& inputShapes); - -protected: - LogicalParams::InputShapesTuple inputShapes; - ngraph::helpers::LogicalTypes logicalOpType; - ngraph::helpers::InputLayerType secondInputType; - InferenceEngine::Precision netPrecision; - std::map additional_config; -}; +TEST_P(LogicalLayerTest, LogicalTests) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/loop.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/loop.hpp index abf7d2486aa..d6514d66de7 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/loop.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/loop.hpp @@ -4,145 +4,226 @@ #pragma once -#include -#include -#include -#include -#include -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/loop.hpp" namespace LayerTestsDefinitions { -enum LOOP_IN_TYPE { - INVARIANT, - MERGED -}; - -using LoopParams = typename std::tuple< - bool, // ExecuteFirstIteration - bool, // BodyCondition is a constant? - bool, // BodyCondition value, if it is a Const - int64_t, // TripCount, -1 means infinity - std::vector, LOOP_IN_TYPE>>, // inputs - InferenceEngine::Precision, // Network precision - std::string>; // Device name - -class LoopTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; -}; -using StaticShapeLoopParams = typename std::tuple< - bool, - std::tuple< - bool, - int64_t, - int64_t, - int64_t - >, - int64_t, - InferenceEngine::SizeVector, - InferenceEngine::Precision, - std::string - >; +TEST_P(LoopTest, CompareWithRefs) { + Run(); +} -/** - * Test case with static SHAPE version of loop operation. - * Total iteration count is dynamic. - */ -class StaticShapeLoopTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; - std::vector> PredefinedRefs(); +TEST_P(StaticShapeLoopTest, CompareWithRefs) { + Run(); +} -private: - bool static_iter_num; // trip count provided by constant node - bool static_continue_cond; // initial_cond provided by constant node - int64_t max_iter_num; // -1 means infinity loop (expected dynamic exit condition in body) - int64_t dynamic_exit; // -1 means always true - int64_t axis; // -1 means no auto concatenation - int64_t start_value; - InferenceEngine::SizeVector data_shape; - InferenceEngine::Precision data_prc; +TEST_P(StaticShapeLoopTest, CompareWithPredefinedRefs) { + SKIP_IF_CURRENT_TEST_IS_DISABLED() + LoadNetwork(); + Infer(); + auto expectedOutputs = PredefinedRefs(); // use predefined refs instead of CalculateRefs function + const auto& actualOutputs = GetOutputs(); - int64_t actual_n_iter(); - -protected: - void SetUp() override; -}; - - -class TrivialLoopTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -protected: - using RefBlobGenerator = std::function; - std::map inputGens, outputGens; - - void CreateSlicedLoop(size_t batch_size, size_t num_iteration, InferenceEngine::Precision iePrc, - InferenceEngine::SizeVector& ieShape); - void CreateSlicedLoopDynCondition(size_t batch_size, size_t num_iteration, InferenceEngine::Precision iePrc, - InferenceEngine::SizeVector& ieShape, size_t trip_count); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override { - auto found = inputGens.find(info.name()); - if (found != inputGens.end()) { - return found->second(info.getTensorDesc()); - } - - found = inputGens.find(""); - if (found != inputGens.end()) { - return found->second(info.getTensorDesc()); - } - - return LayerTestsCommon::GenerateInput(info); + if (expectedOutputs.empty()) { + return; } - std::vector> CalculateRefs() override { - if (outputGens.empty()) - return LayerTestsCommon::CalculateRefs(); + IE_ASSERT(actualOutputs.size() == expectedOutputs.size()) + << "nGraph interpreter has " << expectedOutputs.size() << " outputs, while IE " << actualOutputs.size(); - const auto results = function->get_results(); - const auto outs_info = cnnNetwork.getOutputsInfo(); - const auto num_out_blob = results.size(); + Compare(expectedOutputs, actualOutputs); +} - std::vector> res_collection(num_out_blob); +TEST_P(TrivialLoopTest, PassThroughBody) { + SKIP_IF_CURRENT_TEST_IS_DISABLED() + InferenceEngine::Precision iePrc; + InferenceEngine::SizeVector ieShape; + std::tie(iePrc, ieShape, targetDevice) = GetParam(); - for (int i = 0; i < num_out_blob; i++) { - // TODO: name of original NG result doesn't match with outs after conversion. - // Expected : auto name = results[i]->get_friendly_name(); - auto name = results[i]->get_input_node_ptr(0)->get_friendly_name(); - auto data = outs_info.at(name); - IE_ASSERT(data != nullptr); + const auto prc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(iePrc); + const auto shape = ngraph::Shape{ieShape}; + const auto scalarShape = ngraph::Shape{}; - RefBlobGenerator generator; - auto found = outputGens.find(name); - if (found != outputGens.end()) { - generator = found->second; - } else { - found = outputGens.find(""); - if (found != outputGens.end()) { - generator = found->second; - } - } + auto start = std::make_shared(prc, shape); + auto count = std::make_shared(ngraph::element::i64, scalarShape, 5); + auto icond = std::make_shared(ngraph::element::boolean, scalarShape, true); - IE_ASSERT(generator != nullptr) << "Test output generator is not specified"; - auto blob = generator(data->getTensorDesc()); - auto blob_size = blob->byteSize(); - auto blob_ptr = blob->buffer().as(); + // Loop body + auto b_data = std::make_shared(prc, shape); + auto b_cond = std::make_shared(ngraph::element::boolean, scalarShape); - auto &res = res_collection[i]; - res.resize(blob_size); - std::copy(blob_ptr, blob_ptr + blob_size, res.begin()); - } - return res_collection; - } -}; + auto body = std::make_shared( + ngraph::OutputVector {b_cond, b_data}, // | passthrough body, no data changes + ngraph::ParameterVector {b_cond, b_data}); // | input -> output + + auto loop = std::make_shared(count, icond); + loop->set_function(body); + loop->set_special_body_ports({-1, 0}); + loop->set_invariant_input(b_cond, icond); + loop->set_invariant_input(b_data, start); + loop->get_iter_value(b_data, -1); + + function = std::make_shared( + ngraph::OutputVector {loop}, + ngraph::ParameterVector {start}); + + // Precalculated ref blobs + auto blob = make_blob_with_precision({iePrc, ieShape, InferenceEngine::TensorDesc::getLayoutByDims(ieShape)}); + blob->allocate(); + CommonTestUtils::fill_data_with_broadcast(blob, 0, {10}); + + inputGens[""] = [&] (InferenceEngine::TensorDesc tdesc) { return blob; }; + outputGens[""] = [&] (InferenceEngine::TensorDesc tdesc) { return blob; }; + + Run(); +} + +TEST_P(TrivialLoopTest, UnusedInputBody) { + SKIP_IF_CURRENT_TEST_IS_DISABLED() + InferenceEngine::Precision iePrc; + InferenceEngine::SizeVector ieShape; + std::tie(iePrc, ieShape, targetDevice) = GetParam(); + + const auto prc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(iePrc); + const auto shape = ngraph::Shape{ieShape}; + const auto scalarShape = ngraph::Shape{}; + + auto start = std::make_shared(prc, shape); + auto count = std::make_shared(ngraph::element::i64, scalarShape, 5); + auto icond = std::make_shared(ngraph::element::boolean, scalarShape, true); + + // Loop body + auto b_data = std::make_shared(prc, shape); + auto b_cond = std::make_shared(ngraph::element::boolean, scalarShape, true); + auto b_iter = std::make_shared(ngraph::element::i64, scalarShape); + + auto body = std::make_shared( + ngraph::OutputVector {b_cond, b_data}, + ngraph::ParameterVector {b_data, b_iter}); + + auto loop = std::make_shared(count, icond); + loop->set_function(body); + loop->set_special_body_ports({1, 0}); + loop->set_invariant_input(b_data, start); + loop->get_iter_value(b_data, -1); + + function = std::make_shared( + ngraph::OutputVector {loop}, + ngraph::ParameterVector {start}); + + // Precalculated ref blobs + auto blob = make_blob_with_precision({iePrc, ieShape, InferenceEngine::TensorDesc::getLayoutByDims(ieShape)}); + blob->allocate(); + CommonTestUtils::fill_data_with_broadcast(blob, 0, {10}); + + inputGens[""] = [&] (InferenceEngine::TensorDesc tdesc) { return blob; }; + outputGens[""] = [&] (InferenceEngine::TensorDesc tdesc) { return blob; }; + + Run(); +} + + + +TEST_P(TrivialLoopTest, AutoSlicingInput_CheckPredefinedValues) { + SKIP_IF_CURRENT_TEST_IS_DISABLED() + InferenceEngine::Precision iePrc; + InferenceEngine::SizeVector ieShape; + std::tie(iePrc, ieShape, targetDevice) = GetParam(); + const size_t batch_size = 5; + const size_t num_iteration = 3; + ieShape[0] = 1; + auto ieShape_to_slice = ieShape; + ieShape_to_slice[0] = batch_size; + CreateSlicedLoop(batch_size, num_iteration, iePrc, ieShape); + Run(); + // Precalculated ref blobs + auto blob = make_blob_with_precision({iePrc, ieShape_to_slice, InferenceEngine::TensorDesc::getLayoutByDims(ieShape_to_slice)}); + blob->allocate(); + std::vector seq_raw_data(batch_size); + std::iota(seq_raw_data.begin(), seq_raw_data.end(), 1); + CommonTestUtils::fill_data_with_broadcast(blob, 0, seq_raw_data); + + auto blob_ref = make_blob_with_precision({iePrc, ieShape, InferenceEngine::TensorDesc::getLayoutByDims(ieShape)}); + blob_ref->allocate(); + CommonTestUtils::fill_data_with_broadcast(blob_ref, 0, { num_iteration * (num_iteration + 1) / 2}); + + inputGens[""] = [&] (InferenceEngine::TensorDesc tdesc) { return blob; }; + outputGens[""] = [&] (InferenceEngine::TensorDesc tdesc) { return blob_ref; }; +} + +TEST_P(TrivialLoopTest, AutoSlicingInputWithDynCondition_CheckPredefinedValues) { + SKIP_IF_CURRENT_TEST_IS_DISABLED() + InferenceEngine::Precision iePrc; + InferenceEngine::SizeVector ieShape; + std::tie(iePrc, ieShape, targetDevice) = GetParam(); + + // auto slicing size : 5 + // trip count limit : 4 + // dyn exit after iter : 3 + // --------------------- + // should exit after 4 iterations + const size_t batch_size = 5; + const size_t trip_count = 5; + const size_t num_iteration = 3; + + ieShape[0] = 1; + auto ieShape_to_slice = ieShape; + ieShape_to_slice[0] = batch_size; + + CreateSlicedLoopDynCondition(batch_size, num_iteration, iePrc, ieShape, trip_count); + // Precalculated ref blobs + auto blob = make_blob_with_precision({iePrc, ieShape_to_slice, InferenceEngine::TensorDesc::getLayoutByDims(ieShape_to_slice)}); + blob->allocate(); + std::vector seq_raw_data(batch_size); + std::iota(seq_raw_data.begin(), seq_raw_data.end(), 1); + CommonTestUtils::fill_data_with_broadcast(blob, 0, seq_raw_data); + + auto blob_ref = make_blob_with_precision({iePrc, ieShape, InferenceEngine::TensorDesc::getLayoutByDims(ieShape)}); + blob_ref->allocate(); + const size_t real_iter = num_iteration + 1; + CommonTestUtils::fill_data_with_broadcast(blob_ref, 0, { real_iter * (real_iter + 1) / 2}); + + inputGens[""] = [&] (InferenceEngine::TensorDesc tdesc) { return blob; }; + outputGens[""] = [&] (InferenceEngine::TensorDesc tdesc) { return blob_ref; }; + + Run(); +} + +TEST_P(TrivialLoopTest, AutoSlicingInput_CheckReference) { + SKIP_IF_CURRENT_TEST_IS_DISABLED() + InferenceEngine::Precision iePrc; + InferenceEngine::SizeVector ieShape; + std::tie(iePrc, ieShape, targetDevice) = GetParam(); + const size_t batch_size = 5; + const size_t num_iteration = 3; + ieShape[0] = 1; + auto ieShape_to_slice = ieShape; + ieShape_to_slice[0] = batch_size; + CreateSlicedLoop(batch_size, num_iteration, iePrc, ieShape); + Run(); +} + +TEST_P(TrivialLoopTest, AutoSlicingInputWithDynCondition_CheckReference) { + SKIP_IF_CURRENT_TEST_IS_DISABLED() + InferenceEngine::Precision iePrc; + InferenceEngine::SizeVector ieShape; + std::tie(iePrc, ieShape, targetDevice) = GetParam(); + + // auto slicing size : 5 + // trip count limit : 4 + // dyn exit after iter : 3 + // --------------------- + // should exit after 4 iterations + const size_t batch_size = 5; + const size_t trip_count = 5; + const size_t num_iteration = 3; + + ieShape[0] = 1; + auto ieShape_to_slice = ieShape; + ieShape_to_slice[0] = batch_size; + + CreateSlicedLoopDynCondition(batch_size, num_iteration, iePrc, ieShape, trip_count); + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/lrn.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/lrn.hpp index 002cd4ea4b9..cacb3fbd4e7 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/lrn.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/lrn.hpp @@ -5,39 +5,12 @@ #pragma once -#include -#include -#include -#include - -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/lrn.hpp" namespace LayerTestsDefinitions { -typedef std::tuple< - double, // Alpha - double, // Beta - double, // Bias - size_t, // Size - std::vector, // Reduction axes - InferenceEngine::Precision, // Network precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::SizeVector, // Input shapes - std::string // Device name -> lrnLayerTestParamsSet; - -class LrnLayerTest - : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; +TEST_P(LrnLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/lstm_cell.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/lstm_cell.hpp index a6b79172ee2..abf9631a2f9 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/lstm_cell.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/lstm_cell.hpp @@ -4,34 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/lstm_cell.hpp" namespace LayerTestsDefinitions { -using LSTMCellParams = typename std::tuple< - bool, // using decompose to sub-ops transformation - size_t, // batch - size_t, // hidden size - size_t, // input size - std::vector, // activations - float, // clip - InferenceEngine::Precision, // Network precision - std::string>; // Device name - -class LSTMCellTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; +TEST_P(LSTMCellTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/lstm_sequence.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/lstm_sequence.hpp index 6bd10677f2a..54edabb71aa 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/lstm_sequence.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/lstm_sequence.hpp @@ -4,40 +4,12 @@ #pragma once -#include -#include -#include -#include -#include -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/lstm_sequence.hpp" namespace LayerTestsDefinitions { -using LSTMSequenceParams = typename std::tuple< - ngraph::helpers::SequenceTestsMode, // pure Sequence or TensorIterator - size_t, // seq_lengths - size_t, // batch - size_t, // hidden size - size_t, // input size - std::vector, // activations - float, // clip - ngraph::op::RecurrentSequenceDirection, // direction - InferenceEngine::Precision, // Network precision - std::string>; // Device name - -class LSTMSequenceTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); -protected: - void Infer() override; - void SetUp() override; - -private: - ngraph::helpers::SequenceTestsMode m_mode; - int64_t m_max_seq_len = 0; +TEST_P(LSTMSequenceTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/mat_mul.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/mat_mul.hpp index 16ffc26dafa..224738ee672 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/mat_mul.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/mat_mul.hpp @@ -4,40 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" - -struct ShapeRelatedParams { - std::pair input1, input2; -}; - -typedef std::tuple< - ShapeRelatedParams, - InferenceEngine::Precision, // Network precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - ngraph::helpers::InputLayerType, // Secondary input type - LayerTestsUtils::TargetDevice, // Device name - std::map // Additional network configuration -> MatMulLayerTestParamsSet; +#include "shared_test_classes/single_layer/mat_mul.hpp" namespace LayerTestsDefinitions { -class MatMulTest : public testing::WithParamInterface, virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - static std::vector combineShapes(const std::vector>& firstInputShapes, - const std::vector>& secondInputShapes, - bool transposeA, - bool transposeB); - -protected: - void SetUp() override; +TEST_P(MatMulTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/minimum_maximum.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/minimum_maximum.hpp index bcf6333a7ef..1b4e0284cfd 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/minimum_maximum.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/minimum_maximum.hpp @@ -3,34 +3,12 @@ // #pragma once -#include -#include -#include -#include -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "common_test_utils/test_constants.hpp" +#include "shared_test_classes/single_layer/minimum_maximum.hpp" namespace LayerTestsDefinitions { -using MaxMinParamsTuple = typename std::tuple< - std::vector>, // Input shapes - ngraph::helpers::MinMaxOpType, // OperationType - InferenceEngine::Precision, // Network precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - ngraph::helpers::InputLayerType, // Secondary input type - std::string>; // Device name - -class MaxMinLayerTest: - public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon{ -public: - static std::string getTestCaseName(const testing::TestParamInfo& obj); -protected: - void SetUp() override; +TEST_P(MaxMinLayerTest, CompareWithRefs){ + Run(); }; + } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/mvn.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/mvn.hpp index 39870828a24..24cbc616918 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/mvn.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/mvn.hpp @@ -4,28 +4,12 @@ #pragma once -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/mvn.hpp" namespace LayerTestsDefinitions { -typedef std::tuple< - InferenceEngine::SizeVector, // Input shapes - InferenceEngine::Precision, // Input precision - bool, // Across channels - bool, // Normalize variance - double, // Epsilon - std::string> mvnParams; // Device name - -class MvnLayerTest : public testing::WithParamInterface, virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; +TEST_P(MvnLayerTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/non_max_suppression.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/non_max_suppression.hpp index 80b0d0d37d3..685d47cdff1 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/non_max_suppression.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/non_max_suppression.hpp @@ -4,44 +4,12 @@ #pragma once -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/non_max_suppression.hpp" namespace LayerTestsDefinitions { -using InputShapeParams = std::tuple; // Number of classes - -using InputPrecisions = std::tuple; // iou_threshold, score_threshold, soft_nms_sigma precisions - -using NmsParams = std::tuple; // Device name - -class NmsLayerTest : public testing::WithParamInterface, virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - void Infer() override; - void Compare(const std::vector> &expectedOutputs, const std::vector &actualOutputs) override; - -protected: - void SetUp() override; - -private: - size_t numOfSelectedBoxes; +TEST_P(NmsLayerTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/nonzero.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/nonzero.hpp index 28f4b9d99d2..cbf159574d6 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/nonzero.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/nonzero.hpp @@ -5,33 +5,12 @@ #pragma once -#include "functional_test_utils/layer_test_utils.hpp" - -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -#include -#include -#include -#include +#include "shared_test_classes/single_layer/nonzero.hpp" namespace LayerTestsDefinitions { -using ConfigMap = typename std::map; - -using NonZeroLayerTestParamsSet = typename std::tuple< - InferenceEngine::SizeVector, // Input shapes - InferenceEngine::Precision, // Input precision - LayerTestsUtils::TargetDevice, // Device name - ConfigMap>; // Additional network configuration - -class NonZeroLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; +TEST_P(NonZeroLayerTest, CompareWithReference) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/normalize_l2.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/normalize_l2.hpp index 8f867765fc2..c7165fb0a8f 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/normalize_l2.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/normalize_l2.hpp @@ -4,32 +4,12 @@ #pragma once -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" - +#include "shared_test_classes/single_layer/normalize_l2.hpp" namespace LayerTestsDefinitions { -using NormalizeL2LayerTestParams = std::tuple< - std::vector, // axes - float, // eps - ngraph::op::EpsMode, // eps_mode - InferenceEngine::SizeVector, // inputShape - InferenceEngine::Precision, // netPrecision - std::string // targetDevice ->; - -class NormalizeL2LayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; +TEST_P(NormalizeL2LayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/pad.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/pad.hpp index c055254a389..c0e10a7f72e 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/pad.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/pad.hpp @@ -4,36 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" - -typedef std::tuple< - std::vector, // padsBegin - std::vector, // padsEnd - float, // argPadValue - ngraph::helpers::PadMode, // padMode - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::SizeVector, // Input shapes - LayerTestsUtils::TargetDevice // Target device name -> padLayerTestParamsSet; +#include "shared_test_classes/single_layer/pad.hpp" namespace LayerTestsDefinitions { -class PadLayerTest : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; +TEST_P(PadLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/pooling.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/pooling.hpp index 975a771dc13..5c474445c8e 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/pooling.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/pooling.hpp @@ -5,66 +5,19 @@ #pragma once -#include -#include -#include -#include - -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/pooling.hpp" namespace LayerTestsDefinitions { -typedef std::tuple< - ngraph::helpers::PoolingTypes, // Pooling type, max or avg - std::vector, // Kernel size - std::vector, // Stride - std::vector, // Pad begin - std::vector, // Pad end - ngraph::op::RoundingType, // Rounding type - ngraph::op::PadType, // Pad type - bool // Exclude pad -> poolSpecificParams; -typedef std::tuple< - poolSpecificParams, - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - std::vector, // Input shape - std::string // Device name -> poolLayerTestParamsSet; +TEST_P(PoolingLayerTest, CompareWithRefs) { + Run(); +} -typedef std::tuple< - poolSpecificParams, - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - size_t, // Channel number - std::string // Device name -> globalPoolLayerTestParamsSet; - -class PoolingLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; - -class GlobalPoolingLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; +TEST_P(GlobalPoolingLayerTest, CompareWithRefs) { + Run(); + if (targetDevice == std::string{CommonTestUtils::DEVICE_GPU}) { + PluginCache::get().reset(); + } +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/power.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/power.hpp index dfc07c4827b..8519fdb00b8 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/power.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/power.hpp @@ -3,32 +3,12 @@ // #pragma once -#include -#include -#include -#include -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "common_test_utils/test_constants.hpp" +#include "shared_test_classes/single_layer/power.hpp" namespace LayerTestsDefinitions { - using PowerParamsTuple = typename std::tuple< - std::vector>, //input shapes - InferenceEngine::Precision, //Network precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - std::string, //Device name - std::vector>; //power - -class PowerLayerTest: - public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon{ -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); -protected: - void SetUp() override; +TEST_P(PowerLayerTest, CompareWithRefs){ + Run(); }; + } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/prior_box_clustered.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/prior_box_clustered.hpp index 683711d0590..5ecf883133c 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/prior_box_clustered.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/prior_box_clustered.hpp @@ -4,70 +4,12 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include - - -#include "ie_core.hpp" -#include "ie_precision.hpp" -#include "details/ie_exception.hpp" - -#include "ngraph/opsets/opset1.hpp" - -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "common_test_utils/common_utils.hpp" - -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "ngraph_functions/builders.hpp" - -typedef std::tuple< - std::vector, // widths - std::vector, // heights - bool, // clip - float, // step_width - float, // step_height - float, // offset - std::vector> priorBoxClusteredSpecificParams; - -typedef std::tuple< - priorBoxClusteredSpecificParams, - InferenceEngine::Precision, // net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - InferenceEngine::SizeVector, // input shape - InferenceEngine::SizeVector, // image shape - std::string> priorBoxClusteredLayerParams; +#include "shared_test_classes/single_layer/prior_box_clustered.hpp" namespace LayerTestsDefinitions { -class PriorBoxClusteredLayerTest - : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo& obj); -protected: - InferenceEngine::SizeVector inputShapes; - InferenceEngine::SizeVector imageShapes; - InferenceEngine::Precision netPrecision; - std::vector widths; - std::vector heights; - std::vector variances; - float step_width; - float step_height; - float offset; - bool clip; - - std::vector> CalculateRefs() override; - void SetUp() override; +TEST_P(PriorBoxClusteredLayerTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/proposal.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/proposal.hpp index c8b00f6e69d..bcefaa9eb47 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/proposal.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/proposal.hpp @@ -4,64 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/proposal.hpp" namespace LayerTestsDefinitions { -namespace proposalTypes { - -typedef size_t base_size_type; -typedef size_t pre_nms_topn_type; -typedef size_t post_nms_topn_type; -typedef float nms_thresh_type; -typedef size_t min_size_type; -typedef std::vector ratio_type; -typedef std::vector scale_type; -typedef bool clip_before_nms_type; -typedef bool clip_after_nms_type; -typedef bool normalize_type; -typedef size_t feat_stride_type; -typedef float box_size_scale_type; -typedef float box_coordinate_scale_type; -typedef std::string framework_type; - -}; // namespace proposalTypes - -using namespace proposalTypes; - -typedef std::tuple< - base_size_type, - pre_nms_topn_type, - post_nms_topn_type, - nms_thresh_type, - min_size_type, - ratio_type, - scale_type, - clip_before_nms_type, - clip_after_nms_type, - framework_type> proposalSpecificParams; -typedef std::tuple< - proposalSpecificParams, - std::string> proposalLayerTestParamsSet; - -class ProposalLayerTest - : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - static std::string SerializeProposalSpecificParams(proposalSpecificParams& params); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; - -protected: - void SetUp() override; - void Validate() override; -}; +TEST_P(ProposalLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/psroi_pooling.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/psroi_pooling.hpp index 8234502d795..8c05afcd891 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/psroi_pooling.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/psroi_pooling.hpp @@ -5,44 +5,12 @@ #pragma once -#include -#include -#include -#include - -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/psroi_pooling.hpp" namespace LayerTestsDefinitions { -using psroiParams = std::tuple, // input shape - std::vector, // coords shape - size_t, // output_dim - size_t, // group_size - float, // Spatial scale - size_t, // spatial_bins_x - size_t, // spatial_bins_y - std::string, // mode - InferenceEngine::Precision, // Net precision - LayerTestsUtils::TargetDevice>; // Device name - -class PSROIPoolingLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { - public: - static std::string getTestCaseName(testing::TestParamInfo obj); - void Infer() override; - - protected: - void SetUp() override; - - private: - size_t groupSize_; - float spatialScale_; - size_t spatialBinsX_; - size_t spatialBinsY_; - std::string mode_; - }; +TEST_P(PSROIPoolingLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/range.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/range.hpp index 2dbd52a7a10..3daaacee96c 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/range.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/range.hpp @@ -4,47 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/range.hpp" namespace LayerTestsDefinitions { -typedef std::tuple< - float, // start - float, // stop - float, // step - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - std::string // Target device name -> RangeParams; -class RangeLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { - float start, stop, step; -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - void Infer() override; - -protected: - void SetUp() override; -}; - -class RangeNumpyLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - void Infer() override; -protected: - void SetUp() override; -private: - float start, stop, step; -}; +TEST_P(RangeNumpyLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reduce_ops.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reduce_ops.hpp index 855da9fde70..07fb2739d85 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reduce_ops.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reduce_ops.hpp @@ -4,42 +4,15 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "common_test_utils/common_layers_params.hpp" +#include "shared_test_classes/single_layer/reduce_ops.hpp" namespace LayerTestsDefinitions { -typedef std::tuple< - std::vector, // Axis to reduce order - CommonTestUtils::OpType, // Scalar or vector type axis - bool, // Keep dims - ngraph::helpers::ReductionType, // Reduce operation type - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - std::vector, // Input shapes - std::string // Target device name -> reduceMeanParams; - -class ReduceOpsLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; - -class ReduceOpsLayerWithSpecificInputTest : public ReduceOpsLayerTest { -protected: - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; -}; +TEST_P(ReduceOpsLayerTest, CompareWithRefs) { + Run(); +} +TEST_P(ReduceOpsLayerWithSpecificInputTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/region_yolo.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/region_yolo.hpp index c8d74f6003f..7301e9487b5 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/region_yolo.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/region_yolo.hpp @@ -4,35 +4,12 @@ #pragma once -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/region_yolo.hpp" namespace LayerTestsDefinitions { -using regionYoloParamsTuple = std::tuple< - ngraph::Shape, // Input Shape - size_t, // classes - size_t, // coordinates - size_t, // num regions - bool, // do softmax - std::vector, // mask - int, // start axis - int, // end axis - InferenceEngine::Precision, // Network precision - std::string>; // Device name - -class RegionYoloLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; +TEST_P(RegionYoloLayerTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reorg_yolo.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reorg_yolo.hpp index 1eab6b806b2..0d34dc50f6a 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reorg_yolo.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reorg_yolo.hpp @@ -4,29 +4,12 @@ #pragma once -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/reorg_yolo.hpp" namespace LayerTestsDefinitions { -using ReorgYoloParamsTuple = typename std::tuple< - ngraph::Shape, // Input Shape - size_t, // stride - InferenceEngine::Precision, // Network precision - std::string>; // Device name - -class ReorgYoloLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; +TEST_P(ReorgYoloLayerTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reshape.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reshape.hpp index ecf3e84eace..a9c52f761af 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reshape.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reshape.hpp @@ -4,36 +4,12 @@ #pragma once -#include -#include -#include -#include -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/reshape.hpp" namespace LayerTestsDefinitions { -typedef std::tuple< - bool, // SpecialZero - InferenceEngine::Precision, // Network precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - std::vector, // Input shapes - std::vector, // OutForm Shapes - std::string, // Device name - std::map // Config -> reshapeParams; -class ReshapeLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; +TEST_P(ReshapeLayerTest, CompareWithRefsDynamicBath) { + Run(); +} } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reverse_sequence.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reverse_sequence.hpp index e7badc3bdd2..fdebaa86746 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reverse_sequence.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reverse_sequence.hpp @@ -4,33 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/reverse_sequence.hpp" namespace LayerTestsDefinitions { -using ReverseSequenceParamsTuple = typename std::tuple< - int64_t, // Index of the batch dimension - int64_t, // Index of the sequence dimension - std::vector, // Input shapes - std::vector, // Shape of the input vector with sequence lengths to be reversed - ngraph::helpers::InputLayerType, // Secondary input type - InferenceEngine::Precision, // Network precision - std::string>; // Device name - -class ReverseSequenceLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; +TEST_P(ReverseSequenceLayerTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/rnn_cell.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/rnn_cell.hpp index 477975deafc..2eedbd7beb0 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/rnn_cell.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/rnn_cell.hpp @@ -4,34 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/rnn_cell.hpp" namespace LayerTestsDefinitions { -using RNNCellParams = typename std::tuple< - bool, // using decompose to sub-ops transformation - size_t, // batch - size_t, // hidden size - size_t, // input size - std::vector, // activations - float, // clip - InferenceEngine::Precision, // Network precision - std::string>; // Device name - -class RNNCellTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; +TEST_P(RNNCellTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/rnn_sequence.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/rnn_sequence.hpp index bcfdadedb49..8f749491967 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/rnn_sequence.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/rnn_sequence.hpp @@ -4,41 +4,12 @@ #pragma once -#include -#include -#include -#include -#include -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/rnn_sequence.hpp" namespace LayerTestsDefinitions { -using RNNSequenceParams = typename std::tuple< - ngraph::helpers::SequenceTestsMode, // pure Sequence or TensorIterator - size_t, // seq_lengths - size_t, // batch - size_t, // hidden size - size_t, // input size - std::vector, // activations - float, // clip - ngraph::op::RecurrentSequenceDirection, // direction - InferenceEngine::Precision, // Network precision - std::string>; // Device name - -class RNNSequenceTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; - void Infer() override; - -private: - ngraph::helpers::SequenceTestsMode m_mode; - int64_t m_max_seq_len = 0; +TEST_P(RNNSequenceTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/roi_pooling.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/roi_pooling.hpp index 7f863b006fb..9b8b3030a50 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/roi_pooling.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/roi_pooling.hpp @@ -5,39 +5,12 @@ #pragma once -#include -#include -#include -#include - -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/roi_pooling.hpp" namespace LayerTestsDefinitions { -using roiPoolingParamsTuple = std::tuple< - InferenceEngine::SizeVector, // Input shape - InferenceEngine::SizeVector, // Coords shape - std::vector, // Pooled shape {pooled_h, pooled_w} - float, // Spatial scale - ngraph::helpers::ROIPoolingTypes, // ROIPooling method - InferenceEngine::Precision, // Net precision - LayerTestsUtils::TargetDevice>; // Device name - -class ROIPoolingLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - void Infer() override; - -protected: - void SetUp() override; - -private: - ngraph::helpers::ROIPoolingTypes pool_method; - float spatial_scale; -}; +TEST_P(ROIPoolingLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/scatter_ND_update.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/scatter_ND_update.hpp index efc0e76fef2..e27f06e93df 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/scatter_ND_update.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/scatter_ND_update.hpp @@ -4,34 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/scatter_ND_update.hpp" namespace LayerTestsDefinitions { -using sliceSelcetInShape = std::tuple< - std::vector, // input shape - std::vector, // indices shape - std::vector, // indices value - std::vector>; // update shape -using scatterNDUpdateParamsTuple = typename std::tuple< - sliceSelcetInShape, // Input description - InferenceEngine::Precision, // Network precision - InferenceEngine::Precision, // indices precision - std::string>; // Device name - -class ScatterNDUpdateLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - static std::vector combineShapes( - const std::map, std::map, std::vector>>& inputShapes); - -protected: - void SetUp() override; +TEST_P(ScatterNDUpdateLayerTest, CompareWithRefs) { + Run(); }; + } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/scatter_elements_update.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/scatter_elements_update.hpp index 9fe6ada993e..789f62f1633 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/scatter_elements_update.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/scatter_elements_update.hpp @@ -4,34 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/scatter_elements_update.hpp" namespace LayerTestsDefinitions { -using axisShapeInShape = std::tuple< - std::vector, // input shape - std::vector, // update shape - int>; // axis -using scatterElementsUpdateParamsTuple = typename std::tuple< - axisShapeInShape, // shape description - std::vector, // indices value - InferenceEngine::Precision, // Network precision - InferenceEngine::Precision, // indices precision - std::string>; // Device name - -class ScatterElementsUpdateLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - static std::vector combineShapes( - const std::map, std::map, std::vector>>& inputShapes); - -protected: - void SetUp() override; +TEST_P(ScatterElementsUpdateLayerTest, CompareWithRefs) { + Run(); }; + } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/scatter_update.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/scatter_update.hpp index 5b3e3974a0e..7b6cbe492ca 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/scatter_update.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/scatter_update.hpp @@ -4,35 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/scatter_update.hpp" namespace LayerTestsDefinitions { -using axisUpdateShapeInShape = std::tuple< - std::vector, // input shape - std::vector, // indices shape - std::vector, // update shape - int>; // axis -using scatterUpdateParamsTuple = typename std::tuple< - axisUpdateShapeInShape, // shape description - std::vector, // indices value - InferenceEngine::Precision, // input precision - InferenceEngine::Precision, // indices precision - std::string>; // Device name - -class ScatterUpdateLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - static std::vector combineShapes( - const std::map, std::map, std::vector>>& inputShapes); - -protected: - void SetUp() override; +TEST_P(ScatterUpdateLayerTest, CompareWithRefs) { + Run(); }; + } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/select.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/select.hpp index a3b5d9d51f2..3980e08628c 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/select.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/select.hpp @@ -4,26 +4,12 @@ #pragma once -#include -#include -#include - -#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/select.hpp" namespace LayerTestsDefinitions { -typedef std::tuple< - std::vector>, // mask, then, else shapes - InferenceEngine::Precision, // then, else precision - ngraph::op::AutoBroadcastSpec, // broadcast - std::string> selectTestParams; // device name - -class SelectLayerTest : public testing::WithParamInterface, virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; -}; +TEST_P(SelectLayerTest, CompareWithRefImpl) { + Run(); +} } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/shape_of.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/shape_of.hpp index b1a54626ce9..52a0aeeb52d 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/shape_of.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/shape_of.hpp @@ -4,29 +4,12 @@ #pragma once -#include -#include -#include -#include -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/shape_of.hpp" namespace LayerTestsDefinitions { -typedef std::tuple< - InferenceEngine::Precision, // Network precision - std::vector, // Input shapes - std::string // Device name -> shapeOfParams; -class ShapeOfLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; +TEST_P(ShapeOfLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/shuffle_channels.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/shuffle_channels.hpp index a4335f0cb94..88aef0e277b 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/shuffle_channels.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/shuffle_channels.hpp @@ -4,37 +4,11 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/single_layer/shuffle_channels.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -typedef std::tuple< - int, // axis - int // group -> shuffleChannelsSpecificParams; -typedef std::tuple< - shuffleChannelsSpecificParams, - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - InferenceEngine::SizeVector, // Input shapes - LayerTestsUtils::TargetDevice // Device name -> shuffleChannelsLayerTestParamsSet; namespace LayerTestsDefinitions { - -class ShuffleChannelsLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; - +TEST_P(ShuffleChannelsLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/softmax.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/softmax.hpp index 47dbd0f6375..116da7025c4 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/softmax.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/softmax.hpp @@ -5,37 +5,12 @@ #pragma once -#include -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/softmax.hpp" namespace LayerTestsDefinitions { -using softMaxLayerTestParams = std::tuple< - InferenceEngine::Precision, // netPrecision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - InferenceEngine::SizeVector, // inputShape - size_t, // axis - std::string, // targetDevice - std::map // config ->; - -class SoftMaxLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; +TEST_P(SoftMaxLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/space_to_batch.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/space_to_batch.hpp index 3189e00fe1a..0bd6e080cb5 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/space_to_batch.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/space_to_batch.hpp @@ -4,33 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/space_to_batch.hpp" namespace LayerTestsDefinitions { -using spaceToBatchParamsTuple = typename std::tuple< - std::vector, // block_shape - std::vector, // pads_begin - std::vector, // pads_end - std::vector, // Input shapes - InferenceEngine::Precision, // Network precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - std::string>; // Device name>; +TEST_P(SpaceToBatchLayerTest, CompareWithRefs) { + Run(); +} -class SpaceToBatchLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; -}; } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/space_to_depth.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/space_to_depth.hpp index cad1bb2e77d..f1223659e61 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/space_to_depth.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/space_to_depth.hpp @@ -4,29 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/space_to_depth.hpp" namespace LayerTestsDefinitions { -using spaceToDepthParamsTuple = typename std::tuple< - std::vector, // Input shape - InferenceEngine::Precision, // Input precision - ngraph::opset3::SpaceToDepth::SpaceToDepthMode, // Mode - std::size_t, // Block size - std::string>; // Device name> - -class SpaceToDepthLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; +TEST_P(SpaceToDepthLayerTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/split.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/split.hpp index 63216325226..830d136170b 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/split.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/split.hpp @@ -4,36 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/split.hpp" namespace LayerTestsDefinitions { -typedef std::tuple< - size_t, // Num splits - int64_t, // Axis - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - std::vector, // Input shapes - std::vector, // Used outputs indices - std::string // Target device name -> splitParams; - -class SplitLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; +TEST_P(SplitLayerTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/squeeze_unsqueeze.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/squeeze_unsqueeze.hpp index cfd81d628f9..8b9cab0c9be 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/squeeze_unsqueeze.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/squeeze_unsqueeze.hpp @@ -4,34 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/squeeze_unsqueeze.hpp" namespace LayerTestsDefinitions { -using ShapeAxesTuple = std::pair, std::vector>; -typedef std::tuple< - ShapeAxesTuple, // InputShape, Squeeze indexes - ngraph::helpers::SqueezeOpType, // OpType - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - std::string // Target device name -> squeezeParams; - -class SqueezeUnsqueezeLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); -protected: - void SetUp() override; -}; +TEST_P(SqueezeUnsqueezeLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/strided_slice.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/strided_slice.hpp index cfedd17f2e3..ee3b1721dd8 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/strided_slice.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/strided_slice.hpp @@ -4,44 +4,10 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/strided_slice.hpp" namespace LayerTestsDefinitions { - -struct StridedSliceSpecificParams { - InferenceEngine::SizeVector inputShape; - std::vector begin; - std::vector end; - std::vector strides; - std::vector beginMask; - std::vector endMask; - std::vector newAxisMask; - std::vector shrinkAxisMask; - std::vector ellipsisAxisMask; -}; - -using StridedSliceParams = std::tuple< - StridedSliceSpecificParams, - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - std::string, // Device name - std::map // Additional network configuration ->; - -class StridedSliceLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; -}; +TEST_P(StridedSliceLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/tensor_iterator.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/tensor_iterator.hpp index 4184f87d5e9..d9411d4d40f 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/tensor_iterator.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/tensor_iterator.hpp @@ -4,38 +4,11 @@ #pragma once -#include -#include -#include -#include -#include -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/single_layer/tensor_iterator.hpp" namespace LayerTestsDefinitions { -using TensorIteratorParams = typename std::tuple< - bool, // using unroll tensor iterator transformation - size_t, // seq_lengths - size_t, // batch - size_t, // hidden size - // todo: fix. input size hardcoded to 10 due to limitation (10 args) of gtests Combine() func. - //size_t, // input size - size_t, // sequence axis - float, // clip - ngraph::helpers::TensorIteratorBody, // body type - ngraph::op::RecurrentSequenceDirection, // direction - InferenceEngine::Precision, // Network precision - std::string>; // Device name - -class TensorIteratorTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; +TEST_P(TensorIteratorTest, CompareWithRefs) { + Run(); }; - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/tile.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/tile.hpp index 704ae0d2faf..f208727e7fd 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/tile.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/tile.hpp @@ -1,38 +1,17 @@ + // Copyright (C) 2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 // #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/tile.hpp" namespace LayerTestsDefinitions { -typedef std::vector TileSpecificParams; -typedef std::tuple< - TileSpecificParams, - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - InferenceEngine::SizeVector, // Input shapes - LayerTestsUtils::TargetDevice // Device name -> TileLayerTestParamsSet; - -class TileLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; +TEST_P(TileLayerTest, CompareWithRefs) { + Run(); +} } // namespace LayerTestsDefinitions + diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/topk.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/topk.hpp index a20d75f9be0..99167364a2e 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/topk.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/topk.hpp @@ -4,33 +4,12 @@ #pragma once -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/topk.hpp" namespace LayerTestsDefinitions { -typedef std::tuple< - int64_t, // keepK - int64_t, // axis - ngraph::opset4::TopK::Mode, // mode - ngraph::opset4::TopK::SortType, // sort - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::SizeVector, // inputShape - std::string // Target device name -> TopKParams; -class TopKLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; +TEST_P(TopKLayerTest, CompareWithRefsDynamicBath) { + Run(); +} } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/transpose.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/transpose.hpp index f546df29dde..e63f44e43c8 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/transpose.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/transpose.hpp @@ -4,34 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/transpose.hpp" namespace LayerTestsDefinitions { -typedef std::tuple< - std::vector, // Input order - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - std::vector, // Input shapes - std::string // Target device name -> transposeParams; - -class TransposeLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; +TEST_P(TransposeLayerTest, CompareWithRefs) { + Run(); }; } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/variadic_split.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/variadic_split.hpp index bad439b7721..5743fccc834 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/variadic_split.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/variadic_split.hpp @@ -4,35 +4,12 @@ #pragma once -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/variadic_split.hpp" namespace LayerTestsDefinitions { - typedef std::tuple< - std::vector, // Num splits - size_t, // Axis - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - std::vector, // Input shapes - std::string // Target device name - > VariadicSplitParams; +TEST_P(VariadicSplitLayerTest, CompareWithRefs) { + Run(); +} -class VariadicSplitLayerTest : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; - -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/activation_concats_eltwise.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/activation_concats_eltwise.hpp index a755bba0e04..b4566d0a70d 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/activation_concats_eltwise.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/activation_concats_eltwise.hpp @@ -4,28 +4,12 @@ #pragma once -#include +#include "shared_test_classes/subgraph/activation_concats_eltwise.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +namespace SubgraphTestsDefinitions { -namespace LayerTestsDefinitions { +TEST_P(ActivationConcatsEltwise, CompareWithRefs) { + Run(); +} -using ActivationConcatsEltwiseParamsTuple = typename std::tuple< - size_t, // input size - size_t, // concat const size - InferenceEngine::Precision, // precision - std::string, // device name - std::map // configuration ->; - - -class ActivationConcatsEltwise : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; - -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/basic_lstm.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/basic_lstm.hpp index e0b69c3107b..438417645cf 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/basic_lstm.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/basic_lstm.hpp @@ -4,40 +4,61 @@ #pragma once -#include -#include -#include -#include +#include +#include "shared_test_classes/subgraph/basic_lstm.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -typedef std::tuple< - InferenceEngine::Precision, // Network Precision - std::string, // Target Device - std::map // Configuration -> basicLstmParams; - -namespace LayerTestsDefinitions { - -class Basic_LSTM_S : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - - void Run() override; - static std::shared_ptr GetNetwork(size_t thirdDimOut, - size_t hiddenSize, - const InferenceEngine::Precision& netPrecission = InferenceEngine::Precision::FP32, - std::vector* hidden_memory_init_out = nullptr, - std::vector* cell_memory_init_out = nullptr); -protected: - size_t hidden_size; - std::vector hidden_memory_init; - std::vector cell_memory_init; - void SetUp() override; - std::vector> CalculateRefs() override; +namespace SubgraphTestsDefinitions { +TEST_P(Basic_LSTM_S, CompareWithRefImpl) { + Run(); }; -} // namespace LayerTestsDefinitions +TEST_P(Basic_LSTM_S, CompareWithRefImpl_LowLatencyTransformation) { + InferenceEngine::TensorDesc state_description(InferenceEngine::Precision::FP32, + InferenceEngine::SizeVector({1, hidden_size}), + InferenceEngine::Layout::NC); + // Reshape + auto params = ngraph::builder::makeParams(function->get_parameters().at(0)->get_element_type(), { {1, 49} }); + function->replace_parameter(0, params[0]); + + // todo: it is better to modify the model -> use ShapeOf() and Gather() + std::vector outFormShapes1 = { 1, 1, 49 }; + auto pattern1 = std::make_shared(ngraph::element::Type_t::i64, ngraph::Shape{3}, outFormShapes1); + auto param_target_inputs = function->get_parameters().at(0)->output(0).get_target_inputs(); + + // replace hardcoded shape + for (const auto& target : param_target_inputs.begin()->get_node()->input(1).get_source_output().get_target_inputs()) { + target.replace_source_output(pattern1); + } + function->validate_nodes_and_infer_types(); + + // Calculate References for the network before transformation passes + auto referenceOutputs = CalculateRefs(); + + // Apply LowLatency and UnrollTensorIterator transformations + ngraph::pass::Manager manager; + manager.register_pass(); // LowLatency enables UnrollTI + manager.run_passes(function); + LoadNetwork(); + IE_SUPPRESS_DEPRECATED_START + auto states = executableNetwork.QueryState(); + for (auto& state : states) { + auto name = state.GetName(); + if (name.find("cell_state_1") != std::string::npos) { + auto blob = FuncTestUtils::createAndFillBlobWithFloatArray(state_description, + cell_memory_init.data(), cell_memory_init.size()); + state.SetState(blob); + } else if (name.find("hidden_state_1") != std::string::npos) { + auto blob = FuncTestUtils::createAndFillBlobWithFloatArray(state_description, + hidden_memory_init.data(), hidden_memory_init.size()); + state.SetState(blob); + } else { + GTEST_FAIL() << "unknown memory state"; + } + } + IE_SUPPRESS_DEPRECATED_END + // Run and compare + Infer(); + const auto& actualOutputs = GetOutputs(); + Compare(referenceOutputs, actualOutputs); +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/broadcast_power.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/broadcast_power.hpp index d682d467da8..623548d4fbd 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/broadcast_power.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/broadcast_power.hpp @@ -4,30 +4,12 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/broadcast_power.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "ngraph_functions/builders.hpp" +namespace SubgraphTestsDefinitions { -typedef std::tuple< - std::vector>, // Input shapes - InferenceEngine::Precision, // Network Precision - std::string, // Target Device - std::map //Configuration -> BroadCastPowerTuple; - -namespace LayerTestsDefinitions { - -class BroadcastPowerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; +TEST_P(BroadcastPowerTest, CompareWithRefImpl) { + Run(); }; -} // namespace LayerTestsDefinitions + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/cascade_concat.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/cascade_concat.hpp index 03cd47d4b30..770c34a0a7e 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/cascade_concat.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/cascade_concat.hpp @@ -2,30 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 #pragma once -#include -#include -#include -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/subgraph/cascade_concat.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { -typedef std::tuple< - std::vector>, //input shapes 1 - std::vector>, //input shapes 2 - std::vector>, //input shapes 3 - InferenceEngine::Precision, //Network precision - bool, //Multioutput -> True, Single out ->false - std::string, //Device name - std::map//config - > CascadeConcatTuple; +TEST_P(CascadeConcat, CompareWithRefs) { + Run(); +} -class CascadeConcat - : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); -protected: - void SetUp() override; -}; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/concat_multi_input.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/concat_multi_input.hpp index eb7147bd117..ffa0b0f2d23 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/concat_multi_input.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/concat_multi_input.hpp @@ -4,38 +4,18 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/concat_multi_input.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "ngraph_functions/builders.hpp" +namespace SubgraphTestsDefinitions { -typedef std::tuple< - std::vector>, // Input shapes - InferenceEngine::Precision, // Network Precision - std::string, // Target Device - std::map // Config -> concatMultiParams; - -namespace LayerTestsDefinitions { - -class ConcatMultiInput : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -private: - std::vector paramSize; - ngraph::element::Type ngPrc; - std::vector> inputShapes; - -public: - void GenerateStridedSliceModel(); - void GenerateConstOnlyModel(); - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; +TEST_P(ConcatMultiInput, CompareWithRefStridedSlice) { + GenerateStridedSliceModel(); + Run(); }; -} // namespace LayerTestsDefinitions +TEST_P(ConcatMultiInput, CompareWithRefConstOnly) { + GenerateConstOnlyModel(); + Run(); +}; + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/concat_quantization.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/concat_quantization.hpp index b919cd4e411..9ab9f4bd6ef 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/concat_quantization.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/concat_quantization.hpp @@ -4,30 +4,24 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/concat_quantization.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "ngraph_functions/builders.hpp" +namespace SubgraphTestsDefinitions { -typedef std::tuple< - InferenceEngine::Precision, // Network Precision - std::string, // Target Device - std::map //Configuration -> concatQuantizationParams; +TEST_P(ConcatQuantization, CompareWithRefImpl) { + InferenceEngine::Core* core = PluginCache::get().ie(targetDevice).get(); + if (!configuration.empty()) { + core->SetConfig(configuration, targetDevice); + } -namespace LayerTestsDefinitions { - -class ConcatQuantization : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; + try { + InferenceEngine::CNNNetwork cnnNetwork = InferenceEngine::CNNNetwork{ function }; + executableNetwork = core->LoadNetwork(cnnNetwork, targetDevice); + } + catch (InferenceEngine::details::InferenceEngineException ex) { + FAIL() << ex.what(); + } }; -} // namespace LayerTestsDefinitions + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/constant_result.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/constant_result.hpp index 9f658774162..6a1f9cec05f 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/constant_result.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/constant_result.hpp @@ -4,26 +4,13 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/constant_result.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" +namespace SubgraphTestsDefinitions { -namespace LayerTestsDefinitions { +TEST_P(ConstantResultSubgraphTest, CompareWithRefs) { + Run(); +} -typedef std::tuple< - std::string // Device name -> constResultParams; - -class ConstantResultSubgraphTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); -protected: - void SetUp() override; -}; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/conv_eltwise_fusion.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/conv_eltwise_fusion.hpp index d89012e10c2..078c5ef1257 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/conv_eltwise_fusion.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/conv_eltwise_fusion.hpp @@ -2,36 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 #pragma once -#include -#include -#include -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include -#include +#include "shared_test_classes/subgraph/conv_eltwise_fusion.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { -typedef std::tuple< - ngraph::NodeTypeInfo, // Convolution type - std::tuple< - ngraph::NodeTypeInfo, // Eltwise type - int64_t // Expected number of ops - >, - ngraph::Shape, // Input shape - ngraph::Shape, // Weights shape - ngraph::Shape, // Const shape - ngraph::element::Type, // Network precision - std::string // Device name - > ConvEltwiseFusionParams; - -class ConvEltwiseFusion - : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; -}; -} // namespace LayerTestsDefinitions +TEST_P(ConvEltwiseFusion, CompareWithRefs) { + Run(); +} +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/convert_pad_to_group_conv.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/convert_pad_to_group_conv.hpp index b7c116da01d..d54ed0832e7 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/convert_pad_to_group_conv.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/convert_pad_to_group_conv.hpp @@ -2,32 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 #pragma once -#include -#include -#include -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include -#include +#include "shared_test_classes/subgraph/convert_pad_to_group_conv.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { -typedef std::tuple< - ngraph::Shape, // input shape - std::vector, // pad_begin - std::vector, // pad_end - float, // pad_value - ngraph::op::PadMode, // pad_mode - std::string // Device name - > PadParams; - -class ConvertPadToConvTests - : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; -}; -} // namespace LayerTestsDefinitions +TEST_P(ConvertPadToConvTests, CompareWithRefs) { + Run(); +} +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/delayed_copy_layer.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/delayed_copy_layer.hpp index c6ac64a36f4..0292fbdf7ee 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/delayed_copy_layer.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/delayed_copy_layer.hpp @@ -2,32 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/delayed_copy_layer.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "ngraph_functions/builders.hpp" +namespace SubgraphTestsDefinitions { -namespace LayerTestsDefinitions { - -typedef std::tuple< - InferenceEngine::Precision, //Network precision - std::string, //Device name - std::map //Configuration -> ConcatSplitReluTuple; - -class DelayedCopyTest - : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { -private: - void switchToNgraphFriendlyModel(); -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); -protected: - void SetUp() override; - void Run() override; +TEST_P(DelayedCopyTest, CompareWithRefs) { + Run(); }; -} // namespace LayerTestsDefinitions + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/first_connect_input_concat.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/first_connect_input_concat.hpp index aeb735697fa..d10a6817542 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/first_connect_input_concat.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/first_connect_input_concat.hpp @@ -4,30 +4,12 @@ #pragma once -#include -#include -#include -#include +#include -#include -#include +namespace SubgraphTestsDefinitions { -typedef std::tuple< - std::vector>, // Input shapes - InferenceEngine::Precision, // Network Precision - std::string, // Target Device - std::map // Config -> concatFirstInputParams; - -namespace LayerTestsDefinitions { - -class ConcatFirstInputTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; +TEST_P(ConcatFirstInputTest, CompareWithRefImpl) { + Run(); }; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/get_output_before_activation.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/get_output_before_activation.hpp index ed5c5d4630d..b3df1b381d1 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/get_output_before_activation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/get_output_before_activation.hpp @@ -2,33 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 #pragma once -#include "common_test_utils/test_common.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include +#include "shared_test_classes/subgraph/get_output_before_activation.hpp" namespace SubgraphTestsDefinitions { -enum class midOutputType { - Sum, - Sub, - Mul, + +TEST_P(OutputBeforeActivation, CompareWithRefs) { + Run(); }; -typedef std::tuple< - std::string, // Target device name - InferenceEngine::Precision, // Network precision - size_t, // Input size - midOutputType, // Type of layer that will be an output - std::map // Configuration -> outputBeforeActivationParams; - -std::ostream& operator<< (std::ostream& os, const midOutputType& oType); - -class OutputBeforeActivation : public LayerTestsUtils::LayerTestsCommon, - public testing::WithParamInterface { -protected: - void SetUp() override; -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; -}; } // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/handling_orientation_conv.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/handling_orientation_conv.hpp index eeff3bebae8..bb265bf166d 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/handling_orientation_conv.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/handling_orientation_conv.hpp @@ -4,28 +4,12 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/handling_orientation_conv.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "ngraph_functions/builders.hpp" +namespace SubgraphTestsDefinitions { -namespace LayerTestsDefinitions { -typedef std::tuple< - InferenceEngine::Precision, //Network precision - std::string, //Device name - std::map //Configuration -> HandlingOrientationParams; - -class HandlingOrientationClass : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; +TEST_P(HandlingOrientationClass, CompareWithRefs){ + Run(); }; -} // namespace LayerTestsDefinitions + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/input_conv.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/input_conv.hpp index 7e17817acf2..d002061722a 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/input_conv.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/input_conv.hpp @@ -4,40 +4,12 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/input_conv.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +namespace SubgraphTestsDefinitions { -typedef std::tuple< - std::vector, // Input Shapes - std::vector, // Kernel Shape - size_t // Stride -> convParams; - -typedef std::tuple< - InferenceEngine::Precision, // Network Precision - std::string, // Target Device - std::map, // Configuration - convParams, // Convolution Params - size_t, // Output Channels - bool // If Add Reshape at the end of the model to reshape to 2D -> inputConvParams; - -namespace LayerTestsDefinitions { - -class InputConvTest : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; - -protected: - void SetUp() override; +TEST_P(InputConvTest, CompareWithRefImpl) { + Run(); }; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/matmul_squeeze_add.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/matmul_squeeze_add.hpp index ca2bbaf4812..6d0708e6b5a 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/matmul_squeeze_add.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/matmul_squeeze_add.hpp @@ -4,32 +4,12 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/matmul_squeeze_add.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +namespace SubgraphTestsDefinitions { -typedef std::tuple< - InferenceEngine::Precision, // Network Precision - std::string, // Target Device - std::map, // Configuration - std::vector, // Input Shapes - size_t // Output Size -> matmulSqueezeAddParams; - -namespace LayerTestsDefinitions { - -class MatmulSqueezeAddTest : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; +TEST_P(MatmulSqueezeAddTest, CompareWithRefImpl) { + Run(); }; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/memory_LSTMCell.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/memory_LSTMCell.hpp index e30f62a81c7..522b2cc4e84 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/memory_LSTMCell.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/memory_LSTMCell.hpp @@ -1,39 +1,22 @@ // Copyright (C) 2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 + #pragma once -#include "common_test_utils/test_common.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include +#include "shared_test_classes/subgraph/memory_LSTMCell.hpp" namespace SubgraphTestsDefinitions { -typedef std::tuple< - std::string, // Target device name - InferenceEngine::Precision, // Network precision - size_t, // Input size - size_t, // Hidden size - std::map // Configuration -> memoryLSTMCellParams; -class MemoryLSTMCellTest : public LayerTestsUtils::LayerTestsCommon, - public testing::WithParamInterface { -private: - // you have to Unroll TI manually and remove memory untill ngraph supports it - void switchToNgraphFriendlyModel(); - void CreatePureTensorIteratorModel(); - // since we switching models we need to generate and save weights biases and inputs in SetUp - std::vector input_bias; - std::vector input_weights; - std::vector hidden_memory_init; - std::vector cell_memory_init; - std::vector weights_vals; - std::vector reccurrenceWeights_vals; - std::vector bias_vals; -protected: - void SetUp() override; - void Run() override; - void RunLowLatency(bool regular_api = false); -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); +TEST_P(MemoryLSTMCellTest, CompareWithRefs) { + Run(); }; + +TEST_P(MemoryLSTMCellTest, CompareWithRefs_LowLatencyTransformation) { + RunLowLatency(); +}; + +TEST_P(MemoryLSTMCellTest, CompareWithRefs_LowLatencyRegularAPITransformation) { + RunLowLatency(true); +}; + } // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/memory_eltwise_reshape_concat.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/memory_eltwise_reshape_concat.hpp index e49b57f7879..b0e576a91e1 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/memory_eltwise_reshape_concat.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/memory_eltwise_reshape_concat.hpp @@ -2,36 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 #pragma once -#include "common_test_utils/test_common.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include +#include "shared_test_classes/subgraph/memory_eltwise_reshape_concat.hpp" namespace SubgraphTestsDefinitions { -typedef std::tuple< - std::string, // Target device name - InferenceEngine::Precision, // Network precision - size_t, // Mutiples of concat size to be used as input size - size_t, // Concat size - std::map // Configuration -> memoryEltwiseReshapeConcatParams; -class MemoryEltwiseReshapeConcatTest : public LayerTestsUtils::LayerTestsCommon, - public testing::WithParamInterface { -private: - void initTestModel(); - // you have to replace memory layers since ngraph does not support them - void initNgraphFriendlyModel(); - - // since we switching models we need to generate and save these values in SetUp - size_t inputSize; - size_t concatSize; - ngraph::element::Type ngPrc; - std::vector memory_init; - std::vector concat_vals; -protected: - void SetUp() override; - void Run() override; -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); +TEST_P(MemoryEltwiseReshapeConcatTest, CompareWithRefs) { + Run(); }; + } // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/multioutput_eltwise_squeeze_eltwise.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/multioutput_eltwise_squeeze_eltwise.hpp index d63f62e7047..f96f10f0fa9 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/multioutput_eltwise_squeeze_eltwise.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/multioutput_eltwise_squeeze_eltwise.hpp @@ -2,29 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 #pragma once -#include -#include -#include -#include -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/subgraph/multioutput_eltwise_squeeze_eltwise.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { -typedef std::tuple< - std::vector>, //input shapes - InferenceEngine::Precision, //Network precision - std::string, //Device name - std::map //Configuration -> MultioutputEltwiseReshapeEltwiseTuple; - -class MultioutputEltwiseReshapeEltwise - : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); -protected: - void SetUp() override; +TEST_P(MultioutputEltwiseReshapeEltwise, CompareWithRefs){ + Run(); }; -} // namespace LayerTestsDefinitions + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/multiple_LSTMCell.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/multiple_LSTMCell.hpp index 16b6d7a867e..bbcba76ed95 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/multiple_LSTMCell.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/multiple_LSTMCell.hpp @@ -2,40 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 #pragma once -#include "common_test_utils/test_common.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include +#include "shared_test_classes/subgraph/multiple_LSTMCell.hpp" namespace SubgraphTestsDefinitions { -typedef std::tuple< - std::string, // Target device name - InferenceEngine::Precision, // Network precision - size_t, // Input size - size_t, // Hidden size - std::map // Configuration -> multipleLSTMCellParams; -class MultipleLSTMCellTest : public LayerTestsUtils::LayerTestsCommon, - public testing::WithParamInterface { -private: - // you have to Unroll TI manually and remove memory untill ngraph supports it - void switchToNgraphFriendlyModel(); - void CreatePureTensorIteratorModel(); - // since we switching models we need to generate and save weights biases and inputs in SetUp - size_t hiddenSize; - std::vector input_bias; - std::vector input_weights; - std::vector hidden_memory_init; - std::vector cell_memory_init; - std::vector weights_vals; - std::vector weights_2_vals; - std::vector reccurrenceWeights_vals; - std::vector bias_vals; -protected: - void SetUp() override; - void Run() override; - void RunLowLatency(bool regular_api = false); -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); +TEST_P(MultipleLSTMCellTest, CompareWithRefs) { + Run(); }; + +TEST_P(MultipleLSTMCellTest, CompareWithRefs_LowLatencyTransformation) { + RunLowLatency(); +}; + +TEST_P(MultipleLSTMCellTest, CompareWithRefs_LowLatencyRegularAPITransformation) { + RunLowLatency(true); +}; + } // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/multiple_concat.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/multiple_concat.hpp index 8740aeda171..8b3556dcbbe 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/multiple_concat.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/multiple_concat.hpp @@ -2,24 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 #pragma once -#include "common_test_utils/test_common.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include +#include "shared_test_classes/subgraph/multiple_concat.hpp" namespace SubgraphTestsDefinitions { -typedef std::tuple< - std::string, // Target device name - InferenceEngine::Precision, // Network precision - size_t, // Input size - size_t, // Const size - std::map // Configuration -> multipleConcatParams; -class MultipleConcatTest : public LayerTestsUtils::LayerTestsCommon, - public testing::WithParamInterface { -protected: - void SetUp() override; -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); +TEST_P(MultipleConcatTest, CompareWithRefs) { + Run(); }; + } // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/multiply_add.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/multiply_add.hpp index 4b65929c2c9..e52822343dc 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/multiply_add.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/multiply_add.hpp @@ -3,30 +3,12 @@ // #pragma once -#include -#include -#include -#include -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "common_test_utils/test_constants.hpp" +#include "shared_test_classes/subgraph/multiply_add.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { -using MultiplyAddParamsTuple = typename std::tuple< - std::vector, //input shapes - InferenceEngine::Precision, //Network precision - std::string>; //Device name - -class MultiplyAddLayerTest: - public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon{ -public: - std::shared_ptr fn; - static std::string getTestCaseName(const testing::TestParamInfo &obj); -protected: - void SetUp() override; +TEST_P(MultiplyAddLayerTest, CompareWithRefs) { + Run(); }; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/negative_memory_layer_offset.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/negative_memory_layer_offset.hpp index 0756a374162..5a19b188584 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/negative_memory_layer_offset.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/negative_memory_layer_offset.hpp @@ -2,35 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/negative_memory_layer_offset.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "ngraph_functions/builders.hpp" +namespace SubgraphTestsDefinitions { -namespace LayerTestsDefinitions { - -typedef std::tuple< - InferenceEngine::Precision, //Network precision - std::string, //Device name - size_t, //Input size - size_t, //Hidden size - std::map //Configuration -> NegativeMemoryLayerOffsetTuple; - -class NegativeMemoryOffsetTest - : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { -private: - void switchToNgraphFriendlyModel(); - std::vector memory_init; -public: - static std::string getTestCaseName(const testing::TestParamInfo& obj); -protected: - void SetUp() override; - void Run() override; +TEST_P(NegativeMemoryOffsetTest, CompareWithRefs) { + Run(); }; -} // namespace LayerTestsDefinitions + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/perm_conv_perm_concat.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/perm_conv_perm_concat.hpp index 4365c511fec..47486921dc8 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/perm_conv_perm_concat.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/perm_conv_perm_concat.hpp @@ -4,33 +4,12 @@ #pragma once -#include -#include -#include -#include -#include - -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/subgraph/perm_conv_perm_concat.hpp" namespace SubgraphTestsDefinitions { -typedef std::tuple< - InferenceEngine::Precision, // Network Precision - std::string, // Target Device - std::array, // Input shape - std::array, // Kernel shape - size_t, // Output channels - std::map // Configuration -> PermConvPermConcatParams; -class PermConvPermConcat : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); +TEST_P(PermConvPermConcat, CompareWithRefs) { + Run(); +} -protected: - void SetUp() override; - void Run() override; -}; } // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/quantized_convolution_backprop_data.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/quantized_convolution_backprop_data.hpp index 891b84fd5c7..bf6ff273e88 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/quantized_convolution_backprop_data.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/quantized_convolution_backprop_data.hpp @@ -4,40 +4,12 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/quantized_convolution_backprop_data.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +namespace SubgraphTestsDefinitions { -typedef std::tuple< - InferenceEngine::SizeVector, - InferenceEngine::SizeVector, - std::vector, - std::vector, - InferenceEngine::SizeVector, - size_t, - ngraph::op::PadType, - size_t, - ngraph::helpers::QuantizationGranularity> quantConvBackpropDataSpecificParams; -typedef std::tuple< - quantConvBackpropDataSpecificParams, - InferenceEngine::Precision, - InferenceEngine::SizeVector, - LayerTestsUtils::TargetDevice> quantConvBackpropDataLayerTestParamsSet; +TEST_P(QuantConvBackpropDataLayerTest, CompareWithRefs) { + Run(); +} -namespace LayerTestsDefinitions { - -class QuantConvBackpropDataLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; - -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace SubgraphTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/quantized_group_convolution.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/quantized_group_convolution.hpp index d0825907037..13d21c4a83c 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/quantized_group_convolution.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/quantized_group_convolution.hpp @@ -4,41 +4,12 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/quantized_group_convolution.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +namespace SubgraphTestsDefinitions { -typedef std::tuple< - InferenceEngine::SizeVector, - InferenceEngine::SizeVector, - std::vector, - std::vector, - InferenceEngine::SizeVector, - size_t, - size_t, - size_t, - ngraph::helpers::QuantizationGranularity, - bool> quantGroupConvSpecificParams; -typedef std::tuple< - quantGroupConvSpecificParams, - InferenceEngine::Precision, - InferenceEngine::SizeVector, - LayerTestsUtils::TargetDevice> quantGroupConvLayerTestParamsSet; +TEST_P(QuantGroupConvLayerTest, CompareWithRefs) { + Run(); +} -namespace LayerTestsDefinitions { - -class QuantGroupConvLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; - -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace SubgraphTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/quantized_group_convolution_backprop_data.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/quantized_group_convolution_backprop_data.hpp index 94c50707164..445d5135616 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/quantized_group_convolution_backprop_data.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/quantized_group_convolution_backprop_data.hpp @@ -4,41 +4,12 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/quantized_group_convolution_backprop_data.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +namespace SubgraphTestsDefinitions { -typedef std::tuple< - InferenceEngine::SizeVector, - InferenceEngine::SizeVector, - std::vector, - std::vector, - InferenceEngine::SizeVector, - size_t, - size_t, - ngraph::op::PadType, - size_t, - ngraph::helpers::QuantizationGranularity> quantGroupConvBackpropDataSpecificParams; -typedef std::tuple< - quantGroupConvBackpropDataSpecificParams, - InferenceEngine::Precision, - InferenceEngine::SizeVector, - LayerTestsUtils::TargetDevice> quantGroupConvBackpropDataLayerTestParamsSet; +TEST_P(QuantGroupConvBackpropDataLayerTest, CompareWithRefs) { + Run(); +} -namespace LayerTestsDefinitions { - -class QuantGroupConvBackpropDataLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; - -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace SubgraphTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/quantized_mat_mul.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/quantized_mat_mul.hpp index 7f296f41320..9454633b5d0 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/quantized_mat_mul.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/quantized_mat_mul.hpp @@ -4,33 +4,12 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/quantized_mat_mul.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +namespace SubgraphTestsDefinitions { -typedef std::tuple< - size_t, - ngraph::helpers::QuantizationGranularity, - InferenceEngine::Precision> QuantParams; - -typedef std::tuple< - QuantParams, - InferenceEngine::Precision, - InferenceEngine::SizeVector, - InferenceEngine::SizeVector, - LayerTestsUtils::TargetDevice> QuantMatMulLayerTestParamsSet; - -namespace LayerTestsDefinitions { - -class QuantMatMulTest : public testing::WithParamInterface, virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; +TEST_P(QuantMatMulTest, CompareWithRefs) { + Run(); }; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/range_add.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/range_add.hpp index 145742e6fe9..a299768086d 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/range_add.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/range_add.hpp @@ -4,36 +4,16 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/range_add.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" +namespace SubgraphTestsDefinitions { -#include "single_layer_tests/range.hpp" +TEST_P(RangeAddSubgraphTest, CompareWithRefs) { + Run(); +} -namespace LayerTestsDefinitions { +TEST_P(RangeNumpyAddSubgraphTest, CompareWithRefs) { + Run(); +} -// ------------------------------ V0 ------------------------------ - -class RangeAddSubgraphTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); -protected: - void SetUp() override; -}; - -// ------------------------------ V4 ------------------------------ - -class RangeNumpyAddSubgraphTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); -protected: - void SetUp() override; -}; - -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/relu_shape_of.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/relu_shape_of.hpp index 2ec22af0e19..b9c1ef41944 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/relu_shape_of.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/relu_shape_of.hpp @@ -4,23 +4,12 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/relu_shape_of.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" +namespace SubgraphTestsDefinitions { -#include "single_layer_tests/shape_of.hpp" +TEST_P(ReluShapeOfSubgraphTest, CompareWithRefs) { + Run(); +} -namespace LayerTestsDefinitions { - -class ReluShapeOfSubgraphTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); -protected: - void SetUp() override; -}; -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace SubgraphTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/reshape_permute_conv_permute_reshape_act.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/reshape_permute_conv_permute_reshape_act.hpp index 2f4a8da672d..6b52414c5c7 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/reshape_permute_conv_permute_reshape_act.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/reshape_permute_conv_permute_reshape_act.hpp @@ -4,34 +4,12 @@ #pragma once -#include -#include -#include -#include -#include +#include "shared_test_classes/subgraph/reshape_permute_conv_permute_reshape_act.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "ngraph_functions/builders.hpp" +namespace SubgraphTestsDefinitions { -namespace LayerTestsDefinitions { - typedef std::tuple< - InferenceEngine::Precision, // Network Precision - std::string, // Target Device - std::array, // Input shape - std::array, // Kernel shape - size_t, // Output channels - std::map // Configuration - > ConvReshapeActParams; +TEST_P(ConvReshapeAct, CompareWithRefs) { + Run(); +} -class ConvReshapeAct : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; - void Run() override; -}; - -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/reshape_permute_reshape.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/reshape_permute_reshape.hpp index bb7173d3ede..2c86bd8d6b1 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/reshape_permute_reshape.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/reshape_permute_reshape.hpp @@ -3,28 +3,12 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/reshape_permute_reshape.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "ngraph_functions/builders.hpp" +namespace SubgraphTestsDefinitions { -namespace LayerTestsDefinitions { -typedef std::tuple< - std::vector>, //input shapes and permute shapes - InferenceEngine::Precision, //Network precision - std::string //Device name - > ReshapePermuteReshapeTuple; +TEST_P(ReshapePermuteReshape, CompareWithRefs) { + Run(); +} -class ReshapePermuteReshape : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); - -protected: - void SetUp() override; -}; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/reshape_squeeze_reshape_relu.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/reshape_squeeze_reshape_relu.hpp index e564e3e69f4..8e158fd158d 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/reshape_squeeze_reshape_relu.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/reshape_squeeze_reshape_relu.hpp @@ -2,30 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 #pragma once -#include -#include -#include -#include -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "shared_test_classes/subgraph/reshape_squeeze_reshape_relu.hpp" -namespace LayerTestsDefinitions { -using ShapeAxesTuple = std::pair, std::vector>; +namespace SubgraphTestsDefinitions { -using ReshapeSqueezeReshapeReluTuple = typename std::tuple< - ShapeAxesTuple, // Input shapes & squeeze_indices - InferenceEngine::Precision, // Network precision - std::string, // Device name - ngraph::helpers::SqueezeOpType // SqueezeOpType ->; - -class ReshapeSqueezeReshapeRelu - : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); -protected: - void SetUp() override; +TEST_P(ReshapeSqueezeReshapeRelu, CompareWithRefs){ + Run(); }; -} // namespace LayerTestsDefinitions + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/scaleshift.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/scaleshift.hpp index e79d8729165..137668bf9a6 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/scaleshift.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/scaleshift.hpp @@ -3,28 +3,11 @@ // #pragma once -#include -#include -#include -#include -#include "functional_test_utils/layer_test_utils.hpp" -#include "common_test_utils/test_constants.hpp" +#include "shared_test_classes/subgraph/scaleshift.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { -using ScaleShiftParamsTuple = typename std::tuple< - std::vector>, //input shapes - InferenceEngine::Precision, //Network precision - std::string, //Device name - std::vector, //scale - std::vector>; //shift - -class ScaleShiftLayerTest: - public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon{ -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); -protected: - void SetUp() override; +TEST_P(ScaleShiftLayerTest, CompareWithRefs){ + Run(); }; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/softsign.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/softsign.hpp index 0911c795b45..999d28147a9 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/softsign.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/softsign.hpp @@ -4,36 +4,12 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/softsign.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +namespace SubgraphTestsDefinitions { -typedef std::tuple< - InferenceEngine::Precision, // Network Precision - std::string, // Target Device - std::map, // Configuration - std::vector // Input Shapes -> softsignParams; - -namespace LayerTestsDefinitions { - -class SoftsignTest : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - - void Run() override; - -protected: - void SetUp() override; - -private: - std::shared_ptr GenerateNgraphFriendlySoftSign(); +TEST_P(SoftsignTest, CompareWithRefImpl) { + Run(); }; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/split_concat_memory.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/split_concat_memory.hpp index 64e010cbde6..90809fa4f7c 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/split_concat_memory.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/split_concat_memory.hpp @@ -4,29 +4,61 @@ #pragma once -#include +#include "shared_test_classes/subgraph/split_concat_memory.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +namespace SubgraphTestsDefinitions { -namespace LayerTestsDefinitions { +TEST_P(SplitConcatMemory, cyclicBufferCorrectness) { + auto ie = PluginCache::get().ie(); + cnnNetwork = InferenceEngine::CNNNetwork{function}; -using SplitConcatMemoryParamsTuple = typename std::tuple< - std::vector, // input shapes - InferenceEngine::Precision, // precision - int, // axis of split - std::string // device name ->; + auto exe_net = ie->LoadNetwork(cnnNetwork, "CPU"); + auto inf_reg = exe_net.CreateInferRequest(); + /* + * cnc1 out | mem | In|q + * |===============| + * iter_1 | 0 | 0 | 0 | 1 | + * iter_2 | 0 | 0 | 1 | 2 | + * iter 3 | 0 | 1 | 2 | 3 | + */ -class SplitConcatMemory : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); + auto i_blob = inf_reg.GetBlob("input"); + auto o_blob = inf_reg.GetBlob("plus_one"); -protected: - void SetUp() override; + auto o_blob_ref = make_blob_with_precision(o_blob->getTensorDesc()); + o_blob_ref->allocate(); - int axis; -}; + auto fill_by_quarter = [this] (InferenceEngine::Blob::Ptr& blob, std::vector vals) { + IE_ASSERT(vals.size() == 4); + auto quarter_blocked_shape = blob->getTensorDesc().getDims(); -} // namespace LayerTestsDefinitions \ No newline at end of file + // splis axis dimension into chunk + IE_ASSERT(quarter_blocked_shape[axis] % vals.size() == 0); + quarter_blocked_shape[axis] /= vals.size(); + quarter_blocked_shape.insert(quarter_blocked_shape.begin() + axis, vals.size()); + + auto quarter_blocked_view = CommonTestUtils::make_reshape_view(blob, quarter_blocked_shape); + CommonTestUtils::fill_data_with_broadcast(quarter_blocked_view, axis, vals); + }; + + // iteration 1 + CommonTestUtils::fill_data_const(i_blob, 1); + fill_by_quarter(o_blob_ref, {1, 1, 1, 2}); + inf_reg.Infer(); + Compare(o_blob_ref, o_blob); + + // iteration 2 + CommonTestUtils::fill_data_const(i_blob, 2); + fill_by_quarter(o_blob_ref, {1, 1, 2, 3}); + inf_reg.Infer(); + Compare(o_blob_ref, o_blob); + + // iteration 3 + CommonTestUtils::fill_data_const(i_blob, 3); + fill_by_quarter(o_blob_ref, {1, 2, 3, 4}); + inf_reg.Infer(); + Compare(o_blob_ref, o_blob); +} + +} // namespace SubgraphTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/split_conv_concat.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/split_conv_concat.hpp index d98d7616174..b8d79cb78fe 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/split_conv_concat.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/split_conv_concat.hpp @@ -4,24 +4,12 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/split_conv_concat.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "ngraph_functions/builders.hpp" +namespace SubgraphTestsDefinitions { -namespace LayerTestsDefinitions { - -class SplitConvConcat : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; +TEST_P(SplitConvConcat, CompareWithRefImpl) { + Run(); }; -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace SubgraphTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/split_relu.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/split_relu.hpp index c9fe931b0ae..485095913fe 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/split_relu.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/split_relu.hpp @@ -3,31 +3,12 @@ // #pragma once -#include -#include -#include -#include -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "common_test_utils/test_constants.hpp" +#include "shared_test_classes/subgraph/split_relu.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { -typedef std::tuple< - std::vector>, //input shapes - std::vector, //index connected layer - InferenceEngine::Precision, //Network precision - std::string, //Device name - std::map //Configuration -> SplitReluTuple; - - -class SplitRelu: - public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon{ -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); -protected: - void SetUp() override; +TEST_P(SplitRelu, CompareWithRefs){ + Run(); }; -} // namespace LayerTestsDefinitions + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/split_trivial_permute_concat.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/split_trivial_permute_concat.hpp index 8b8a553ae57..3a314261b2b 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/split_trivial_permute_concat.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/split_trivial_permute_concat.hpp @@ -2,32 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/split_trivial_permute_concat.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "ngraph_functions/builders.hpp" +namespace SubgraphTestsDefinitions { -namespace LayerTestsDefinitions { - -typedef std::tuple< - InferenceEngine::Precision, //Network precision - std::string, //Device name - std::vector, //Input sizes - size_t, //Split axis - size_t, //Concat axis - std::map //Configuration -> SplitTrivialPermuteConcatTuple; - -class SplitTrivialPermuteConcatTest - : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo& obj); -protected: - void SetUp() override; +TEST_P(SplitTrivialPermuteConcatTest, CompareWithRefs) { + Run(); }; -} // namespace LayerTestsDefinitions + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/trivial_concat.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/trivial_concat.hpp index f34f6103387..6b2e71d33f2 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/trivial_concat.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/trivial_concat.hpp @@ -4,29 +4,12 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/trivial_concat.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +namespace SubgraphTestsDefinitions { -namespace LayerTestsDefinitions { -using trivialConcatParamsTuple = typename std::tuple< - std::vector, // Inputs shape - InferenceEngine::Precision, // Network precision - std::string, // Device name - std::map // Configuration ->; - -class TrivialConcatLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); -protected: - void SetUp() override; +TEST_P(TrivialConcatLayerTest, CompareWithRefs) { + Run(); }; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/two_fake_quantize_to_fullyconnected.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/two_fake_quantize_to_fullyconnected.hpp index 8bf3f87dffc..92614228704 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/two_fake_quantize_to_fullyconnected.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/two_fake_quantize_to_fullyconnected.hpp @@ -4,49 +4,12 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/subgraph/two_fake_quantize_to_fullyconnected.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +namespace SubgraphTestsDefinitions { -typedef std::tuple< - std::vector, // levels - std::vector>, // const inputs shape - std::vector, // fake quantize inputLow, inputHigh, outputLow, outputHigh or empty for random - std::vector // input generator data: low, high, resolution -> fqSpecificParams; -typedef std::tuple< - fqSpecificParams, - InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - InferenceEngine::Layout, // Input layout - InferenceEngine::Layout, // Output layout - InferenceEngine::SizeVector, // Input shapes - LayerTestsUtils::TargetDevice, // Device name - std::pair>, // Additional backend configuration and alis name to it - bool -> fqSubgraphTestParamsSet; -namespace LayerTestsDefinitions { +TEST_P(FakeQuantizeSubgraphTest, CompareWithRefs) { + Run(); +} -class FakeQuantizeSubgraphTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(testing::TestParamInfo obj); - -protected: - void SetUp() override; - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; - -protected: - float inputDataMin = 0.0; - float inputDataMax = 10.0; - float inputDataResolution = 1.0; - int32_t seed = 1; -}; - -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/import_export_base/import_export_base.cpp b/inference-engine/tests/functional/plugin/shared/src/base/import_export_base/import_export_base.cpp similarity index 97% rename from inference-engine/tests/ie_test_utils/functional_test_utils/import_export_base/import_export_base.cpp rename to inference-engine/tests/functional/plugin/shared/src/base/import_export_base/import_export_base.cpp index af17eb82d1c..d807d80eaa3 100644 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/import_export_base/import_export_base.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/base/import_export_base/import_export_base.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "import_export_base.hpp" +#include "base/import_export_base/import_export_base.hpp" #include diff --git a/inference-engine/tests/functional/plugin/shared/src/behavior/set_blob.cpp b/inference-engine/tests/functional/plugin/shared/src/behavior/set_blob.cpp index b11ff0f5045..dbc5ce5c1f7 100644 --- a/inference-engine/tests/functional/plugin/shared/src/behavior/set_blob.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/behavior/set_blob.cpp @@ -3,7 +3,7 @@ // #include "behavior/set_blob.hpp" -#include +#include using namespace InferenceEngine; diff --git a/inference-engine/tests/functional/plugin/shared/src/behavior/set_blob_of_kind.cpp b/inference-engine/tests/functional/plugin/shared/src/behavior/set_blob_of_kind.cpp index ae71b88d57d..962b1fab7b5 100644 --- a/inference-engine/tests/functional/plugin/shared/src/behavior/set_blob_of_kind.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/behavior/set_blob_of_kind.cpp @@ -4,8 +4,7 @@ #include "behavior/set_blob_of_kind.hpp" -#include -#include +#include #include diff --git a/inference-engine/tests/functional/plugin/shared/src/execution_graph_tests/num_inputs_fusing_bin_conv.cpp b/inference-engine/tests/functional/plugin/shared/src/execution_graph_tests/num_inputs_fusing_bin_conv.cpp index 7712951b17a..2386107c9ba 100644 --- a/inference-engine/tests/functional/plugin/shared/src/execution_graph_tests/num_inputs_fusing_bin_conv.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/execution_graph_tests/num_inputs_fusing_bin_conv.cpp @@ -11,7 +11,7 @@ #include #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/skip_tests_config.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/src/execution_graph_tests/unique_node_names.cpp b/inference-engine/tests/functional/plugin/shared/src/execution_graph_tests/unique_node_names.cpp index e3e78804e83..26425abbb0c 100644 --- a/inference-engine/tests/functional/plugin/shared/src/execution_graph_tests/unique_node_names.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/execution_graph_tests/unique_node_names.cpp @@ -16,7 +16,7 @@ #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "functional_test_utils/skip_tests_config.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp index 179e9fed3bc..96aca0b3309 100755 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp @@ -13,7 +13,7 @@ #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/pass/convert_prc.hpp" #include "lpt_ngraph_functions/fake_quantize_and_convolution_function.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp index 2033bf35907..29aee459c01 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp @@ -13,7 +13,7 @@ #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/pass/convert_prc.hpp" #include "lpt_ngraph_functions/convolution_function.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp index 11450115159..ac4575e284a 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp @@ -12,7 +12,7 @@ #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/pass/convert_prc.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp index 1b790d5f931..d82c34d4a1f 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp @@ -13,7 +13,7 @@ #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/pass/convert_prc.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp index d638da1fa42..d84f563afca 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp @@ -13,7 +13,7 @@ #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/pass/convert_prc.hpp" #include "ngraph_functions/builders.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp index a1c27a0927a..5d8228f975c 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp @@ -13,7 +13,7 @@ #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/pass/convert_prc.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp index cde5e4b29bc..6987280fba9 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp @@ -13,7 +13,7 @@ #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/pass/convert_prc.hpp" #include "ngraph_functions/builders.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp index e72372bf7db..7451e65ad8c 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp @@ -13,7 +13,7 @@ #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/pass/convert_prc.hpp" #include "lpt_ngraph_functions/group_convolution_function.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp index 3fa6915790a..12ec61335ee 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp @@ -13,7 +13,7 @@ #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/pass/convert_prc.hpp" #include "lpt_ngraph_functions/mat_mul_with_optimized_constant_fake_quantize_function.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp index 4135a983f4b..4c306189ef1 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp @@ -13,7 +13,7 @@ #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/pass/convert_prc.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp index 5c66a7f5005..e8a80f7c7a9 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp @@ -13,7 +13,7 @@ #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/pass/convert_prc.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp index 1205657e466..edaaf823bbc 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp @@ -13,7 +13,7 @@ #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/pass/convert_prc.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp index 4b7054a51d9..c939167450a 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp @@ -13,7 +13,7 @@ #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/pass/convert_prc.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations_for_concat.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations_for_concat.cpp index bfd17a6a00c..fae2f8fdaa1 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations_for_concat.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations_for_concat.cpp @@ -13,7 +13,7 @@ #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/pass/convert_prc.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations_for_concat_multi_channel.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations_for_concat_multi_channel.cpp index 9bc98c63ae4..ab28134d34b 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations_for_concat_multi_channel.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations_for_concat_multi_channel.cpp @@ -13,7 +13,7 @@ #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/pass/convert_prc.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp index feb2ca112a0..24a3b2fea88 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp @@ -13,7 +13,7 @@ #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/pass/convert_prc.hpp" #include "ngraph_functions/builders.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/src/main.cpp b/inference-engine/tests/functional/plugin/shared/src/main.cpp index e47d603a084..1b3728c518c 100644 --- a/inference-engine/tests/functional/plugin/shared/src/main.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/main.cpp @@ -4,7 +4,7 @@ #include "gtest/gtest.h" -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" int main(int argc, char* argv[]) { FuncTestUtils::SkipTestsConfig::disable_tests_skipping = false; diff --git a/inference-engine/tests/functional/shared_test_classes/CMakeLists.txt b/inference-engine/tests/functional/shared_test_classes/CMakeLists.txt new file mode 100644 index 00000000000..b0a95b09709 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/CMakeLists.txt @@ -0,0 +1,33 @@ +# Copyright (C) 2020 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 +# + +set(TARGET_NAME sharedTestClasses) + +list(APPEND EXPORT_DEPENDENCIES + funcTestUtils + ngraphFunctions + ) + +addIeTarget( + NAME ${TARGET_NAME} + TYPE STATIC + ROOT "${CMAKE_CURRENT_SOURCE_DIR}/include" + ADD_CPPLINT + DEVELOPER_PACKAGE + INCLUDES + PUBLIC + "${CMAKE_CURRENT_SOURCE_DIR}/include" + ADDITIONAL_SOURCE_DIRS + ${CMAKE_CURRENT_SOURCE_DIR}/src + LINK_LIBRARIES + PRIVATE + ${EXPORT_DEPENDENCIES} + EXPORT_DEPENDENCIES + ${EXPORT_DEPENDENCIES} +) + +ie_faster_build(${TARGET_NAME} + PCH PRIVATE "src/precomp.hpp" + ) + diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/layer_test_utils.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/layer_test_utils.hpp similarity index 97% rename from inference-engine/tests/ie_test_utils/functional_test_utils/layer_test_utils.hpp rename to inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/layer_test_utils.hpp index 20c326a4b7e..a1f47a367c7 100644 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/layer_test_utils.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/layer_test_utils.hpp @@ -17,6 +17,7 @@ #include #include +#include "common_test_utils/ngraph_test_utils.hpp" #include "common_test_utils/common_utils.hpp" #include "common_test_utils/test_common.hpp" @@ -136,6 +137,8 @@ public: virtual void Run(); + virtual void Serialize(); + virtual void Compare(const std::vector> &expectedOutputs, const std::vector &actualOutputs); @@ -210,6 +213,8 @@ protected: private: RefMode refMode = RefMode::INTERPRETER; + static std::string GetTimestamp(); + const std::string GetTestName(); }; } // namespace LayerTestsUtils diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/low_precision_transformations/layer_transformation.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp similarity index 97% rename from inference-engine/tests/ie_test_utils/functional_test_utils/low_precision_transformations/layer_transformation.hpp rename to inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp index 97a0d3b3e99..904cac83563 100644 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/low_precision_transformations/layer_transformation.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp @@ -10,7 +10,7 @@ #include -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" #include namespace LayerTestsUtils { diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/activation.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/activation.hpp new file mode 100644 index 00000000000..1552ca270fe --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/activation.hpp @@ -0,0 +1,114 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ie_core.hpp" +#include "ie_precision.hpp" +#include "details/ie_exception.hpp" + +#include "ngraph/opsets/opset1.hpp" + +#include "functional_test_utils/blob_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "common_test_utils/common_utils.hpp" + +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "ngraph_functions/builders.hpp" + +namespace LayerTestsDefinitions { + +static std::map activationNames = { + {ngraph::helpers::ActivationTypes::Sigmoid, "Sigmoid"}, + {ngraph::helpers::ActivationTypes::Tanh, "Tanh"}, + {ngraph::helpers::ActivationTypes::Relu, "Relu"}, + {ngraph::helpers::ActivationTypes::LeakyRelu, "LeakyRelu"}, + {ngraph::helpers::ActivationTypes::Exp, "Exp"}, + {ngraph::helpers::ActivationTypes::Log, "Log"}, + {ngraph::helpers::ActivationTypes::Sign, "Sign"}, + {ngraph::helpers::ActivationTypes::Abs, "Abs"}, + {ngraph::helpers::ActivationTypes::Gelu, "Gelu"}, + {ngraph::helpers::ActivationTypes::Clamp, "Clamp"}, + {ngraph::helpers::ActivationTypes::Negative, "Negative"}, + {ngraph::helpers::ActivationTypes::Acos, "Acos"}, + {ngraph::helpers::ActivationTypes::Asin, "Asin"}, + {ngraph::helpers::ActivationTypes::Atan, "Atan"}, + {ngraph::helpers::ActivationTypes::Cos, "Cos"}, + {ngraph::helpers::ActivationTypes::Cosh, "Cosh"}, + {ngraph::helpers::ActivationTypes::Floor, "Floor"}, + {ngraph::helpers::ActivationTypes::Sin, "Sin"}, + {ngraph::helpers::ActivationTypes::Sinh, "Sinh"}, + {ngraph::helpers::ActivationTypes::Sqrt, "Sqrt"}, + {ngraph::helpers::ActivationTypes::Tan, "Tan"}, + {ngraph::helpers::ActivationTypes::Elu, "Elu"}, + {ngraph::helpers::ActivationTypes::Erf, "Erf"}, + {ngraph::helpers::ActivationTypes::HardSigmoid, "HardSigmoid"}, + {ngraph::helpers::ActivationTypes::Selu, "Selu"}, + {ngraph::helpers::ActivationTypes::Sigmoid, "Sigmoid"}, + {ngraph::helpers::ActivationTypes::Tanh, "Tanh"}, + {ngraph::helpers::ActivationTypes::Relu, "Relu"}, + {ngraph::helpers::ActivationTypes::LeakyRelu, "LeakyRelu"}, + {ngraph::helpers::ActivationTypes::Exp, "Exp"}, + {ngraph::helpers::ActivationTypes::Log, "Log"}, + {ngraph::helpers::ActivationTypes::Sign, "Sign"}, + {ngraph::helpers::ActivationTypes::Abs, "Abs"}, + {ngraph::helpers::ActivationTypes::Gelu, "Gelu"}, + {ngraph::helpers::ActivationTypes::Ceiling, "Ceiling"}, + {ngraph::helpers::ActivationTypes::PReLu, "PReLu"}, + {ngraph::helpers::ActivationTypes::Mish, "Mish"}, + {ngraph::helpers::ActivationTypes::HSwish, "HSwish"}, + {ngraph::helpers::ActivationTypes::SoftPlus, "SoftPlus"}, + {ngraph::helpers::ActivationTypes::Swish, "Swish"}, + {ngraph::helpers::ActivationTypes::HSigmoid, "HSigmoid"}, + {ngraph::helpers::ActivationTypes::RoundHalfToEven, "RoundHalfToEven"}, + {ngraph::helpers::ActivationTypes::RoundHalfAwayFromZero, "RoundHalfAwayFromZero"} +}; + +typedef std::tuple< + std::pair>, // Activation type and constant value + InferenceEngine::Precision, + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + std::pair, std::vector>, + std::string> activationParams; + +class ActivationLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + ngraph::helpers::ActivationTypes activationType; + static std::string getTestCaseName(const testing::TestParamInfo &obj); + InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; + +protected: + void SetUp() override; +}; + +class ActivationParamLayerTest : public ActivationLayerTest { +public: + void Infer() override; + +protected: + void SetUp() override; + +private: + void generateActivationBlob(std::vector constantsValue); + ngraph::ParameterVector createActivationParams( + ngraph::element::Type ngPrc, std::vector inShape = {}); + +private: + std::vector constantsValue; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/batch_norm.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/batch_norm.hpp new file mode 100644 index 00000000000..f2e883293ed --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/batch_norm.hpp @@ -0,0 +1,33 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" + +namespace LayerTestsDefinitions { +typedef std::tuple< + double, // epsilon + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + InferenceEngine::SizeVector, // Input shapes + LayerTestsUtils::TargetDevice // Target device name +> BatchNormLayerTestParams; + +class BatchNormLayerTest : public testing::WithParamInterface, + public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo& obj); + + InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/batch_to_space.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/batch_to_space.hpp new file mode 100644 index 00000000000..6a47951ff2d --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/batch_to_space.hpp @@ -0,0 +1,37 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { + +using batchToSpaceParamsTuple = typename std::tuple< + std::vector, // block shape + std::vector, // crops begin + std::vector, // crops end + std::vector, // Input shapes + InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + std::string>; // Device name>; + +class BatchToSpaceLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/broadcast.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/broadcast.hpp new file mode 100644 index 00000000000..7e59367a892 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/broadcast.hpp @@ -0,0 +1,35 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +using BroadcastParamsTuple = typename std::tuple< + InferenceEngine::SizeVector, // target shape + ngraph::AxisSet, // axes mapping + ngraph::op::BroadcastType, // broadcast mode + InferenceEngine::SizeVector, // Input shape + InferenceEngine::Precision, // Network precision + std::string>; // Device name + +class BroadcastLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/comparison.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/comparison.hpp new file mode 100644 index 00000000000..5a576d938b1 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/comparison.hpp @@ -0,0 +1,41 @@ +// Copyright (C) 2020 Intel Corporation +// +// SPDX-License-Identifier: Apache-2.0 + +#pragma once + +#include + +#include +#include + +#include "common_test_utils/common_utils.hpp" +#include "common_test_utils/test_common.hpp" +#include "common_test_utils/test_constants.hpp" +#include "ie_core.hpp" + +namespace LayerTestsDefinitions { +namespace ComparisonParams { +using InputShapesTuple = std::pair, std::vector>; +} // ComparisonParams + +typedef std::tuple< + ComparisonParams::InputShapesTuple, // Input shapes tuple + InferenceEngine::Precision, // NG Inputs precision + ngraph::helpers::ComparisonTypes, // Comparison op type + ngraph::helpers::InputLayerType, // Second input type + InferenceEngine::Precision, // IE in precision + InferenceEngine::Precision, // IE out precision + std::string, // Device name + std::map // Additional network configuration +> ComparisonTestParams; + +class ComparisonLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +protected: + void SetUp() override; + +public: + static std::string getTestCaseName(testing::TestParamInfo obj); +}; +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/concat.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/concat.hpp new file mode 100644 index 00000000000..09c38be111d --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/concat.hpp @@ -0,0 +1,39 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +using concatParamsTuple = typename std::tuple< + //TODO: according to specification axis have to be int, negative values are allowed + size_t, // Concat axis + std::vector>, // Input shapes + InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + std::string>; // Device name + +// Multichannel +class ConcatLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convert.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convert.hpp new file mode 100644 index 00000000000..e009cd0a95c --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convert.hpp @@ -0,0 +1,35 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +using ConvertParamsTuple = typename std::tuple< + std::vector>, // Input shapes + InferenceEngine::Precision, // Source precision + InferenceEngine::Precision, // Target precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + std::string>; // Device name + +class ConvertLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convert_like.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convert_like.hpp new file mode 100644 index 00000000000..caa71576866 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convert_like.hpp @@ -0,0 +1,36 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +using ConvertLikeParamsTuple = typename std::tuple< + std::vector>, // Input1 shapes + InferenceEngine::Precision, // Input1 precision + std::vector>, // Input2 shapes + InferenceEngine::Precision, // Input2 precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + std::string>; // Device name + +class ConvertLikeLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convolution.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convolution.hpp new file mode 100644 index 00000000000..2a721ac1bb6 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convolution.hpp @@ -0,0 +1,49 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +// ! [test_convolution:definition] +typedef std::tuple< + InferenceEngine::SizeVector, // Kernel size + InferenceEngine::SizeVector, // Strides + std::vector, // Pad begin + std::vector, // Pad end + InferenceEngine::SizeVector, // Dilation + size_t, // Num out channels + ngraph::op::PadType // Padding type +> convSpecificParams; +typedef std::tuple< + convSpecificParams, + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + InferenceEngine::SizeVector, // Input shapes + LayerTestsUtils::TargetDevice // Device name +> convLayerTestParamsSet; + +class ConvolutionLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; +// ! [test_convolution:definition] + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convolution_backprop_data.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convolution_backprop_data.hpp new file mode 100644 index 00000000000..f15c2d080cc --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convolution_backprop_data.hpp @@ -0,0 +1,48 @@ +// namespace LayerTestsDefinitions +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + InferenceEngine::SizeVector, // Kernel size + InferenceEngine::SizeVector, // Strides + std::vector, // Pad begin + std::vector, // Pad end + InferenceEngine::SizeVector, // Dilation + size_t, // Num out channels + ngraph::op::PadType // Padding type +> convBackpropDataSpecificParams; +typedef std::tuple< + convBackpropDataSpecificParams, + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + InferenceEngine::SizeVector, // Input shapes + LayerTestsUtils::TargetDevice // Device name +> convBackpropDataLayerTestParamsSet; + +class ConvolutionBackpropDataLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/ctc_greedy_decoder.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/ctc_greedy_decoder.hpp new file mode 100644 index 00000000000..5824f6b69d0 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/ctc_greedy_decoder.hpp @@ -0,0 +1,56 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include +#include +#include +#include +#include + + +#include "ie_core.hpp" +#include "ie_precision.hpp" +#include "details/ie_exception.hpp" + +#include "ngraph/opsets/opset1.hpp" + +#include "functional_test_utils/blob_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "common_test_utils/common_utils.hpp" + +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "ngraph_functions/builders.hpp" + + +namespace LayerTestsDefinitions { +typedef std::tuple< + InferenceEngine::Precision, + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + InferenceEngine::SizeVector, + bool, + std::string> ctcGreedyDecoderParams; + +class CTCGreedyDecoderLayerTest + : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo& obj); + +protected: + InferenceEngine::SizeVector inputShapes; + InferenceEngine::SizeVector sequenceLengths; + bool mergeRepeated; + + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/ctc_loss.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/ctc_loss.hpp new file mode 100644 index 00000000000..6c6c0a70fab --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/ctc_loss.hpp @@ -0,0 +1,42 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + std::vector, // Logits shapes + std::vector, // logits lenght + std::vector>, // labels + std::vector, // labels length + int, // blank index + bool, // preprocessCollapseRepeated + bool, // ctcMergeRepeated + bool // Unique +> CTCLossParamsSubset; + +typedef std::tuple< + CTCLossParamsSubset, + InferenceEngine::Precision, // Float point precision + InferenceEngine::Precision, // Integer precision + LayerTestsUtils::TargetDevice // Device name +> CTCLossParams; + +class CTCLossLayerTest : public testing::WithParamInterface, + public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/cum_sum.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/cum_sum.hpp new file mode 100644 index 00000000000..212a291fc01 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/cum_sum.hpp @@ -0,0 +1,31 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + InferenceEngine::SizeVector, // Input shapes + InferenceEngine::Precision, // Input precision + int64_t, // Axis + bool, // Exclusive + bool, // Reverse + std::string> cumSumParams; // Device name + +class CumSumLayerTest : public testing::WithParamInterface, virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/depth_to_space.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/depth_to_space.hpp new file mode 100644 index 00000000000..8cd29a1c394 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/depth_to_space.hpp @@ -0,0 +1,32 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { + +using depthToSpaceParamsTuple = typename std::tuple< + std::vector, // Input shape + InferenceEngine::Precision, // Input precision + ngraph::opset3::DepthToSpace::DepthToSpaceMode, // Mode + std::size_t, // Block size + std::string>; // Device name> + +class DepthToSpaceLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/detection_output.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/detection_output.hpp new file mode 100644 index 00000000000..82a56f7d5ca --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/detection_output.hpp @@ -0,0 +1,71 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "ngraph/op/detection_output.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { + +enum { + idxLocation, + idxConfidence, + idxPriors, + idxArmConfidence, + idxArmLocation, + numInputs +}; + +using DetectionOutputAttributes = std::tuple< + int, // numClasses + int, // backgroundLabelId + int, // topK + std::vector, // keepTopK + std::string, // codeType + float, // nmsThreshold + float, // confidenceThreshold + bool, // clip_afterNms + bool, // clip_beforeNms + bool // decreaseLabelId +>; + +using ParamsWhichSizeDepends = std::tuple< + bool, // varianceEncodedInTarget + bool, // shareLocation + bool, // normalized + size_t, // inputHeight + size_t, // inputWidth + InferenceEngine::SizeVector, // "Location" input + InferenceEngine::SizeVector, // "Confidence" input + InferenceEngine::SizeVector, // "Priors" input + InferenceEngine::SizeVector, // "ArmConfidence" input + InferenceEngine::SizeVector // "ArmLocation" input +>; + +using DetectionOutputParams = std::tuple< + DetectionOutputAttributes, + ParamsWhichSizeDepends, + size_t, // Number of batch + float, // objectnessScore + std::string // Device name +>; + +class DetectionOutputLayerTest : public testing::WithParamInterface, virtual public LayerTestsUtils::LayerTestsCommon { + public: + static std::string getTestCaseName(testing::TestParamInfo obj); + ngraph::op::DetectionOutputAttrs attrs; + std::vector inShapes; + void Infer() override; + void Compare(const std::vector &expected, const InferenceEngine::Blob::Ptr &actual) override; + protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/eltwise.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/eltwise.hpp new file mode 100644 index 00000000000..4bb3fc324c4 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/eltwise.hpp @@ -0,0 +1,42 @@ +// Copyright (C) 2020 Intel Corporation +// +// SPDX-License-Identifier: Apache-2.0 +// +// NOTE: WILL BE REWORKED (31905) + +#include + +#include +#include + +#include "common_test_utils/common_utils.hpp" +#include "common_test_utils/test_common.hpp" +#include "common_test_utils/test_constants.hpp" +#include "common_test_utils/common_layers_params.hpp" +#include "ie_core.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + std::vector>, // input shapes + ngraph::helpers::EltwiseTypes, // eltwise op type + ngraph::helpers::InputLayerType, // secondary input type + CommonTestUtils::OpType, // op type + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + std::string, // Device name + std::map // Additional network configuration +> EltwiseTestParams; + +class EltwiseLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +protected: + InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; + void SetUp() override; + +public: + static std::string getTestCaseName(testing::TestParamInfo obj); +}; +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/embedding_bag_offsets_sum.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/embedding_bag_offsets_sum.hpp new file mode 100644 index 00000000000..49f298ebb5a --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/embedding_bag_offsets_sum.hpp @@ -0,0 +1,39 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + std::vector, // emb_table_shape + std::vector, // indices + std::vector, // offsets + size_t, // default_index + bool, // with_weights + bool // with_def_index +> embeddingBagOffsetsSumParams; + +typedef std::tuple< + embeddingBagOffsetsSumParams, + InferenceEngine::Precision, // embedding table + InferenceEngine::Precision, // indices + LayerTestsUtils::TargetDevice> embeddingBagOffsetsSumLayerTestParamsSet; + +class EmbeddingBagOffsetsSumLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/embedding_bag_packed_sum.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/embedding_bag_packed_sum.hpp new file mode 100644 index 00000000000..157768c931d --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/embedding_bag_packed_sum.hpp @@ -0,0 +1,37 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + std::vector, // emb_table_shape + std::vector>, // indices + bool // with_weights +> embeddingBagPackedSumParams; + +typedef std::tuple< + embeddingBagPackedSumParams, + InferenceEngine::Precision, // embedding table + InferenceEngine::Precision, // indices + LayerTestsUtils::TargetDevice> embeddingBagPackedSumLayerTestParamsSet; + + +class EmbeddingBagPackedSumLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/embedding_segments_sum.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/embedding_segments_sum.hpp new file mode 100644 index 00000000000..3744a87c79f --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/embedding_segments_sum.hpp @@ -0,0 +1,40 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + std::vector, // emb_table_shape + std::vector, // indices + std::vector, // segment_ids + size_t, // num_segments + size_t, // default_index + bool, // with_weights + bool // with_def_index +> embeddingSegmentsSumParams; + +typedef std::tuple< + embeddingSegmentsSumParams, + InferenceEngine::Precision, // embedding table + InferenceEngine::Precision, // indices + LayerTestsUtils::TargetDevice> embeddingSegmentsSumLayerTestParamsSet; + +class EmbeddingSegmentsSumLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/extract_image_patches.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/extract_image_patches.hpp new file mode 100644 index 00000000000..2be311afcf4 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/extract_image_patches.hpp @@ -0,0 +1,37 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { + +using extractImagePatchesTuple = typename std::tuple< + std::vector, // input shape + std::vector, // kernel size + std::vector, // strides + std::vector, // rates + ngraph::op::PadType, // pad type + InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + LayerTestsUtils::TargetDevice>; // Device name + +class ExtractImagePatchesTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/fake_quantize.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/fake_quantize.hpp new file mode 100644 index 00000000000..cbaee3ddafd --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/fake_quantize.hpp @@ -0,0 +1,64 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +// seed selected using current cloc time +#define USE_CLOCK_TIME 1 +// seed started from default value, and incremented every time using big number like 9999 +#define USE_INCREMENTAL_SEED 2 + +/** + * redefine this seed to reproduce issue with given seed that can be read from gtest logs + */ +#define BASE_SEED 123 +#define NGRAPH_SEED 123 + +namespace LayerTestsDefinitions { + +typedef std::tuple< + size_t, // levels + std::vector, // const inputs shape + std::vector, // fake quantize inputLow, inputHigh, outputLow, outputHigh or empty for random + std::vector // input generator data: low, high, resolution +> fqSpecificParams; +typedef std::tuple< + fqSpecificParams, + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + InferenceEngine::SizeVector, // Input shapes + LayerTestsUtils::TargetDevice, // Device name + + std::pair> // Additional backend configuration and alis name to it +> fqLayerTestParamsSet; + +class FakeQuantizeLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; +protected: + void SetUp() override; + void UpdateSeed(); + + protected: + float inputDataMin = 0.0; + float inputDataMax = 10.0; + float inputDataResolution = 1.0; + int32_t seed = 1; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gather.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gather.hpp new file mode 100644 index 00000000000..64b9ea0d25b --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gather.hpp @@ -0,0 +1,44 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + std::vector, // Indices + std::vector, // Indices shape + int, // Gather axis + std::vector, // Input shapes + InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + std::string // Device name +> gatherParamsTuple; + +class GatherLayerTestBase : virtual public LayerTestsUtils::LayerTestsCommon { +protected: + void SetUp(const gatherParamsTuple& params); +}; + +class GatherLayerTest : public testing::WithParamInterface, public GatherLayerTestBase { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gather_nd.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gather_nd.hpp new file mode 100644 index 00000000000..437d71feee7 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gather_nd.hpp @@ -0,0 +1,39 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { +using Config = std::map; + +typedef std::tuple< + std::vector, // Data shapes + std::vector, // Indices shape + int // batch dims +> GatherNDParamsSubset; + +typedef std::tuple< + GatherNDParamsSubset, + InferenceEngine::Precision, // Data precision + InferenceEngine::Precision, // Indices precision + LayerTestsUtils::TargetDevice, // Device name + Config // Plugin config +> GatherNDParams; + +class GatherNDLayerTest : public testing::WithParamInterface, + public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gather_tree.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gather_tree.hpp new file mode 100644 index 00000000000..9839cedf2b0 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gather_tree.hpp @@ -0,0 +1,38 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +using GatherTreeParamsTuple = typename std::tuple< + std::vector, // Input tensors shape + ngraph::helpers::InputLayerType, // Secondary input type + InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + std::string>; // Device name + +class GatherTreeLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/grn.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/grn.hpp new file mode 100644 index 00000000000..8aebddcf9df --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/grn.hpp @@ -0,0 +1,55 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include +#include +#include +#include +#include + + +#include "ie_core.hpp" +#include "ie_precision.hpp" +#include "details/ie_exception.hpp" + +#include "ngraph/opsets/opset1.hpp" + +#include "functional_test_utils/blob_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "common_test_utils/common_utils.hpp" + +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "ngraph_functions/builders.hpp" + + +namespace LayerTestsDefinitions { +typedef std::tuple< + InferenceEngine::Precision, + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + InferenceEngine::SizeVector, + float, + std::string> grnParams; + +class GrnLayerTest + : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon{ +public: + static std::string getTestCaseName(const testing::TestParamInfo& obj); + +protected: + InferenceEngine::SizeVector inputShapes; + float bias; + + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/group_convolution.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/group_convolution.hpp new file mode 100644 index 00000000000..d17c96c1025 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/group_convolution.hpp @@ -0,0 +1,45 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { +typedef std::tuple< + InferenceEngine::SizeVector, + InferenceEngine::SizeVector, + std::vector, + std::vector, + InferenceEngine::SizeVector, + size_t, + size_t, + ngraph::op::PadType> groupConvSpecificParams; +typedef std::tuple< + groupConvSpecificParams, + InferenceEngine::Precision, + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + InferenceEngine::SizeVector, + LayerTestsUtils::TargetDevice> groupConvLayerTestParamsSet; + +class GroupConvolutionLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/group_convolution_backprop_data.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/group_convolution_backprop_data.hpp new file mode 100644 index 00000000000..f2618bb1c40 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/group_convolution_backprop_data.hpp @@ -0,0 +1,46 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + InferenceEngine::SizeVector, + InferenceEngine::SizeVector, + std::vector, + std::vector, + InferenceEngine::SizeVector, + size_t, + size_t, + ngraph::op::PadType> groupConvBackpropDataSpecificParams; +typedef std::tuple< + groupConvBackpropDataSpecificParams, + InferenceEngine::Precision, + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + InferenceEngine::SizeVector, + LayerTestsUtils::TargetDevice> groupConvBackpropDataLayerTestParamsSet; + +class GroupConvBackpropDataLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gru_cell.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gru_cell.hpp new file mode 100644 index 00000000000..e28389709f8 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gru_cell.hpp @@ -0,0 +1,38 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +using GRUCellParams = typename std::tuple< + bool, // using decompose to sub-ops transformation + size_t, // batch + size_t, // hidden size + size_t, // input size + std::vector, // activations + float, // clip + bool, // linear_before_reset + InferenceEngine::Precision, // Network precision + std::string>; // Device name + +class GRUCellTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gru_sequence.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gru_sequence.hpp new file mode 100644 index 00000000000..38cd2ca4254 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gru_sequence.hpp @@ -0,0 +1,46 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include +#include +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +using GRUSequenceParams = typename std::tuple< + ngraph::helpers::SequenceTestsMode, // pure Sequence or TensorIterator + size_t, // seq_lengths + size_t, // batch + size_t, // hidden size + // todo: fix. input size hardcoded to 10 due to limitation (10 args) of gtests Combine() func. + //size_t, // input size + std::vector, // activations + float, // clip + bool, // linear_before_reset + ngraph::op::RecurrentSequenceDirection, // direction + InferenceEngine::Precision, // Network precision + std::string>; // Device name + +class GRUSequenceTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; + void Infer() override; + +private: + ngraph::helpers::SequenceTestsMode m_mode; + int64_t m_max_seq_len = 0; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/interpolate.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/interpolate.hpp new file mode 100644 index 00000000000..aebb23cd4bb --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/interpolate.hpp @@ -0,0 +1,53 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + ngraph::op::v4::Interpolate::InterpolateMode, // InterpolateMode + ngraph::op::v4::Interpolate::ShapeCalcMode, // ShapeCalculationMode + ngraph::op::v4::Interpolate::CoordinateTransformMode, // CoordinateTransformMode + ngraph::op::v4::Interpolate::NearestMode, // NearestMode + bool, // AntiAlias + std::vector, // PadBegin + std::vector, // PadEnd + double, // Cube coef + std::vector, // Axes + std::vector // Scales +> InterpolateSpecificParams; + +typedef std::tuple< + InterpolateSpecificParams, + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + InferenceEngine::SizeVector, // Input shapes + InferenceEngine::SizeVector, // Target shapes + LayerTestsUtils::TargetDevice // Device name +> InterpolateLayerTestParams; + +class InterpolateLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/log_softmax.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/log_softmax.hpp new file mode 100644 index 00000000000..71780bf6c10 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/log_softmax.hpp @@ -0,0 +1,41 @@ +// Copyright (C) 2020 Intel Corporation +// +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +using logSoftmaxLayerTestParams = std::tuple< + InferenceEngine::Precision, // netPrecision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + InferenceEngine::SizeVector, // inputShape + int64_t, // axis + std::string, // targetDevice + std::map // config +>; + +class LogSoftmaxLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/logical.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/logical.hpp new file mode 100644 index 00000000000..c0864251a68 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/logical.hpp @@ -0,0 +1,53 @@ +// Copyright (C) 2020 Intel Corporation +// +// SPDX-License-Identifier: Apache-2.0 + +#pragma once + +#include + +#include +#include + +#include "common_test_utils/common_utils.hpp" +#include "common_test_utils/test_common.hpp" +#include "common_test_utils/test_constants.hpp" +#include "ie_core.hpp" + +namespace LayerTestsDefinitions { +namespace LogicalParams { +using InputShapesTuple = std::pair, std::vector>; +} // LogicalParams + +typedef std::tuple< + LogicalParams::InputShapesTuple, // Input shapes tuple + ngraph::helpers::LogicalTypes, // Logical op type + ngraph::helpers::InputLayerType, // Second input type + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + std::string, // Device name + std::map // Additional network configuration +> LogicalTestParams; + +class LogicalLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +protected: + InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; + void SetupParams(); + void SetUp() override; + +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + static std::vector combineShapes(const std::map, std::vector>>& inputShapes); + +protected: + LogicalParams::InputShapesTuple inputShapes; + ngraph::helpers::LogicalTypes logicalOpType; + ngraph::helpers::InputLayerType secondInputType; + InferenceEngine::Precision netPrecision; + std::map additional_config; +}; +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/loop.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/loop.hpp new file mode 100644 index 00000000000..c5b7d9f6cbf --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/loop.hpp @@ -0,0 +1,148 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include +#include +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { +enum LOOP_IN_TYPE { + INVARIANT, + MERGED +}; + +using LoopParams = typename std::tuple< + bool, // ExecuteFirstIteration + bool, // BodyCondition is a constant? + bool, // BodyCondition value, if it is a Const + int64_t, // TripCount, -1 means infinity + std::vector, LOOP_IN_TYPE>>, // inputs + InferenceEngine::Precision, // Network precision + std::string>; // Device name + +class LoopTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + + +using StaticShapeLoopParams = typename std::tuple< + bool, + std::tuple< + bool, + int64_t, + int64_t, + int64_t + >, + int64_t, + InferenceEngine::SizeVector, + InferenceEngine::Precision, + std::string + >; + +/** + * Test case with static SHAPE version of loop operation. + * Total iteration count is dynamic. + */ +class StaticShapeLoopTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; + std::vector> PredefinedRefs(); + +private: + bool static_iter_num; // trip count provided by constant node + bool static_continue_cond; // initial_cond provided by constant node + int64_t max_iter_num; // -1 means infinity loop (expected dynamic exit condition in body) + int64_t dynamic_exit; // -1 means always true + int64_t axis; // -1 means no auto concatenation + int64_t start_value; + InferenceEngine::SizeVector data_shape; + InferenceEngine::Precision data_prc; + + int64_t actual_n_iter(); + +protected: + void SetUp() override; +}; + + +class TrivialLoopTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +protected: + using RefBlobGenerator = std::function; + std::map inputGens, outputGens; + + void CreateSlicedLoop(size_t batch_size, size_t num_iteration, InferenceEngine::Precision iePrc, + InferenceEngine::SizeVector& ieShape); + void CreateSlicedLoopDynCondition(size_t batch_size, size_t num_iteration, InferenceEngine::Precision iePrc, + InferenceEngine::SizeVector& ieShape, size_t trip_count); + InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override { + auto found = inputGens.find(info.name()); + if (found != inputGens.end()) { + return found->second(info.getTensorDesc()); + } + + found = inputGens.find(""); + if (found != inputGens.end()) { + return found->second(info.getTensorDesc()); + } + + return LayerTestsCommon::GenerateInput(info); + } + + std::vector> CalculateRefs() override { + if (outputGens.empty()) + return LayerTestsCommon::CalculateRefs(); + + const auto results = function->get_results(); + const auto outs_info = cnnNetwork.getOutputsInfo(); + const auto num_out_blob = results.size(); + + std::vector> res_collection(num_out_blob); + + for (int i = 0; i < num_out_blob; i++) { + // TODO: name of original NG result doesn't match with outs after conversion. + // Expected : auto name = results[i]->get_friendly_name(); + auto name = results[i]->get_input_node_ptr(0)->get_friendly_name(); + auto data = outs_info.at(name); + IE_ASSERT(data != nullptr); + + RefBlobGenerator generator; + auto found = outputGens.find(name); + if (found != outputGens.end()) { + generator = found->second; + } else { + found = outputGens.find(""); + if (found != outputGens.end()) { + generator = found->second; + } + } + + IE_ASSERT(generator != nullptr) << "Test output generator is not specified"; + auto blob = generator(data->getTensorDesc()); + auto blob_size = blob->byteSize(); + auto blob_ptr = blob->buffer().as(); + + auto &res = res_collection[i]; + res.resize(blob_size); + std::copy(blob_ptr, blob_ptr + blob_size, res.begin()); + } + return res_collection; + } +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/lrn.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/lrn.hpp new file mode 100644 index 00000000000..40abbedea6e --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/lrn.hpp @@ -0,0 +1,43 @@ +// Copyright (C) 2020 Intel Corporation +// +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + double, // Alpha + double, // Beta + double, // Bias + size_t, // Size + std::vector, // Reduction axes + InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::SizeVector, // Input shapes + std::string // Device name +> lrnLayerTestParamsSet; + +class LrnLayerTest + : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/lstm_cell.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/lstm_cell.hpp new file mode 100644 index 00000000000..55c700a862f --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/lstm_cell.hpp @@ -0,0 +1,37 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +using LSTMCellParams = typename std::tuple< + bool, // using decompose to sub-ops transformation + size_t, // batch + size_t, // hidden size + size_t, // input size + std::vector, // activations + float, // clip + InferenceEngine::Precision, // Network precision + std::string>; // Device name + +class LSTMCellTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/lstm_sequence.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/lstm_sequence.hpp new file mode 100644 index 00000000000..c141ec070b8 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/lstm_sequence.hpp @@ -0,0 +1,43 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include +#include +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +using LSTMSequenceParams = typename std::tuple< + ngraph::helpers::SequenceTestsMode, // pure Sequence or TensorIterator + size_t, // seq_lengths + size_t, // batch + size_t, // hidden size + size_t, // input size + std::vector, // activations + float, // clip + ngraph::op::RecurrentSequenceDirection, // direction + InferenceEngine::Precision, // Network precision + std::string>; // Device name + +class LSTMSequenceTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); +protected: + void Infer() override; + void SetUp() override; + +private: + ngraph::helpers::SequenceTestsMode m_mode; + int64_t m_max_seq_len = 0; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/mat_mul.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/mat_mul.hpp new file mode 100644 index 00000000000..d9148b9165f --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/mat_mul.hpp @@ -0,0 +1,42 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { +struct ShapeRelatedParams { + std::pair input1, input2; +}; + +typedef std::tuple< + ShapeRelatedParams, + InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + ngraph::helpers::InputLayerType, // Secondary input type + LayerTestsUtils::TargetDevice, // Device name + std::map // Additional network configuration +> MatMulLayerTestParamsSet; + +class MatMulTest : public testing::WithParamInterface, virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + static std::vector combineShapes(const std::vector>& firstInputShapes, + const std::vector>& secondInputShapes, + bool transposeA, + bool transposeB); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/minimum_maximum.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/minimum_maximum.hpp new file mode 100644 index 00000000000..c3770155467 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/minimum_maximum.hpp @@ -0,0 +1,36 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// +#pragma once + +#include +#include +#include +#include +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "common_test_utils/test_constants.hpp" + +namespace LayerTestsDefinitions { + +using MaxMinParamsTuple = typename std::tuple< + std::vector>, // Input shapes + ngraph::helpers::MinMaxOpType, // OperationType + InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + ngraph::helpers::InputLayerType, // Secondary input type + std::string>; // Device name + +class MaxMinLayerTest: + public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon{ +public: + static std::string getTestCaseName(const testing::TestParamInfo& obj); +protected: + void SetUp() override; +}; +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/mvn.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/mvn.hpp new file mode 100644 index 00000000000..ad837222559 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/mvn.hpp @@ -0,0 +1,31 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + InferenceEngine::SizeVector, // Input shapes + InferenceEngine::Precision, // Input precision + bool, // Across channels + bool, // Normalize variance + double, // Epsilon + std::string> mvnParams; // Device name + +class MvnLayerTest : public testing::WithParamInterface, virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/non_max_suppression.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/non_max_suppression.hpp new file mode 100644 index 00000000000..ca7598ea71f --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/non_max_suppression.hpp @@ -0,0 +1,47 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" + +namespace LayerTestsDefinitions { + +using InputShapeParams = std::tuple; // Number of classes + +using InputPrecisions = std::tuple; // iou_threshold, score_threshold, soft_nms_sigma precisions + +using NmsParams = std::tuple; // Device name + +class NmsLayerTest : public testing::WithParamInterface, virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + void Infer() override; + void Compare(const std::vector> &expectedOutputs, const std::vector &actualOutputs) override; + +protected: + void SetUp() override; + +private: + size_t numOfSelectedBoxes; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/nonzero.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/nonzero.hpp new file mode 100644 index 00000000000..dba88a5e8f7 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/nonzero.hpp @@ -0,0 +1,37 @@ +// Copyright (C) 2020 Intel Corporation +// +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include "shared_test_classes/base/layer_test_utils.hpp" + +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +#include +#include +#include +#include + +namespace LayerTestsDefinitions { + +using ConfigMap = typename std::map; + +using NonZeroLayerTestParamsSet = typename std::tuple< + InferenceEngine::SizeVector, // Input shapes + InferenceEngine::Precision, // Input precision + LayerTestsUtils::TargetDevice, // Device name + ConfigMap>; // Additional network configuration + +class NonZeroLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/normalize_l2.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/normalize_l2.hpp new file mode 100644 index 00000000000..b7ace7b909c --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/normalize_l2.hpp @@ -0,0 +1,35 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" + +namespace LayerTestsDefinitions { + +using NormalizeL2LayerTestParams = std::tuple< + std::vector, // axes + float, // eps + ngraph::op::EpsMode, // eps_mode + InferenceEngine::SizeVector, // inputShape + InferenceEngine::Precision, // netPrecision + std::string // targetDevice +>; + +class NormalizeL2LayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions + diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/pad.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/pad.hpp new file mode 100644 index 00000000000..6f5b81892b6 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/pad.hpp @@ -0,0 +1,38 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" + +namespace LayerTestsDefinitions { +typedef std::tuple< + std::vector, // padsBegin + std::vector, // padsEnd + float, // argPadValue + ngraph::helpers::PadMode, // padMode + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::SizeVector, // Input shapes + LayerTestsUtils::TargetDevice // Target device name +> padLayerTestParamsSet; + +class PadLayerTest : public testing::WithParamInterface, + public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/pooling.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/pooling.hpp new file mode 100644 index 00000000000..85fd53e6fbd --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/pooling.hpp @@ -0,0 +1,70 @@ +// Copyright (C) 2019-2020 Intel Corporation +// +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + ngraph::helpers::PoolingTypes, // Pooling type, max or avg + std::vector, // Kernel size + std::vector, // Stride + std::vector, // Pad begin + std::vector, // Pad end + ngraph::op::RoundingType, // Rounding type + ngraph::op::PadType, // Pad type + bool // Exclude pad +> poolSpecificParams; +typedef std::tuple< + poolSpecificParams, + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + std::vector, // Input shape + std::string // Device name +> poolLayerTestParamsSet; + +typedef std::tuple< + poolSpecificParams, + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + size_t, // Channel number + std::string // Device name +> globalPoolLayerTestParamsSet; + +class PoolingLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +class GlobalPoolingLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/power.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/power.hpp new file mode 100644 index 00000000000..2394172cd30 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/power.hpp @@ -0,0 +1,34 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// +#pragma once + +#include +#include +#include +#include +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "common_test_utils/test_constants.hpp" + +namespace LayerTestsDefinitions { + + using PowerParamsTuple = typename std::tuple< + std::vector>, //input shapes + InferenceEngine::Precision, //Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + std::string, //Device name + std::vector>; //power + +class PowerLayerTest: + public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon{ +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); +protected: + void SetUp() override; +}; +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/prior_box_clustered.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/prior_box_clustered.hpp new file mode 100644 index 00000000000..ccba818a65c --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/prior_box_clustered.hpp @@ -0,0 +1,74 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include +#include +#include +#include +#include + + +#include "ie_core.hpp" +#include "ie_precision.hpp" +#include "details/ie_exception.hpp" + +#include "ngraph/opsets/opset1.hpp" + +#include "functional_test_utils/blob_utils.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "common_test_utils/common_utils.hpp" + +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "ngraph_functions/builders.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + std::vector, // widths + std::vector, // heights + bool, // clip + float, // step_width + float, // step_height + float, // offset + std::vector> priorBoxClusteredSpecificParams; + +typedef std::tuple< + priorBoxClusteredSpecificParams, + InferenceEngine::Precision, // net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + InferenceEngine::SizeVector, // input shape + InferenceEngine::SizeVector, // image shape + std::string> priorBoxClusteredLayerParams; + +class PriorBoxClusteredLayerTest + : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo& obj); + +protected: + InferenceEngine::SizeVector inputShapes; + InferenceEngine::SizeVector imageShapes; + InferenceEngine::Precision netPrecision; + std::vector widths; + std::vector heights; + std::vector variances; + float step_width; + float step_height; + float offset; + bool clip; + + std::vector> CalculateRefs() override; + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/proposal.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/proposal.hpp new file mode 100644 index 00000000000..be1f2fa29ee --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/proposal.hpp @@ -0,0 +1,67 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +namespace proposalTypes { + +typedef size_t base_size_type; +typedef size_t pre_nms_topn_type; +typedef size_t post_nms_topn_type; +typedef float nms_thresh_type; +typedef size_t min_size_type; +typedef std::vector ratio_type; +typedef std::vector scale_type; +typedef bool clip_before_nms_type; +typedef bool clip_after_nms_type; +typedef bool normalize_type; +typedef size_t feat_stride_type; +typedef float box_size_scale_type; +typedef float box_coordinate_scale_type; +typedef std::string framework_type; + +}; // namespace proposalTypes + +using namespace proposalTypes; + +typedef std::tuple< + base_size_type, + pre_nms_topn_type, + post_nms_topn_type, + nms_thresh_type, + min_size_type, + ratio_type, + scale_type, + clip_before_nms_type, + clip_after_nms_type, + framework_type> proposalSpecificParams; +typedef std::tuple< + proposalSpecificParams, + std::string> proposalLayerTestParamsSet; + +class ProposalLayerTest + : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + static std::string SerializeProposalSpecificParams(proposalSpecificParams& params); + InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; + +protected: + void SetUp() override; + void Validate() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/psroi_pooling.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/psroi_pooling.hpp new file mode 100644 index 00000000000..00b77b2835f --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/psroi_pooling.hpp @@ -0,0 +1,48 @@ +// Copyright (C) 2020 Intel Corporation +// +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { + +using psroiParams = std::tuple, // input shape + std::vector, // coords shape + size_t, // output_dim + size_t, // group_size + float, // Spatial scale + size_t, // spatial_bins_x + size_t, // spatial_bins_y + std::string, // mode + InferenceEngine::Precision, // Net precision + LayerTestsUtils::TargetDevice>; // Device name + +class PSROIPoolingLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { + public: + static std::string getTestCaseName(testing::TestParamInfo obj); + void Infer() override; + + protected: + void SetUp() override; + + private: + size_t groupSize_; + float spatialScale_; + size_t spatialBinsX_; + size_t spatialBinsY_; + std::string mode_; + }; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/range.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/range.hpp new file mode 100644 index 00000000000..54fcdd5d494 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/range.hpp @@ -0,0 +1,50 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" + +namespace LayerTestsDefinitions { +typedef std::tuple< + float, // start + float, // stop + float, // step + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + std::string // Target device name +> RangeParams; + +class RangeLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { + float start, stop, step; +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + void Infer() override; + +protected: + void SetUp() override; +}; + +class RangeNumpyLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + void Infer() override; +protected: + void SetUp() override; +private: + float start, stop, step; +}; + +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reduce_ops.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reduce_ops.hpp new file mode 100644 index 00000000000..0d228d6d190 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reduce_ops.hpp @@ -0,0 +1,45 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "common_test_utils/common_layers_params.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + std::vector, // Axis to reduce order + CommonTestUtils::OpType, // Scalar or vector type axis + bool, // Keep dims + ngraph::helpers::ReductionType, // Reduce operation type + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + std::vector, // Input shapes + std::string // Target device name +> reduceMeanParams; + +class ReduceOpsLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +class ReduceOpsLayerWithSpecificInputTest : public ReduceOpsLayerTest { +protected: + InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; +}; + +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/region_yolo.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/region_yolo.hpp new file mode 100644 index 00000000000..86b3ae8f14e --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/region_yolo.hpp @@ -0,0 +1,38 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +using regionYoloParamsTuple = std::tuple< + ngraph::Shape, // Input Shape + size_t, // classes + size_t, // coordinates + size_t, // num regions + bool, // do softmax + std::vector, // mask + int, // start axis + int, // end axis + InferenceEngine::Precision, // Network precision + std::string>; // Device name + +class RegionYoloLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reorg_yolo.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reorg_yolo.hpp new file mode 100644 index 00000000000..a242d43f673 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reorg_yolo.hpp @@ -0,0 +1,32 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +using ReorgYoloParamsTuple = typename std::tuple< + ngraph::Shape, // Input Shape + size_t, // stride + InferenceEngine::Precision, // Network precision + std::string>; // Device name + +class ReorgYoloLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reshape.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reshape.hpp new file mode 100644 index 00000000000..c17471bd18a --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reshape.hpp @@ -0,0 +1,39 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { +typedef std::tuple< + bool, // SpecialZero + InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + std::vector, // Input shapes + std::vector, // OutForm Shapes + std::string, // Device name + std::map // Config +> reshapeParams; + +class ReshapeLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reverse_sequence.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reverse_sequence.hpp new file mode 100644 index 00000000000..50b5f575446 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reverse_sequence.hpp @@ -0,0 +1,36 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +using ReverseSequenceParamsTuple = typename std::tuple< + int64_t, // Index of the batch dimension + int64_t, // Index of the sequence dimension + std::vector, // Input shapes + std::vector, // Shape of the input vector with sequence lengths to be reversed + ngraph::helpers::InputLayerType, // Secondary input type + InferenceEngine::Precision, // Network precision + std::string>; // Device name + +class ReverseSequenceLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/rnn_cell.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/rnn_cell.hpp new file mode 100644 index 00000000000..754aaf17b1a --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/rnn_cell.hpp @@ -0,0 +1,37 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +using RNNCellParams = typename std::tuple< + bool, // using decompose to sub-ops transformation + size_t, // batch + size_t, // hidden size + size_t, // input size + std::vector, // activations + float, // clip + InferenceEngine::Precision, // Network precision + std::string>; // Device name + +class RNNCellTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/rnn_sequence.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/rnn_sequence.hpp new file mode 100644 index 00000000000..3d6786c80d4 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/rnn_sequence.hpp @@ -0,0 +1,44 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include +#include +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +using RNNSequenceParams = typename std::tuple< + ngraph::helpers::SequenceTestsMode, // pure Sequence or TensorIterator + size_t, // seq_lengths + size_t, // batch + size_t, // hidden size + size_t, // input size + std::vector, // activations + float, // clip + ngraph::op::RecurrentSequenceDirection, // direction + InferenceEngine::Precision, // Network precision + std::string>; // Device name + +class RNNSequenceTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; + void Infer() override; + +private: + ngraph::helpers::SequenceTestsMode m_mode; + int64_t m_max_seq_len = 0; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/roi_pooling.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/roi_pooling.hpp new file mode 100644 index 00000000000..21163526742 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/roi_pooling.hpp @@ -0,0 +1,43 @@ +// Copyright (C) 2020 Intel Corporation +// +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { + +using roiPoolingParamsTuple = std::tuple< + InferenceEngine::SizeVector, // Input shape + InferenceEngine::SizeVector, // Coords shape + std::vector, // Pooled shape {pooled_h, pooled_w} + float, // Spatial scale + ngraph::helpers::ROIPoolingTypes, // ROIPooling method + InferenceEngine::Precision, // Net precision + LayerTestsUtils::TargetDevice>; // Device name + +class ROIPoolingLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + void Infer() override; + +protected: + void SetUp() override; + +private: + ngraph::helpers::ROIPoolingTypes pool_method; + float spatial_scale; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/scatter_ND_update.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/scatter_ND_update.hpp new file mode 100644 index 00000000000..ccc1a6e0a57 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/scatter_ND_update.hpp @@ -0,0 +1,37 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { +using sliceSelcetInShape = std::tuple< + std::vector, // input shape + std::vector, // indices shape + std::vector, // indices value + std::vector>; // update shape + +using scatterNDUpdateParamsTuple = typename std::tuple< + sliceSelcetInShape, // Input description + InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // indices precision + std::string>; // Device name + +class ScatterNDUpdateLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + static std::vector combineShapes( + const std::map, std::map, std::vector>>& inputShapes); + +protected: + void SetUp() override; +}; +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/scatter_elements_update.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/scatter_elements_update.hpp new file mode 100644 index 00000000000..ac83e22d87a --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/scatter_elements_update.hpp @@ -0,0 +1,37 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { +using axisShapeInShape = std::tuple< + std::vector, // input shape + std::vector, // update shape + int>; // axis + +using scatterElementsUpdateParamsTuple = typename std::tuple< + axisShapeInShape, // shape description + std::vector, // indices value + InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // indices precision + std::string>; // Device name + +class ScatterElementsUpdateLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + static std::vector combineShapes( + const std::map, std::map, std::vector>>& inputShapes); + +protected: + void SetUp() override; +}; +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/scatter_update.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/scatter_update.hpp new file mode 100644 index 00000000000..a1e8748ffb7 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/scatter_update.hpp @@ -0,0 +1,38 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { +using axisUpdateShapeInShape = std::tuple< + std::vector, // input shape + std::vector, // indices shape + std::vector, // update shape + int>; // axis + +using scatterUpdateParamsTuple = typename std::tuple< + axisUpdateShapeInShape, // shape description + std::vector, // indices value + InferenceEngine::Precision, // input precision + InferenceEngine::Precision, // indices precision + std::string>; // Device name + +class ScatterUpdateLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + static std::vector combineShapes( + const std::map, std::map, std::vector>>& inputShapes); + +protected: + void SetUp() override; +}; +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/select.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/select.hpp new file mode 100644 index 00000000000..a8bfe6860d3 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/select.hpp @@ -0,0 +1,29 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include + +#include "ngraph_functions/builders.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + std::vector>, // mask, then, else shapes + InferenceEngine::Precision, // then, else precision + ngraph::op::AutoBroadcastSpec, // broadcast + std::string> selectTestParams; // device name + +class SelectLayerTest : public testing::WithParamInterface, virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/shape_of.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/shape_of.hpp new file mode 100644 index 00000000000..4c7254eaf5c --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/shape_of.hpp @@ -0,0 +1,32 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { +typedef std::tuple< + InferenceEngine::Precision, // Network precision + std::vector, // Input shapes + std::string // Device name +> shapeOfParams; + +class ShapeOfLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/shuffle_channels.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/shuffle_channels.hpp new file mode 100644 index 00000000000..40a54f55b98 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/shuffle_channels.hpp @@ -0,0 +1,41 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + int, // axis + int // group +> shuffleChannelsSpecificParams; + +typedef std::tuple< + shuffleChannelsSpecificParams, + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + InferenceEngine::SizeVector, // Input shapes + LayerTestsUtils::TargetDevice // Device name +> shuffleChannelsLayerTestParamsSet; + +class ShuffleChannelsLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/softmax.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/softmax.hpp new file mode 100644 index 00000000000..9130ade310d --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/softmax.hpp @@ -0,0 +1,41 @@ +// Copyright (C) 2020 Intel Corporation +// +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +using softMaxLayerTestParams = std::tuple< + InferenceEngine::Precision, // netPrecision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + InferenceEngine::SizeVector, // inputShape + size_t, // axis + std::string, // targetDevice + std::map // config +>; + +class SoftMaxLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/space_to_batch.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/space_to_batch.hpp new file mode 100644 index 00000000000..6b7aa533e4e --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/space_to_batch.hpp @@ -0,0 +1,36 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { + +using spaceToBatchParamsTuple = typename std::tuple< + std::vector, // block_shape + std::vector, // pads_begin + std::vector, // pads_end + std::vector, // Input shapes + InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + std::string>; // Device name>; + +class SpaceToBatchLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/space_to_depth.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/space_to_depth.hpp new file mode 100644 index 00000000000..5aa80f4701b --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/space_to_depth.hpp @@ -0,0 +1,32 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { + +using spaceToDepthParamsTuple = typename std::tuple< + std::vector, // Input shape + InferenceEngine::Precision, // Input precision + ngraph::opset3::SpaceToDepth::SpaceToDepthMode, // Mode + std::size_t, // Block size + std::string>; // Device name> + +class SpaceToDepthLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/split.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/split.hpp new file mode 100644 index 00000000000..ffa62aa15d2 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/split.hpp @@ -0,0 +1,39 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + size_t, // Num splits + int64_t, // Axis + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + std::vector, // Input shapes + std::vector, // Used outputs indices + std::string // Target device name +> splitParams; + +class SplitLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/squeeze_unsqueeze.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/squeeze_unsqueeze.hpp new file mode 100644 index 00000000000..70d664c001e --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/squeeze_unsqueeze.hpp @@ -0,0 +1,37 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" + +namespace LayerTestsDefinitions { +using ShapeAxesTuple = std::pair, std::vector>; + +typedef std::tuple< + ShapeAxesTuple, // InputShape, Squeeze indexes + ngraph::helpers::SqueezeOpType, // OpType + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + std::string // Target device name +> squeezeParams; + +class SqueezeUnsqueezeLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/strided_slice.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/strided_slice.hpp new file mode 100644 index 00000000000..96104e75556 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/strided_slice.hpp @@ -0,0 +1,47 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace LayerTestsDefinitions { + +struct StridedSliceSpecificParams { + InferenceEngine::SizeVector inputShape; + std::vector begin; + std::vector end; + std::vector strides; + std::vector beginMask; + std::vector endMask; + std::vector newAxisMask; + std::vector shrinkAxisMask; + std::vector ellipsisAxisMask; +}; + +using StridedSliceParams = std::tuple< + StridedSliceSpecificParams, + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + std::string, // Device name + std::map // Additional network configuration +>; + +class StridedSliceLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/tensor_iterator.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/tensor_iterator.hpp new file mode 100644 index 00000000000..5214d26c324 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/tensor_iterator.hpp @@ -0,0 +1,41 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include +#include +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace LayerTestsDefinitions { + +using TensorIteratorParams = typename std::tuple< + bool, // using unroll tensor iterator transformation + size_t, // seq_lengths + size_t, // batch + size_t, // hidden size + // todo: fix. input size hardcoded to 10 due to limitation (10 args) of gtests Combine() func. + //size_t, // input size + size_t, // sequence axis + float, // clip + ngraph::helpers::TensorIteratorBody, // body type + ngraph::op::RecurrentSequenceDirection, // direction + InferenceEngine::Precision, // Network precision + std::string>; // Device name + +class TensorIteratorTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/tile.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/tile.hpp new file mode 100644 index 00000000000..c3b40a4b0a0 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/tile.hpp @@ -0,0 +1,38 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" + +namespace LayerTestsDefinitions { + +typedef std::vector TileSpecificParams; +typedef std::tuple< + TileSpecificParams, + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + InferenceEngine::SizeVector, // Input shapes + LayerTestsUtils::TargetDevice // Device name +> TileLayerTestParamsSet; + +class TileLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/topk.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/topk.hpp new file mode 100644 index 00000000000..5184c77f216 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/topk.hpp @@ -0,0 +1,36 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" + +namespace LayerTestsDefinitions { +typedef std::tuple< + int64_t, // keepK + int64_t, // axis + ngraph::opset4::TopK::Mode, // mode + ngraph::opset4::TopK::SortType, // sort + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::SizeVector, // inputShape + std::string // Target device name +> TopKParams; + +class TopKLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/transpose.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/transpose.hpp new file mode 100644 index 00000000000..975cbb6e29a --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/transpose.hpp @@ -0,0 +1,37 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + std::vector, // Input order + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + std::vector, // Input shapes + std::string // Target device name +> transposeParams; + +class TransposeLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/variadic_split.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/variadic_split.hpp new file mode 100644 index 00000000000..e6864298ba3 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/variadic_split.hpp @@ -0,0 +1,38 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" + +namespace LayerTestsDefinitions { + +typedef std::tuple< + std::vector, // Num splits + size_t, // Axis + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + std::vector, // Input shapes + std::string // Target device name +> VariadicSplitParams; + +class VariadicSplitLayerTest : public testing::WithParamInterface, + public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/activation_concats_eltwise.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/activation_concats_eltwise.hpp new file mode 100644 index 00000000000..4c81564f38b --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/activation_concats_eltwise.hpp @@ -0,0 +1,31 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace SubgraphTestsDefinitions { + +using ActivationConcatsEltwiseParamsTuple = typename std::tuple< + size_t, // input size + size_t, // concat const size + InferenceEngine::Precision, // precision + std::string, // device name + std::map // configuration +>; + + +class ActivationConcatsEltwise : public testing::WithParamInterface, + public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/basic_lstm.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/basic_lstm.hpp new file mode 100644 index 00000000000..f19c942d64c --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/basic_lstm.hpp @@ -0,0 +1,43 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + InferenceEngine::Precision, // Network Precision + std::string, // Target Device + std::map // Configuration +> basicLstmParams; + +class Basic_LSTM_S : public testing::WithParamInterface, + public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + + void Run() override; + static std::shared_ptr GetNetwork(size_t thirdDimOut, + size_t hiddenSize, + const InferenceEngine::Precision& netPrecission = InferenceEngine::Precision::FP32, + std::vector* hidden_memory_init_out = nullptr, + std::vector* cell_memory_init_out = nullptr); +protected: + size_t hidden_size; + std::vector hidden_memory_init; + std::vector cell_memory_init; + void SetUp() override; + std::vector> CalculateRefs() override; +}; + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/broadcast_power.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/broadcast_power.hpp new file mode 100644 index 00000000000..80bc5cd234b --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/broadcast_power.hpp @@ -0,0 +1,33 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "ngraph_functions/builders.hpp" + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + std::vector>, // Input shapes + InferenceEngine::Precision, // Network Precision + std::string, // Target Device + std::map //Configuration +> BroadCastPowerTuple; + +class BroadcastPowerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/cascade_concat.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/cascade_concat.hpp new file mode 100644 index 00000000000..0e1ad9a8e29 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/cascade_concat.hpp @@ -0,0 +1,31 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +#pragma once + +#include +#include +#include +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + std::vector>, //input shapes 1 + std::vector>, //input shapes 2 + std::vector>, //input shapes 3 + InferenceEngine::Precision, //Network precision + bool, //Multioutput -> True, Single out ->false + std::string, //Device name + std::map//config + > CascadeConcatTuple; + +class CascadeConcat + : public testing::WithParamInterface, + public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); +protected: + void SetUp() override; +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/concat_multi_input.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/concat_multi_input.hpp new file mode 100644 index 00000000000..b15e8eac8d4 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/concat_multi_input.hpp @@ -0,0 +1,41 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "ngraph_functions/builders.hpp" + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + std::vector>, // Input shapes + InferenceEngine::Precision, // Network Precision + std::string, // Target Device + std::map // Config +> concatMultiParams; + +class ConcatMultiInput : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +private: + std::vector paramSize; + ngraph::element::Type ngPrc; + std::vector> inputShapes; + +public: + void GenerateStridedSliceModel(); + void GenerateConstOnlyModel(); + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/concat_quantization.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/concat_quantization.hpp new file mode 100644 index 00000000000..d69feed8f15 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/concat_quantization.hpp @@ -0,0 +1,33 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "ngraph_functions/builders.hpp" + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + InferenceEngine::Precision, // Network Precision + std::string, // Target Device + std::map //Configuration +> concatQuantizationParams; + +class ConcatQuantization : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/constant_result.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/constant_result.hpp new file mode 100644 index 00000000000..008b8fcb8a8 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/constant_result.hpp @@ -0,0 +1,29 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + std::string // Device name +> constResultParams; + +class ConstantResultSubgraphTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); +protected: + void SetUp() override; +}; +} // namespace SubgraphTestsDefinitions + diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/conv_eltwise_fusion.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/conv_eltwise_fusion.hpp new file mode 100644 index 00000000000..7d033de8d0d --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/conv_eltwise_fusion.hpp @@ -0,0 +1,37 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +#pragma once + +#include +#include +#include +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include +#include + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + ngraph::NodeTypeInfo, // Convolution type + std::tuple< + ngraph::NodeTypeInfo, // Eltwise type + int64_t // Expected number of ops + >, + ngraph::Shape, // Input shape + ngraph::Shape, // Weights shape + ngraph::Shape, // Const shape + ngraph::element::Type, // Network precision + std::string // Device name + > ConvEltwiseFusionParams; + +class ConvEltwiseFusion + : public testing::WithParamInterface, + public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/convert_pad_to_group_conv.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/convert_pad_to_group_conv.hpp new file mode 100644 index 00000000000..9bcd3ee825d --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/convert_pad_to_group_conv.hpp @@ -0,0 +1,33 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +#pragma once + +#include +#include +#include +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include +#include + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + ngraph::Shape, // input shape + std::vector, // pad_begin + std::vector, // pad_end + float, // pad_value + ngraph::op::PadMode, // pad_mode + std::string // Device name + > PadParams; + +class ConvertPadToConvTests + : public testing::WithParamInterface, + public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/delayed_copy_layer.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/delayed_copy_layer.hpp new file mode 100644 index 00000000000..97404963187 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/delayed_copy_layer.hpp @@ -0,0 +1,33 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "ngraph_functions/builders.hpp" + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + InferenceEngine::Precision, //Network precision + std::string, //Device name + std::map //Configuration +> ConcatSplitReluTuple; + +class DelayedCopyTest + : public testing::WithParamInterface, + public LayerTestsUtils::LayerTestsCommon { +private: + void switchToNgraphFriendlyModel(); +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); +protected: + void SetUp() override; + void Run() override; +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/first_connect_input_concat.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/first_connect_input_concat.hpp new file mode 100644 index 00000000000..ef99ed1c8b2 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/first_connect_input_concat.hpp @@ -0,0 +1,34 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include +#include + + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + std::vector>, // Input shapes + InferenceEngine::Precision, // Network Precision + std::string, // Target Device + std::map // Config +> concatFirstInputParams; + +class ConcatFirstInputTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/get_output_before_activation.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/get_output_before_activation.hpp new file mode 100644 index 00000000000..d7b83970c12 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/get_output_before_activation.hpp @@ -0,0 +1,34 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +#pragma once + +#include "common_test_utils/test_common.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" +#include + +namespace SubgraphTestsDefinitions { +enum class midOutputType { + Sum, + Sub, + Mul, +}; + +typedef std::tuple< + std::string, // Target device name + InferenceEngine::Precision, // Network precision + size_t, // Input size + midOutputType, // Type of layer that will be an output + std::map // Configuration +> outputBeforeActivationParams; + +std::ostream& operator<< (std::ostream& os, const midOutputType& oType); + +class OutputBeforeActivation : public LayerTestsUtils::LayerTestsCommon, + public testing::WithParamInterface { +protected: + void SetUp() override; +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/handling_orientation_conv.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/handling_orientation_conv.hpp new file mode 100644 index 00000000000..50ee3ba5579 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/handling_orientation_conv.hpp @@ -0,0 +1,31 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "ngraph_functions/builders.hpp" + +namespace SubgraphTestsDefinitions { +typedef std::tuple< + InferenceEngine::Precision, //Network precision + std::string, //Device name + std::map //Configuration +> HandlingOrientationParams; + +class HandlingOrientationClass : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/input_conv.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/input_conv.hpp new file mode 100644 index 00000000000..d6b412917f4 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/input_conv.hpp @@ -0,0 +1,43 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + std::vector, // Input Shapes + std::vector, // Kernel Shape + size_t // Stride +> convParams; + +typedef std::tuple< + InferenceEngine::Precision, // Network Precision + std::string, // Target Device + std::map, // Configuration + convParams, // Convolution Params + size_t, // Output Channels + bool // If Add Reshape at the end of the model to reshape to 2D +> inputConvParams; + +class InputConvTest : public testing::WithParamInterface, + public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; + +protected: + void SetUp() override; +}; + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/matmul_squeeze_add.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/matmul_squeeze_add.hpp new file mode 100644 index 00000000000..220ed4e16ba --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/matmul_squeeze_add.hpp @@ -0,0 +1,35 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + InferenceEngine::Precision, // Network Precision + std::string, // Target Device + std::map, // Configuration + std::vector, // Input Shapes + size_t // Output Size +> matmulSqueezeAddParams; + +class MatmulSqueezeAddTest : public testing::WithParamInterface, + public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/memory_LSTMCell.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/memory_LSTMCell.hpp new file mode 100644 index 00000000000..13d068284a9 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/memory_LSTMCell.hpp @@ -0,0 +1,39 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +#pragma once + +#include "common_test_utils/test_common.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" +#include + +namespace SubgraphTestsDefinitions { +typedef std::tuple< + std::string, // Target device name + InferenceEngine::Precision, // Network precision + size_t, // Input size + size_t, // Hidden size + std::map // Configuration +> memoryLSTMCellParams; + +class MemoryLSTMCellTest : public LayerTestsUtils::LayerTestsCommon, + public testing::WithParamInterface { +private: + // you have to Unroll TI manually and remove memory untill ngraph supports it + void switchToNgraphFriendlyModel(); + void CreatePureTensorIteratorModel(); + // since we switching models we need to generate and save weights biases and inputs in SetUp + std::vector input_bias; + std::vector input_weights; + std::vector hidden_memory_init; + std::vector cell_memory_init; + std::vector weights_vals; + std::vector reccurrenceWeights_vals; + std::vector bias_vals; +protected: + void SetUp() override; + void Run() override; + void RunLowLatency(bool regular_api = false); +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/memory_eltwise_reshape_concat.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/memory_eltwise_reshape_concat.hpp new file mode 100644 index 00000000000..6862cd38e15 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/memory_eltwise_reshape_concat.hpp @@ -0,0 +1,37 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +#pragma once + +#include "common_test_utils/test_common.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" +#include + +namespace SubgraphTestsDefinitions { +typedef std::tuple< + std::string, // Target device name + InferenceEngine::Precision, // Network precision + size_t, // Mutiples of concat size to be used as input size + size_t, // Concat size + std::map // Configuration +> memoryEltwiseReshapeConcatParams; + +class MemoryEltwiseReshapeConcatTest : public LayerTestsUtils::LayerTestsCommon, + public testing::WithParamInterface { +private: + void initTestModel(); + // you have to replace memory layers since ngraph does not support them + void initNgraphFriendlyModel(); + + // since we switching models we need to generate and save these values in SetUp + size_t inputSize; + size_t concatSize; + ngraph::element::Type ngPrc; + std::vector memory_init; + std::vector concat_vals; +protected: + void SetUp() override; + void Run() override; +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multioutput_eltwise_squeeze_eltwise.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multioutput_eltwise_squeeze_eltwise.hpp new file mode 100644 index 00000000000..8997fbf058c --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multioutput_eltwise_squeeze_eltwise.hpp @@ -0,0 +1,30 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +#pragma once + +#include +#include +#include +#include +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + std::vector>, //input shapes + InferenceEngine::Precision, //Network precision + std::string, //Device name + std::map //Configuration +> MultioutputEltwiseReshapeEltwiseTuple; + +class MultioutputEltwiseReshapeEltwise + : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); +protected: + void SetUp() override; +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiple_LSTMCell.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiple_LSTMCell.hpp new file mode 100644 index 00000000000..26cda14d03d --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiple_LSTMCell.hpp @@ -0,0 +1,41 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +#pragma once + +#include "common_test_utils/test_common.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" +#include + +namespace SubgraphTestsDefinitions { +typedef std::tuple< + std::string, // Target device name + InferenceEngine::Precision, // Network precision + size_t, // Input size + size_t, // Hidden size + std::map // Configuration +> multipleLSTMCellParams; + +class MultipleLSTMCellTest : public LayerTestsUtils::LayerTestsCommon, + public testing::WithParamInterface { +private: + // you have to Unroll TI manually and remove memory untill ngraph supports it + void switchToNgraphFriendlyModel(); + void CreatePureTensorIteratorModel(); + // since we switching models we need to generate and save weights biases and inputs in SetUp + size_t hiddenSize; + std::vector input_bias; + std::vector input_weights; + std::vector hidden_memory_init; + std::vector cell_memory_init; + std::vector weights_vals; + std::vector weights_2_vals; + std::vector reccurrenceWeights_vals; + std::vector bias_vals; +protected: + void SetUp() override; + void Run() override; + void RunLowLatency(bool regular_api = false); +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiple_concat.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiple_concat.hpp new file mode 100644 index 00000000000..09ef8286e3c --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiple_concat.hpp @@ -0,0 +1,25 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +#pragma once + +#include "common_test_utils/test_common.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" +#include + +namespace SubgraphTestsDefinitions { +typedef std::tuple< + std::string, // Target device name + InferenceEngine::Precision, // Network precision + size_t, // Input size + size_t, // Const size + std::map // Configuration +> multipleConcatParams; + +class MultipleConcatTest : public LayerTestsUtils::LayerTestsCommon, + public testing::WithParamInterface { +protected: + void SetUp() override; +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiply_add.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiply_add.hpp new file mode 100644 index 00000000000..2d6302d5b74 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiply_add.hpp @@ -0,0 +1,32 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// +#pragma once + +#include +#include +#include +#include +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "common_test_utils/test_constants.hpp" + +namespace SubgraphTestsDefinitions { + +using MultiplyAddParamsTuple = typename std::tuple< + std::vector, //input shapes + InferenceEngine::Precision, //Network precision + std::string>; //Device name + +class MultiplyAddLayerTest: + public testing::WithParamInterface, + public LayerTestsUtils::LayerTestsCommon{ +public: + std::shared_ptr fn; + static std::string getTestCaseName(const testing::TestParamInfo &obj); +protected: + void SetUp() override; +}; + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/negative_memory_layer_offset.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/negative_memory_layer_offset.hpp new file mode 100644 index 00000000000..a76b9ded6ef --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/negative_memory_layer_offset.hpp @@ -0,0 +1,36 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "ngraph_functions/builders.hpp" + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + InferenceEngine::Precision, //Network precision + std::string, //Device name + size_t, //Input size + size_t, //Hidden size + std::map //Configuration +> NegativeMemoryLayerOffsetTuple; + +class NegativeMemoryOffsetTest + : public testing::WithParamInterface, + public LayerTestsUtils::LayerTestsCommon { +private: + void switchToNgraphFriendlyModel(); + std::vector memory_init; +public: + static std::string getTestCaseName(const testing::TestParamInfo& obj); +protected: + void SetUp() override; + void Run() override; +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/perm_conv_perm_concat.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/perm_conv_perm_concat.hpp new file mode 100644 index 00000000000..7afc7babf37 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/perm_conv_perm_concat.hpp @@ -0,0 +1,36 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "ngraph_functions/builders.hpp" + +namespace SubgraphTestsDefinitions { +typedef std::tuple< + InferenceEngine::Precision, // Network Precision + std::string, // Target Device + std::array, // Input shape + std::array, // Kernel shape + size_t, // Output channels + std::map // Configuration +> PermConvPermConcatParams; + +class PermConvPermConcat : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; + void Run() override; +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_convolution_backprop_data.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_convolution_backprop_data.hpp new file mode 100644 index 00000000000..3f597392424 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_convolution_backprop_data.hpp @@ -0,0 +1,43 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + InferenceEngine::SizeVector, + InferenceEngine::SizeVector, + std::vector, + std::vector, + InferenceEngine::SizeVector, + size_t, + ngraph::op::PadType, + size_t, + ngraph::helpers::QuantizationGranularity> quantConvBackpropDataSpecificParams; +typedef std::tuple< + quantConvBackpropDataSpecificParams, + InferenceEngine::Precision, + InferenceEngine::SizeVector, + LayerTestsUtils::TargetDevice> quantConvBackpropDataLayerTestParamsSet; + +class QuantConvBackpropDataLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace SubgraphTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_group_convolution.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_group_convolution.hpp new file mode 100644 index 00000000000..a4c446b135e --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_group_convolution.hpp @@ -0,0 +1,44 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + InferenceEngine::SizeVector, + InferenceEngine::SizeVector, + std::vector, + std::vector, + InferenceEngine::SizeVector, + size_t, + size_t, + size_t, + ngraph::helpers::QuantizationGranularity, + bool> quantGroupConvSpecificParams; +typedef std::tuple< + quantGroupConvSpecificParams, + InferenceEngine::Precision, + InferenceEngine::SizeVector, + LayerTestsUtils::TargetDevice> quantGroupConvLayerTestParamsSet; + +class QuantGroupConvLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace SubgraphTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_group_convolution_backprop_data.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_group_convolution_backprop_data.hpp new file mode 100644 index 00000000000..36d98ec98bf --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_group_convolution_backprop_data.hpp @@ -0,0 +1,44 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + InferenceEngine::SizeVector, + InferenceEngine::SizeVector, + std::vector, + std::vector, + InferenceEngine::SizeVector, + size_t, + size_t, + ngraph::op::PadType, + size_t, + ngraph::helpers::QuantizationGranularity> quantGroupConvBackpropDataSpecificParams; +typedef std::tuple< + quantGroupConvBackpropDataSpecificParams, + InferenceEngine::Precision, + InferenceEngine::SizeVector, + LayerTestsUtils::TargetDevice> quantGroupConvBackpropDataLayerTestParamsSet; + +class QuantGroupConvBackpropDataLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace SubgraphTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_mat_mul.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_mat_mul.hpp new file mode 100644 index 00000000000..a9bc3e11dc9 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_mat_mul.hpp @@ -0,0 +1,36 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + size_t, + ngraph::helpers::QuantizationGranularity, + InferenceEngine::Precision> QuantParams; + +typedef std::tuple< + QuantParams, + InferenceEngine::Precision, + InferenceEngine::SizeVector, + InferenceEngine::SizeVector, + LayerTestsUtils::TargetDevice> QuantMatMulLayerTestParamsSet; + +class QuantMatMulTest : public testing::WithParamInterface, virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/range_add.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/range_add.hpp new file mode 100644 index 00000000000..903ef8de87a --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/range_add.hpp @@ -0,0 +1,39 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" + +#include "shared_test_classes/single_layer/range.hpp" + +namespace SubgraphTestsDefinitions { + +// ------------------------------ V0 ------------------------------ + +class RangeAddSubgraphTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); +protected: + void SetUp() override; +}; + +// ------------------------------ V4 ------------------------------ + +class RangeNumpyAddSubgraphTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); +protected: + void SetUp() override; +}; + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/relu_shape_of.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/relu_shape_of.hpp new file mode 100644 index 00000000000..6ecad136a0f --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/relu_shape_of.hpp @@ -0,0 +1,26 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/shape_of.hpp" + +#include "ngraph_functions/builders.hpp" + +namespace SubgraphTestsDefinitions { + +class ReluShapeOfSubgraphTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); +protected: + void SetUp() override; +}; +} // namespace SubgraphTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/reshape_permute_conv_permute_reshape_act.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/reshape_permute_conv_permute_reshape_act.hpp new file mode 100644 index 00000000000..42d79fa72c0 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/reshape_permute_conv_permute_reshape_act.hpp @@ -0,0 +1,37 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "ngraph_functions/builders.hpp" + +namespace SubgraphTestsDefinitions { + typedef std::tuple< + InferenceEngine::Precision, // Network Precision + std::string, // Target Device + std::array, // Input shape + std::array, // Kernel shape + size_t, // Output channels + std::map // Configuration + > ConvReshapeActParams; + +class ConvReshapeAct : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; + void Run() override; +}; + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/reshape_permute_reshape.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/reshape_permute_reshape.hpp new file mode 100644 index 00000000000..732c752bf8f --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/reshape_permute_reshape.hpp @@ -0,0 +1,30 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "ngraph_functions/builders.hpp" + +namespace SubgraphTestsDefinitions { +typedef std::tuple< + std::vector>, //input shapes and permute shapes + InferenceEngine::Precision, //Network precision + std::string //Device name + > ReshapePermuteReshapeTuple; + +class ReshapePermuteReshape : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); + +protected: + void SetUp() override; +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/reshape_squeeze_reshape_relu.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/reshape_squeeze_reshape_relu.hpp new file mode 100644 index 00000000000..13fc56e08b7 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/reshape_squeeze_reshape_relu.hpp @@ -0,0 +1,31 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +#pragma once + +#include +#include +#include +#include +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace SubgraphTestsDefinitions { +using ShapeAxesTuple = std::pair, std::vector>; + +using ReshapeSqueezeReshapeReluTuple = typename std::tuple< + ShapeAxesTuple, // Input shapes & squeeze_indices + InferenceEngine::Precision, // Network precision + std::string, // Device name + ngraph::helpers::SqueezeOpType // SqueezeOpType +>; + +class ReshapeSqueezeReshapeRelu + : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); +protected: + void SetUp() override; +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/scaleshift.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/scaleshift.hpp new file mode 100644 index 00000000000..5510cc99aeb --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/scaleshift.hpp @@ -0,0 +1,30 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// +#pragma once + +#include +#include +#include +#include +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "common_test_utils/test_constants.hpp" + +namespace SubgraphTestsDefinitions { + +using ScaleShiftParamsTuple = typename std::tuple< + std::vector>, //input shapes + InferenceEngine::Precision, //Network precision + std::string, //Device name + std::vector, //scale + std::vector>; //shift + +class ScaleShiftLayerTest: + public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon{ +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); +protected: + void SetUp() override; +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/softsign.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/softsign.hpp new file mode 100644 index 00000000000..37913b6f9cc --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/softsign.hpp @@ -0,0 +1,39 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + InferenceEngine::Precision, // Network Precision + std::string, // Target Device + std::map, // Configuration + std::vector // Input Shapes +> softsignParams; + +class SoftsignTest : public testing::WithParamInterface, + public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + + void Run() override; + +protected: + void SetUp() override; + +private: + std::shared_ptr GenerateNgraphFriendlySoftSign(); +}; + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_concat_memory.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_concat_memory.hpp new file mode 100644 index 00000000000..6ca5b0b7e82 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_concat_memory.hpp @@ -0,0 +1,32 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" + +namespace SubgraphTestsDefinitions { + +using SplitConcatMemoryParamsTuple = typename std::tuple< + std::vector, // input shapes + InferenceEngine::Precision, // precision + int, // axis of split + std::string // device name +>; + + +class SplitConcatMemory : public testing::WithParamInterface, + public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; + + int axis; +}; + +} // namespace SubgraphTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_conv_concat.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_conv_concat.hpp new file mode 100644 index 00000000000..b938bd80ff8 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_conv_concat.hpp @@ -0,0 +1,27 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "ngraph_functions/builders.hpp" + +namespace SubgraphTestsDefinitions { + +class SplitConvConcat : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; +}; + +} // namespace SubgraphTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_relu.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_relu.hpp new file mode 100644 index 00000000000..4335af5cf0f --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_relu.hpp @@ -0,0 +1,33 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// +#pragma once + +#include +#include +#include +#include +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "common_test_utils/test_constants.hpp" + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + std::vector>, //input shapes + std::vector, //index connected layer + InferenceEngine::Precision, //Network precision + std::string, //Device name + std::map //Configuration +> SplitReluTuple; + + +class SplitRelu: + public testing::WithParamInterface, + public LayerTestsUtils::LayerTestsCommon{ +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); +protected: + void SetUp() override; +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_trivial_permute_concat.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_trivial_permute_concat.hpp new file mode 100644 index 00000000000..7068574f1f7 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_trivial_permute_concat.hpp @@ -0,0 +1,33 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "ngraph_functions/builders.hpp" + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + InferenceEngine::Precision, //Network precision + std::string, //Device name + std::vector, //Input sizes + size_t, //Split axis + size_t, //Concat axis + std::map //Configuration +> SplitTrivialPermuteConcatTuple; + +class SplitTrivialPermuteConcatTest + : public testing::WithParamInterface, + public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo& obj); +protected: + void SetUp() override; +}; +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/trivial_concat.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/trivial_concat.hpp new file mode 100644 index 00000000000..849696fcf65 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/trivial_concat.hpp @@ -0,0 +1,32 @@ +// Copyright (C) 2019 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace SubgraphTestsDefinitions { +using trivialConcatParamsTuple = typename std::tuple< + std::vector, // Inputs shape + InferenceEngine::Precision, // Network precision + std::string, // Device name + std::map // Configuration +>; + +class TrivialConcatLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo &obj); +protected: + void SetUp() override; +}; + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/two_fake_quantize_to_fullyconnected.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/two_fake_quantize_to_fullyconnected.hpp new file mode 100644 index 00000000000..496192556a6 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/two_fake_quantize_to_fullyconnected.hpp @@ -0,0 +1,53 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include + +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" + +namespace SubgraphTestsDefinitions { + +typedef std::tuple< + std::vector, // levels + std::vector>, // const inputs shape + std::vector, // fake quantize inputLow, inputHigh, outputLow, outputHigh or empty for random + std::vector // input generator data: low, high, resolution +> fqSpecificParams; +typedef std::tuple< + fqSpecificParams, + InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + InferenceEngine::SizeVector, // Input shapes + LayerTestsUtils::TargetDevice, // Device name + std::pair>, // Additional backend configuration and alis name to it + bool +> fqSubgraphTestParamsSet; + +class FakeQuantizeSubgraphTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(testing::TestParamInfo obj); + +protected: + void SetUp() override; + InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; + +protected: + float inputDataMin = 0.0; + float inputDataMax = 10.0; + float inputDataResolution = 1.0; + int32_t seed = 1; +}; + +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/layer_test_utils.cpp b/inference-engine/tests/functional/shared_test_classes/src/base/layer_test_utils.cpp similarity index 92% rename from inference-engine/tests/ie_test_utils/functional_test_utils/layer_test_utils.cpp rename to inference-engine/tests/functional/shared_test_classes/src/base/layer_test_utils.cpp index 8ffa0669533..f90d6ad065f 100644 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/layer_test_utils.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/base/layer_test_utils.cpp @@ -3,14 +3,16 @@ // #include +#include #include #include #include #include +#include #include "ngraph/variant.hpp" -#include "layer_test_utils.hpp" -#include "plugin_config.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "functional_test_utils/core_config.hpp" namespace LayerTestsUtils { @@ -190,6 +192,31 @@ void LayerTestsCommon::Run() { } } +void LayerTestsCommon::Serialize() { + SKIP_IF_CURRENT_TEST_IS_DISABLED(); + + std::string output_name = GetTestName() + "_" + GetTimestamp(); + + std::string out_xml_path = output_name + ".xml"; + std::string out_bin_path = output_name + ".bin"; + + ngraph::pass::Manager manager; + manager.register_pass(out_xml_path, out_bin_path); + manager.run_passes(function); + + InferenceEngine::Core ie; + auto result = ie.ReadNetwork(out_xml_path, out_bin_path); + + bool success; + std::string message; + std::tie(success, message) = + compare_functions(result.getFunction(), function); + + EXPECT_TRUE(success) << message; + + CommonTestUtils::removeIRFiles(out_xml_path, out_bin_path); +} + InferenceEngine::Blob::Ptr LayerTestsCommon::GenerateInput(const InferenceEngine::InputInfo &info) const { return FuncTestUtils::createAndFillBlob(info.getTensorDesc()); } @@ -296,7 +323,7 @@ void LayerTestsCommon::ConfigureNetwork() { void LayerTestsCommon::LoadNetwork() { cnnNetwork = InferenceEngine::CNNNetwork{function}; - PreparePluginConfiguration(this); + CoreConfiguration(this); ConfigureNetwork(); executableNetwork = core->LoadNetwork(cnnNetwork, targetDevice, configuration); } @@ -445,4 +472,19 @@ std::shared_ptr LayerTestsCommon::GetFunction() { std::map &LayerTestsCommon::GetConfiguration() { return configuration; } + +std::string LayerTestsCommon::GetTimestamp() { + auto now = std::chrono::system_clock::now(); + auto epoch = now.time_since_epoch(); + auto ns = std::chrono::duration_cast(epoch); + return std::to_string(ns.count()); +} + +const std::string LayerTestsCommon::GetTestName() { + std::string test_name = + ::testing::UnitTest::GetInstance()->current_test_info()->name(); + std::replace_if(test_name.begin(), test_name.end(), + [](char c) { return !std::isalnum(c); }, '_'); + return test_name; +} } // namespace LayerTestsUtils diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/low_precision_transformations/layer_transformation.cpp b/inference-engine/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp similarity index 91% rename from inference-engine/tests/ie_test_utils/functional_test_utils/low_precision_transformations/layer_transformation.cpp rename to inference-engine/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp index cb79063f6a2..932c7085913 100644 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/low_precision_transformations/layer_transformation.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp @@ -2,21 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "layer_transformation.hpp" +#include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" -#include -#include #include #include -#include #include -#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp" -#include - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" #include "functional_test_utils/blob_utils.hpp" #include "ngraph_functions/pass/convert_prc.hpp" diff --git a/inference-engine/tests/functional/shared_test_classes/src/precomp.hpp b/inference-engine/tests/functional/shared_test_classes/src/precomp.hpp new file mode 100644 index 00000000000..b9d5fc69556 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/src/precomp.hpp @@ -0,0 +1,36 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include + +#include +#include +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/subgraph_builders.hpp" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/activation.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/activation.cpp similarity index 95% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/activation.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/activation.cpp index ed115aed9e6..a2a320f9f22 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/activation.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/activation.cpp @@ -3,19 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "ie_core.hpp" -#include "ie_precision.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/activation.hpp" +#include "shared_test_classes/single_layer/activation.hpp" namespace LayerTestsDefinitions { @@ -187,8 +175,7 @@ void ActivationParamLayerTest::generateActivationBlob(std::vector constan auto blobHardSigmoidLambda = inferRequest.GetBlob("lambda"); float alpha = constantsValue[0], lambda = constantsValue[1]; blobHardSigmoidAlpha = FuncTestUtils::createAndFillBlobWithFloatArray(blobHardSigmoidAlpha->getTensorDesc(), &alpha, 1); - blobHardSigmoidLambda = FuncTestUtils::createAndFillBlobWithFloatArray(blobHardSigmoidLambda->getTensorDesc(), &lambda, - 1); + blobHardSigmoidLambda = FuncTestUtils::createAndFillBlobWithFloatArray(blobHardSigmoidLambda->getTensorDesc(), &lambda, 1); } default: THROW_IE_EXCEPTION << "Unsupported activation type for Params test type"; @@ -206,7 +193,6 @@ void ActivationParamLayerTest::Infer() { inferRequest.Infer(); } - void ActivationParamLayerTest::SetUp() { InferenceEngine::Precision netPrecision; std::pair, std::vector> shapes; @@ -225,13 +211,4 @@ void ActivationParamLayerTest::SetUp() { auto activation = ngraph::builder::makeActivation(params, ngPrc, activationType); function = std::make_shared(ngraph::NodeVector{activation}, params); } - -TEST_P(ActivationLayerTest, CompareWithRefs) { - Run(); -} - -TEST_P(ActivationParamLayerTest, CompareWithRefs) { - Run(); -} - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/batch_norm.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/batch_norm.cpp similarity index 95% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/batch_norm.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/batch_norm.cpp index 58d9bcaa519..8ccbe96faac 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/batch_norm.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/batch_norm.cpp @@ -2,8 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "single_layer_tests/batch_norm.hpp" - +#include "shared_test_classes/single_layer/batch_norm.hpp" namespace LayerTestsDefinitions { std::string BatchNormLayerTest::getTestCaseName(const testing::TestParamInfo& obj) { @@ -47,8 +46,4 @@ void BatchNormLayerTest::SetUp() { function = std::make_shared(results, params, "BatchNormInference"); } -TEST_P(BatchNormLayerTest, CompareWithRefs) { - Run(); -} - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/batch_to_space.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/batch_to_space.cpp similarity index 82% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/batch_to_space.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/batch_to_space.cpp index b6748e98d65..5aa8f6c0ddf 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/batch_to_space.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/batch_to_space.cpp @@ -2,21 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "common_test_utils/common_utils.hpp" - -#include "single_layer_tests/batch_to_space.hpp" +#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/batch_to_space.hpp" namespace LayerTestsDefinitions { @@ -56,8 +43,4 @@ void BatchToSpaceLayerTest::SetUp() { function = std::make_shared(results, params, "BatchToSpace"); } -TEST_P(BatchToSpaceLayerTest, CompareWithRefs) { - Run(); -}; - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/broadcast.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/broadcast.cpp similarity index 93% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/broadcast.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/broadcast.cpp index e42a8f00938..b9aba40f0bd 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/broadcast.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/broadcast.cpp @@ -2,8 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "single_layer_tests/broadcast.hpp" - +#include "shared_test_classes/single_layer/broadcast.hpp" namespace LayerTestsDefinitions { std::string BroadcastLayerTest::getTestCaseName(const testing::TestParamInfo& obj) { @@ -42,8 +41,4 @@ void BroadcastLayerTest::SetUp() { function = std::make_shared(results, params, "BroadcastInference"); } -TEST_P(BroadcastLayerTest, CompareWithRefs) { - Run(); -} - -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/comparison.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/comparison.cpp similarity index 91% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/comparison.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/comparison.cpp index 51c78e53972..4ccee588367 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/comparison.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/comparison.cpp @@ -3,15 +3,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include - -#include - -#include "functional_test_utils/layer_test_utils.hpp" #include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -#include "single_layer_tests/comparison.hpp" +#include "shared_test_classes/single_layer/comparison.hpp" using namespace LayerTestsDefinitions::ComparisonParams; @@ -84,9 +77,4 @@ void ComparisonLayerTest::SetUp() { auto comparisonNode = ngraph::builder::makeComparison(inputs[0], secondInput, comparisonOpType); function = std::make_shared(comparisonNode, inputs, "Comparison"); } - - -TEST_P(ComparisonLayerTest, ComparisonTests) { - Run(); -} -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/concat.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/concat.cpp similarity index 77% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/concat.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/concat.cpp index 073f8eed5b6..af5bfa39d25 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/concat.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/concat.cpp @@ -2,21 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/skip_tests_config.hpp" - -#include "single_layer_tests/concat.hpp" +#include "shared_test_classes/single_layer/concat.hpp" namespace LayerTestsDefinitions { @@ -53,9 +39,4 @@ void ConcatLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(concat)}; function = std::make_shared(results, params, "concat"); } - - -TEST_P(ConcatLayerTest, CompareWithRefs) { - Run(); -}; -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convert.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/convert.cpp similarity index 81% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convert.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/convert.cpp index d45f2a20274..6c5ae263ae4 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convert.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/convert.cpp @@ -2,16 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" - -#include "single_layer_tests/convert.hpp" +#include "shared_test_classes/single_layer/convert.hpp" namespace LayerTestsDefinitions { @@ -42,8 +33,4 @@ void ConvertLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(convert)}; function = std::make_shared(results, params, "Convert"); } - -TEST_P(ConvertLayerTest, CompareWithRefs) { - Run(); -}; } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convert_like.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/convert_like.cpp similarity index 83% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convert_like.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/convert_like.cpp index cf11f2be059..9f62289fc4e 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convert_like.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/convert_like.cpp @@ -2,16 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" - -#include "single_layer_tests/convert_like.hpp" +#include "shared_test_classes/single_layer/convert_like.hpp" namespace LayerTestsDefinitions { @@ -44,8 +35,4 @@ void ConvertLikeLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(convertLike)}; function = std::make_shared(results, params, "ConvertLike"); } - -TEST_P(ConvertLikeLayerTest, CompareWithRefs) { - Run(); -}; } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convolution.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/convolution.cpp similarity index 86% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convolution.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/convolution.cpp index 9e02aeaae3a..b4cff7443a5 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convolution.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/convolution.cpp @@ -2,21 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/convolution.hpp" +#include "shared_test_classes/single_layer/convolution.hpp" namespace LayerTestsDefinitions { @@ -74,8 +60,4 @@ void ConvolutionLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(conv)}; function = std::make_shared(results, params, "convolution"); } - -TEST_P(ConvolutionLayerTest, CompareWithRefs) { - Run(); -} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convolution_backprop_data.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/convolution_backprop_data.cpp similarity index 86% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convolution_backprop_data.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/convolution_backprop_data.cpp index f94483609d2..3d42398b444 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/convolution_backprop_data.cpp @@ -2,21 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/convolution_backprop_data.hpp" +#include "shared_test_classes/single_layer/convolution_backprop_data.hpp" namespace LayerTestsDefinitions { @@ -72,8 +58,4 @@ void ConvolutionBackpropDataLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(convBackpropData)}; function = std::make_shared(results, params, "convolutionBackpropData"); } - -TEST_P(ConvolutionBackpropDataLayerTest, CompareWithRefs) { - Run(); -} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/ctc_greedy_decoder.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/ctc_greedy_decoder.cpp similarity index 79% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/ctc_greedy_decoder.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/ctc_greedy_decoder.cpp index c759aebd145..7f073ea11ea 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/ctc_greedy_decoder.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/ctc_greedy_decoder.cpp @@ -3,23 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include -#include - -#include "ie_core.hpp" -#include "ie_precision.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/ctc_greedy_decoder.hpp" +#include "shared_test_classes/single_layer/ctc_greedy_decoder.hpp" namespace LayerTestsDefinitions { std::string CTCGreedyDecoderLayerTest::getTestCaseName( @@ -67,8 +51,4 @@ void CTCGreedyDecoderLayerTest::SetUp() { ngraph::ResultVector results{ std::make_shared(ctcGreedyDecoder) }; function = std::make_shared(results, paramsIn, "Grn"); } - -TEST_P(CTCGreedyDecoderLayerTest, CompareWithRefs) { - Run(); -}; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/ctc_loss.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/ctc_loss.cpp similarity index 94% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/ctc_loss.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/ctc_loss.cpp index 83007bff637..4e1047f0232 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/ctc_loss.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/ctc_loss.cpp @@ -2,13 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include - #include "ngraph_functions/builders.hpp" -#include "single_layer_tests/ctc_loss.hpp" +#include "shared_test_classes/single_layer/ctc_loss.hpp" namespace LayerTestsDefinitions { @@ -64,8 +59,4 @@ void CTCLossLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(conv)}; function = std::make_shared(results, params, "CTCLoss"); } - -TEST_P(CTCLossLayerTest, CompareWithRefs) { - Run(); -} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/cum_sum.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/cum_sum.cpp similarity index 80% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/cum_sum.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/cum_sum.cpp index c45697acd3e..1d8c0584dbc 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/cum_sum.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/cum_sum.cpp @@ -2,20 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include - -#include "ie_core.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/cum_sum.hpp" +#include "shared_test_classes/single_layer/cum_sum.hpp" namespace LayerTestsDefinitions { @@ -56,9 +43,4 @@ void CumSumLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(cumSum)}; function = std::make_shared(results, paramVector, "cumsum"); } - -TEST_P(CumSumLayerTest, CompareWithRefs) { - Run(); -}; - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/depth_to_space.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/depth_to_space.cpp similarity index 83% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/depth_to_space.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/depth_to_space.cpp index 30124195a7c..9129ebea079 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/depth_to_space.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/depth_to_space.cpp @@ -2,26 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "common_test_utils/common_utils.hpp" - -#include "single_layer_tests/depth_to_space.hpp" - -using namespace ngraph::opset3; +#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/depth_to_space.hpp" namespace LayerTestsDefinitions { +using namespace ngraph::opset3; + static inline std::string DepthToSpaceModeToString(const DepthToSpace::DepthToSpaceMode& mode) { static std::map names = { {DepthToSpace::DepthToSpaceMode::BLOCKS_FIRST, "BLOCKS_FIRST"}, @@ -64,9 +51,4 @@ void DepthToSpaceLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(d2s)}; function = std::make_shared(results, params, "DepthToSpace"); } - -TEST_P(DepthToSpaceLayerTest, CompareWithRefs) { - Run(); -}; - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/detection_output.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/detection_output.cpp similarity index 96% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/detection_output.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/detection_output.cpp index 5a4f690d66c..a60c204db55 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/detection_output.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/detection_output.cpp @@ -2,13 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include - #include "ngraph_functions/builders.hpp" -#include "common_test_utils/data_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "single_layer_tests/detection_output.hpp" +#include "shared_test_classes/single_layer/detection_output.hpp" namespace LayerTestsDefinitions { @@ -155,10 +150,5 @@ void DetectionOutputLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(detOut)}; function = std::make_shared(results, params, "DetectionOutput"); } - -TEST_P(DetectionOutputLayerTest, CompareWithRefs) { - Run(); -}; - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/eltwise.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/eltwise.cpp similarity index 95% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/eltwise.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/eltwise.cpp index 1c407733fc4..164587f60ca 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/eltwise.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/eltwise.cpp @@ -3,15 +3,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include - -#include - -#include "functional_test_utils/layer_test_utils.hpp" #include "ngraph_functions/builders.hpp" #include "ngraph_functions/utils/ngraph_helpers.hpp" - -#include "single_layer_tests/eltwise.hpp" +#include "shared_test_classes/single_layer/eltwise.hpp" namespace LayerTestsDefinitions { @@ -113,9 +107,4 @@ void EltwiseLayerTest::SetUp() { auto eltwise = ngraph::builder::makeEltwise(input[0], secondaryInput, eltwiseType); function = std::make_shared(eltwise, input, "Eltwise"); } - - -TEST_P(EltwiseLayerTest, EltwiseTests) { - Run(); -} } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/embedding_bag_offsets_sum.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/embedding_bag_offsets_sum.cpp similarity index 90% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/embedding_bag_offsets_sum.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/embedding_bag_offsets_sum.cpp index 6b9435efed1..fc0e711bb75 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/embedding_bag_offsets_sum.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/embedding_bag_offsets_sum.cpp @@ -2,17 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include - -#include "single_layer_tests/embedding_bag_offsets_sum.hpp" - -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/embedding_bag_offsets_sum.hpp" #include "ngraph_functions/builders.hpp" - namespace LayerTestsDefinitions { std::string EmbeddingBagOffsetsSumLayerTest::getTestCaseName(testing::TestParamInfo obj) { @@ -59,8 +51,4 @@ void EmbeddingBagOffsetsSumLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(embBag)}; function = std::make_shared(results, params, "embeddingBagOffsetsSum"); } - -TEST_P(EmbeddingBagOffsetsSumLayerTest, CompareWithRefs) { - Run(); -} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/embedding_bag_packed_sum.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/embedding_bag_packed_sum.cpp similarity index 89% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/embedding_bag_packed_sum.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/embedding_bag_packed_sum.cpp index de642364d7a..98a70f092cf 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/embedding_bag_packed_sum.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/embedding_bag_packed_sum.cpp @@ -1,18 +1,9 @@ // Copyright (C) 2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 // - -#include -#include -#include -#include - -#include "single_layer_tests/embedding_bag_packed_sum.hpp" - -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/embedding_bag_packed_sum.hpp" #include "ngraph_functions/builders.hpp" - namespace LayerTestsDefinitions { std::string EmbeddingBagPackedSumLayerTest::getTestCaseName(testing::TestParamInfo obj) { @@ -56,8 +47,4 @@ void EmbeddingBagPackedSumLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(embBag)}; function = std::make_shared(results, params, "embeddingBagPackedSum"); } - -TEST_P(EmbeddingBagPackedSumLayerTest, CompareWithRefs) { - Run(); -} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/embedding_segments_sum.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/embedding_segments_sum.cpp similarity index 91% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/embedding_segments_sum.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/embedding_segments_sum.cpp index 4e32a153548..27e1ef79415 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/embedding_segments_sum.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/embedding_segments_sum.cpp @@ -2,14 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include - -#include "single_layer_tests/embedding_segments_sum.hpp" - -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/embedding_segments_sum.hpp" #include "ngraph_functions/builders.hpp" @@ -60,9 +53,4 @@ void EmbeddingSegmentsSumLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(embBag)}; function = std::make_shared(results, params, "embeddingSegmentsSum"); } - -TEST_P(EmbeddingSegmentsSumLayerTest, CompareWithRefs) { - Run(); -} - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/extract_image_patches.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/extract_image_patches.cpp similarity index 88% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/extract_image_patches.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/extract_image_patches.cpp index 3331d5603ee..a10acf218f0 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/extract_image_patches.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/extract_image_patches.cpp @@ -2,16 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "single_layer_tests/extract_image_patches.hpp" - -#include "functional_test_utils/layer_test_utils.hpp" +#include "shared_test_classes/single_layer/extract_image_patches.hpp" #include "ngraph_functions/builders.hpp" @@ -54,9 +45,4 @@ void ExtractImagePatchesTest::SetUp() { ngraph::ResultVector results{std::make_shared(extImgPatches)}; function = std::make_shared(results, params, "ExtractImagePatches"); } - -TEST_P(ExtractImagePatchesTest, CompareWithRefs) { - Run(); -}; - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/fake_quantize.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/fake_quantize.cpp similarity index 80% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/fake_quantize.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/fake_quantize.cpp index 1c3bc5fd2c1..e09811ccb4f 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/fake_quantize.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/fake_quantize.cpp @@ -2,32 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/fake_quantize.hpp" - -// seed selected using current cloc time -#define USE_CLOCK_TIME 1 -// seed started from default value, and incremented every time using big number like 9999 -#define USE_INCREMENTAL_SEED 2 - -/** - * redefine this seed to reproduce issue with given seed that can be read from gtest logs - */ -#define BASE_SEED 123 -#define NGRAPH_SEED 123 +#include "shared_test_classes/single_layer/fake_quantize.hpp" namespace LayerTestsDefinitions { @@ -138,21 +113,4 @@ void FakeQuantizeLayerTest::UpdateSeed() { std::cout << "\033[0;32m" << "[ ] " << "\033[0;0m" << "seed = " << seed << std::endl; } - -TEST_P(FakeQuantizeLayerTest, CompareWithRefs) { - Run(); - SKIP_IF_CURRENT_TEST_IS_DISABLED(); - - if (BASE_SEED != USE_CLOCK_TIME && - BASE_SEED != USE_INCREMENTAL_SEED) { - return; - } - - size_t nIterations = 1; - for (; nIterations != 0; nIterations--) { - UpdateSeed(); - Infer(); - Validate(); - } -} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gather.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/gather.cpp similarity index 84% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gather.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/gather.cpp index 438e4755a7d..8cfc86e6c04 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gather.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/gather.cpp @@ -2,21 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/skip_tests_config.hpp" - -#include "single_layer_tests/gather.hpp" +#include "shared_test_classes/single_layer/gather.hpp" namespace LayerTestsDefinitions { @@ -65,9 +51,4 @@ void GatherLayerTest::SetUp() { GatherLayerTestBase::SetUp(GetParam()); } - -TEST_P(GatherLayerTest, CompareWithRefs) { - Run(); -}; - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gather_nd.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/gather_nd.cpp similarity index 93% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gather_nd.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/gather_nd.cpp index be43cc93bec..a566830357e 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gather_nd.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/gather_nd.cpp @@ -2,13 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include - #include "ngraph_functions/builders.hpp" -#include "single_layer_tests/gather_nd.hpp" +#include "shared_test_classes/single_layer/gather_nd.hpp" namespace LayerTestsDefinitions { @@ -59,8 +54,4 @@ void GatherNDLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(gather)}; function = std::make_shared(results, params, "gatherND"); } - -TEST_P(GatherNDLayerTest, CompareWithRefs) { - Run(); -} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gather_tree.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/gather_tree.cpp similarity index 90% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gather_tree.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/gather_tree.cpp index 08cc8c0246a..06ca1448b3f 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gather_tree.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/gather_tree.cpp @@ -2,16 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" - -#include "single_layer_tests/gather_tree.hpp" +#include "shared_test_classes/single_layer/gather_tree.hpp" namespace LayerTestsDefinitions { std::string GatherTreeLayerTest::getTestCaseName(const testing::TestParamInfo &obj) { @@ -85,9 +76,4 @@ InferenceEngine::Blob::Ptr GatherTreeLayerTest::GenerateInput(const InferenceEng return FuncTestUtils::createAndFillBlob(info.getTensorDesc(), maxBeamIndx); } - -TEST_P(GatherTreeLayerTest, CompareWithRefs) { - Run(); -}; - } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/grn.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/grn.cpp similarity index 78% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/grn.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/grn.cpp index c35cee4e454..4ebfbee9793 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/grn.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/grn.cpp @@ -3,23 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include -#include - -#include "ie_core.hpp" -#include "ie_precision.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/grn.hpp" +#include "shared_test_classes/single_layer/grn.hpp" namespace LayerTestsDefinitions { std::string GrnLayerTest::getTestCaseName(const testing::TestParamInfo& obj) { @@ -60,8 +44,4 @@ void GrnLayerTest::SetUp() { ngraph::ResultVector results{ std::make_shared(grn) }; function = std::make_shared(results, paramsIn, "Grn"); } - -TEST_P(GrnLayerTest, CompareWithRefs) { - Run(); -}; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/group_convolution.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/group_convolution.cpp similarity index 86% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/group_convolution.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/group_convolution.cpp index 313921a6dd9..83ec247692d 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/group_convolution.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/group_convolution.cpp @@ -2,21 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/group_convolution.hpp" +#include "shared_test_classes/single_layer/group_convolution.hpp" namespace LayerTestsDefinitions { @@ -73,8 +59,4 @@ void GroupConvolutionLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(groupConv)}; function = std::make_shared(results, params, "groupConvolution"); } - -TEST_P(GroupConvolutionLayerTest, CompareWithRefs) { - Run(); -} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/group_convolution_backprop_data.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/group_convolution_backprop_data.cpp similarity index 86% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/group_convolution_backprop_data.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/group_convolution_backprop_data.cpp index 5e70506485a..ee13c9627ab 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/group_convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/group_convolution_backprop_data.cpp @@ -2,21 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/group_convolution_backprop_data.hpp" +#include "shared_test_classes/single_layer/group_convolution_backprop_data.hpp" namespace LayerTestsDefinitions { @@ -73,8 +59,4 @@ void GroupConvBackpropDataLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(groupConvBackpropData)}; function = std::make_shared(results, params, "GroupConvolutionBackpropData"); } - -TEST_P(GroupConvBackpropDataLayerTest, CompareWithRefs) { - Run(); -} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gru_cell.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/gru_cell.cpp similarity index 87% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gru_cell.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/gru_cell.cpp index 4258d4627ba..3aea409dcb5 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gru_cell.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/gru_cell.cpp @@ -2,22 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/skip_tests_config.hpp" - #include -#include "single_layer_tests/gru_cell.hpp" +#include "shared_test_classes/single_layer/gru_cell.hpp" namespace LayerTestsDefinitions { @@ -87,9 +73,4 @@ void GRUCellTest::SetUp() { m.run_passes(function); } } - - -TEST_P(GRUCellTest, CompareWithRefs) { - Run(); -}; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gru_sequence.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/gru_sequence.cpp similarity index 90% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gru_sequence.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/gru_sequence.cpp index 875f1bfda71..ee8edd16937 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gru_sequence.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/gru_sequence.cpp @@ -2,23 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/skip_tests_config.hpp" - -#include "single_layer_tests/gru_sequence.hpp" -#include -#include +#include "shared_test_classes/single_layer/gru_sequence.hpp" +#include "transformations/op_conversions/bidirectional_sequences_decomposition.hpp" +#include "transformations/op_conversions/convert_sequences_to_tensor_iterator.hpp" namespace LayerTestsDefinitions { @@ -128,8 +114,4 @@ namespace LayerTestsDefinitions { } inferRequest.Infer(); } - - TEST_P(GRUSequenceTest, CompareWithRefs) { - Run(); - }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/interpolate.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/interpolate.cpp similarity index 93% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/interpolate.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/interpolate.cpp index 1d96cab5a95..072775a7a2e 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/interpolate.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/interpolate.cpp @@ -2,16 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/interpolate.hpp" +#include "shared_test_classes/single_layer/interpolate.hpp" #include "ngraph_functions/builders.hpp" #include "ngraph_functions/utils/ngraph_helpers.hpp" @@ -99,8 +90,4 @@ void InterpolateLayerTest::SetUp() { const ngraph::ResultVector results{std::make_shared(interpolate)}; function = std::make_shared(results, params, "interpolate"); } - -TEST_P(InterpolateLayerTest, CompareWithRefs) { - Run(); -} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/log_softmax.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/log_softmax.cpp similarity index 84% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/log_softmax.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/log_softmax.cpp index 998157158f3..df1b40fd90b 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/log_softmax.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/log_softmax.cpp @@ -3,18 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "single_layer_tests/log_softmax.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "ie_core.hpp" - -#include -#include -#include -#include +#include "shared_test_classes/single_layer/log_softmax.hpp" namespace LayerTestsDefinitions { @@ -62,9 +51,4 @@ void LogSoftmaxLayerTest::SetUp() { function = std::make_shared(results, params, "logSoftmax"); } - -TEST_P(LogSoftmaxLayerTest, CompareWithRefs) { - Run(); -} - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/logical.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/logical.cpp similarity index 92% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/logical.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/logical.cpp index 14429e97c4d..e1979af54f4 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/logical.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/logical.cpp @@ -3,15 +3,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include - -#include - -#include "functional_test_utils/layer_test_utils.hpp" #include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -#include "single_layer_tests/logical.hpp" +#include "shared_test_classes/single_layer/logical.hpp" using namespace LayerTestsDefinitions::LogicalParams; @@ -87,9 +80,4 @@ void LogicalLayerTest::SetUp() { function = std::make_shared(logicalNode, inputs, "Logical"); } - - -TEST_P(LogicalLayerTest, LogicalTests) { - Run(); -} } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/loop.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/loop.cpp similarity index 63% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/loop.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/loop.cpp index 50f0ee590ae..1265757c0bf 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/loop.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/loop.cpp @@ -2,22 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/skip_tests_config.hpp" - -#include "single_layer_tests/loop.hpp" +#include "shared_test_classes/single_layer/loop.hpp" namespace LayerTestsDefinitions { @@ -154,11 +139,6 @@ namespace LayerTestsDefinitions { function = std::make_shared(ngraph::ResultVector{result0, result1, result2}, params, "loop"); } - - TEST_P(LoopTest, CompareWithRefs) { - Run(); - } - void StaticShapeLoopTest::SetUp() { SKIP_IF_CURRENT_TEST_IS_DISABLED() auto args_papck = std::tie(static_iter_num, max_iter_num, dynamic_exit, axis); @@ -287,115 +267,6 @@ namespace LayerTestsDefinitions { return {res}; } - TEST_P(StaticShapeLoopTest, CompareWithRefs) { - Run(); - } - - TEST_P(StaticShapeLoopTest, CompareWithPredefinedRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - LoadNetwork(); - Infer(); - auto expectedOutputs = PredefinedRefs(); // use predefined refs instead of CalculateRefs function - const auto& actualOutputs = GetOutputs(); - - if (expectedOutputs.empty()) { - return; - } - - IE_ASSERT(actualOutputs.size() == expectedOutputs.size()) - << "nGraph interpreter has " << expectedOutputs.size() << " outputs, while IE " << actualOutputs.size(); - - Compare(expectedOutputs, actualOutputs); - } - - TEST_P(TrivialLoopTest, PassThroughBody) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - InferenceEngine::Precision iePrc; - InferenceEngine::SizeVector ieShape; - std::tie(iePrc, ieShape, targetDevice) = GetParam(); - - const auto prc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(iePrc); - const auto shape = ngraph::Shape{ieShape}; - const auto scalarShape = ngraph::Shape{}; - - auto start = std::make_shared(prc, shape); - auto count = std::make_shared(ngraph::element::i64, scalarShape, 5); - auto icond = std::make_shared(ngraph::element::boolean, scalarShape, true); - - // Loop body - auto b_data = std::make_shared(prc, shape); - auto b_cond = std::make_shared(ngraph::element::boolean, scalarShape); - - auto body = std::make_shared( - ngraph::OutputVector {b_cond, b_data}, // | passthrough body, no data changes - ngraph::ParameterVector {b_cond, b_data}); // | input -> output - - auto loop = std::make_shared(count, icond); - loop->set_function(body); - loop->set_special_body_ports({-1, 0}); - loop->set_invariant_input(b_cond, icond); - loop->set_invariant_input(b_data, start); - loop->get_iter_value(b_data, -1); - - function = std::make_shared( - ngraph::OutputVector {loop}, - ngraph::ParameterVector {start}); - - // Precalculated ref blobs - auto blob = make_blob_with_precision({iePrc, ieShape, InferenceEngine::TensorDesc::getLayoutByDims(ieShape)}); - blob->allocate(); - CommonTestUtils::fill_data_with_broadcast(blob, 0, {10}); - - inputGens[""] = [&] (InferenceEngine::TensorDesc tdesc) { return blob; }; - outputGens[""] = [&] (InferenceEngine::TensorDesc tdesc) { return blob; }; - - Run(); - } - - TEST_P(TrivialLoopTest, UnusedInputBody) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - InferenceEngine::Precision iePrc; - InferenceEngine::SizeVector ieShape; - std::tie(iePrc, ieShape, targetDevice) = GetParam(); - - const auto prc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(iePrc); - const auto shape = ngraph::Shape{ieShape}; - const auto scalarShape = ngraph::Shape{}; - - auto start = std::make_shared(prc, shape); - auto count = std::make_shared(ngraph::element::i64, scalarShape, 5); - auto icond = std::make_shared(ngraph::element::boolean, scalarShape, true); - - // Loop body - auto b_data = std::make_shared(prc, shape); - auto b_cond = std::make_shared(ngraph::element::boolean, scalarShape, true); - auto b_iter = std::make_shared(ngraph::element::i64, scalarShape); - - auto body = std::make_shared( - ngraph::OutputVector {b_cond, b_data}, - ngraph::ParameterVector {b_data, b_iter}); - - auto loop = std::make_shared(count, icond); - loop->set_function(body); - loop->set_special_body_ports({1, 0}); - loop->set_invariant_input(b_data, start); - loop->get_iter_value(b_data, -1); - - function = std::make_shared( - ngraph::OutputVector {loop}, - ngraph::ParameterVector {start}); - - // Precalculated ref blobs - auto blob = make_blob_with_precision({iePrc, ieShape, InferenceEngine::TensorDesc::getLayoutByDims(ieShape)}); - blob->allocate(); - CommonTestUtils::fill_data_with_broadcast(blob, 0, {10}); - - inputGens[""] = [&] (InferenceEngine::TensorDesc tdesc) { return blob; }; - outputGens[""] = [&] (InferenceEngine::TensorDesc tdesc) { return blob; }; - - Run(); - } - void TrivialLoopTest::CreateSlicedLoop(size_t batch_size, size_t num_iteration, InferenceEngine::Precision iePrc, InferenceEngine::SizeVector& ieShape) { const auto prc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(iePrc); @@ -471,106 +342,4 @@ namespace LayerTestsDefinitions { ngraph::OutputVector {loop}, ngraph::ParameterVector {to_slice}); } - - TEST_P(TrivialLoopTest, AutoSlicingInput_CheckPredefinedValues) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - InferenceEngine::Precision iePrc; - InferenceEngine::SizeVector ieShape; - std::tie(iePrc, ieShape, targetDevice) = GetParam(); - const size_t batch_size = 5; - const size_t num_iteration = 3; - ieShape[0] = 1; - auto ieShape_to_slice = ieShape; - ieShape_to_slice[0] = batch_size; - CreateSlicedLoop(batch_size, num_iteration, iePrc, ieShape); - Run(); - // Precalculated ref blobs - auto blob = make_blob_with_precision({iePrc, ieShape_to_slice, InferenceEngine::TensorDesc::getLayoutByDims(ieShape_to_slice)}); - blob->allocate(); - std::vector seq_raw_data(batch_size); - std::iota(seq_raw_data.begin(), seq_raw_data.end(), 1); - CommonTestUtils::fill_data_with_broadcast(blob, 0, seq_raw_data); - - auto blob_ref = make_blob_with_precision({iePrc, ieShape, InferenceEngine::TensorDesc::getLayoutByDims(ieShape)}); - blob_ref->allocate(); - CommonTestUtils::fill_data_with_broadcast(blob_ref, 0, { num_iteration * (num_iteration + 1) / 2}); - - inputGens[""] = [&] (InferenceEngine::TensorDesc tdesc) { return blob; }; - outputGens[""] = [&] (InferenceEngine::TensorDesc tdesc) { return blob_ref; }; - } - - TEST_P(TrivialLoopTest, AutoSlicingInputWithDynCondition_CheckPredefinedValues) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - InferenceEngine::Precision iePrc; - InferenceEngine::SizeVector ieShape; - std::tie(iePrc, ieShape, targetDevice) = GetParam(); - - // auto slicing size : 5 - // trip count limit : 4 - // dyn exit after iter : 3 - // --------------------- - // should exit after 4 iterations - const size_t batch_size = 5; - const size_t trip_count = 5; - const size_t num_iteration = 3; - - ieShape[0] = 1; - auto ieShape_to_slice = ieShape; - ieShape_to_slice[0] = batch_size; - - CreateSlicedLoopDynCondition(batch_size, num_iteration, iePrc, ieShape, trip_count); - // Precalculated ref blobs - auto blob = make_blob_with_precision({iePrc, ieShape_to_slice, InferenceEngine::TensorDesc::getLayoutByDims(ieShape_to_slice)}); - blob->allocate(); - std::vector seq_raw_data(batch_size); - std::iota(seq_raw_data.begin(), seq_raw_data.end(), 1); - CommonTestUtils::fill_data_with_broadcast(blob, 0, seq_raw_data); - - auto blob_ref = make_blob_with_precision({iePrc, ieShape, InferenceEngine::TensorDesc::getLayoutByDims(ieShape)}); - blob_ref->allocate(); - const size_t real_iter = num_iteration + 1; - CommonTestUtils::fill_data_with_broadcast(blob_ref, 0, { real_iter * (real_iter + 1) / 2}); - - inputGens[""] = [&] (InferenceEngine::TensorDesc tdesc) { return blob; }; - outputGens[""] = [&] (InferenceEngine::TensorDesc tdesc) { return blob_ref; }; - - Run(); - } - - TEST_P(TrivialLoopTest, AutoSlicingInput_CheckReference) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - InferenceEngine::Precision iePrc; - InferenceEngine::SizeVector ieShape; - std::tie(iePrc, ieShape, targetDevice) = GetParam(); - const size_t batch_size = 5; - const size_t num_iteration = 3; - ieShape[0] = 1; - auto ieShape_to_slice = ieShape; - ieShape_to_slice[0] = batch_size; - CreateSlicedLoop(batch_size, num_iteration, iePrc, ieShape); - Run(); - } - - TEST_P(TrivialLoopTest, AutoSlicingInputWithDynCondition_CheckReference) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - InferenceEngine::Precision iePrc; - InferenceEngine::SizeVector ieShape; - std::tie(iePrc, ieShape, targetDevice) = GetParam(); - - // auto slicing size : 5 - // trip count limit : 4 - // dyn exit after iter : 3 - // --------------------- - // should exit after 4 iterations - const size_t batch_size = 5; - const size_t trip_count = 5; - const size_t num_iteration = 3; - - ieShape[0] = 1; - auto ieShape_to_slice = ieShape; - ieShape_to_slice[0] = batch_size; - - CreateSlicedLoopDynCondition(batch_size, num_iteration, iePrc, ieShape, trip_count); - Run(); - } } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/lrn.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/lrn.cpp similarity index 92% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/lrn.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/lrn.cpp index e374649f919..2170c3f2114 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/lrn.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/lrn.cpp @@ -3,12 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include - -#include "single_layer_tests/lrn.hpp" +#include "shared_test_classes/single_layer/lrn.hpp" namespace LayerTestsDefinitions { @@ -56,8 +51,4 @@ void LrnLayerTest::SetUp() { ngraph::ResultVector results {std::make_shared(lrn)}; function = std::make_shared(results, params, "lrn"); } - -TEST_P(LrnLayerTest, CompareWithRefs) { - Run(); -} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/lstm_cell.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/lstm_cell.cpp similarity index 85% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/lstm_cell.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/lstm_cell.cpp index 81fe07d1a05..0d38fbea707 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/lstm_cell.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/lstm_cell.cpp @@ -2,22 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/skip_tests_config.hpp" - -#include -#include "single_layer_tests/lstm_cell.hpp" +#include "transformations/op_conversions/lstm_cell_decomposition.hpp" +#include "shared_test_classes/single_layer/lstm_cell.hpp" namespace LayerTestsDefinitions { @@ -81,9 +67,4 @@ void LSTMCellTest::SetUp() { m.run_passes(function); } } - - -TEST_P(LSTMCellTest, CompareWithRefs) { - Run(); -}; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/lstm_sequence.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/lstm_sequence.cpp similarity index 89% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/lstm_sequence.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/lstm_sequence.cpp index 88c113929cc..1756a0616c5 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/lstm_sequence.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/lstm_sequence.cpp @@ -2,24 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/skip_tests_config.hpp" - -#include "single_layer_tests/lstm_sequence.hpp" -#include -#include -#include +#include "shared_test_classes/single_layer/lstm_sequence.hpp" +#include "transformations/op_conversions/bidirectional_sequences_decomposition.hpp" +#include "transformations/op_conversions/convert_sequences_to_tensor_iterator.hpp" +#include "ngraph/pass/visualize_tree.hpp" namespace LayerTestsDefinitions { @@ -128,8 +114,4 @@ namespace LayerTestsDefinitions { } inferRequest.Infer(); } - - TEST_P(LSTMSequenceTest, CompareWithRefs) { - Run(); - }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/mat_mul.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/mat_mul.cpp similarity index 95% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/mat_mul.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/mat_mul.cpp index 0d057604afd..19a6f9fa10d 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/mat_mul.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/mat_mul.cpp @@ -2,14 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "single_layer_tests/mat_mul.hpp" #include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/mat_mul.hpp" namespace LayerTestsDefinitions { @@ -81,8 +75,4 @@ void MatMulTest::SetUp() { function = std::make_shared(results, params, "MatMul"); } -TEST_P(MatMulTest, CompareWithRefs) { - Run(); -}; - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/minimum_maximum.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/minimum_maximum.cpp similarity index 86% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/minimum_maximum.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/minimum_maximum.cpp index 25ee6fffbdc..8d9545abf48 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/minimum_maximum.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/minimum_maximum.cpp @@ -2,16 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "single_layer_tests/minimum_maximum.hpp" +#include "shared_test_classes/single_layer/minimum_maximum.hpp" namespace LayerTestsDefinitions { std::string MaxMinLayerTest::getTestCaseName(const testing::TestParamInfo &obj) { @@ -56,8 +47,4 @@ namespace LayerTestsDefinitions { auto op = ngraph::builder::makeMinMax(input[0], secondaryInput, opType); function = std::make_shared(op, input, "MinMax"); } - - TEST_P(MaxMinLayerTest, CompareWithRefs){ - Run(); - }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/mvn.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/mvn.cpp similarity index 76% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/mvn.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/mvn.cpp index e21fd7732d6..ea42aec04ef 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/mvn.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/mvn.cpp @@ -2,22 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "ie_core.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/mvn.hpp" +#include "shared_test_classes/single_layer/mvn.hpp" namespace LayerTestsDefinitions { @@ -51,9 +36,4 @@ void MvnLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(mvn)}; function = std::make_shared(results, param, "mvn"); } - -TEST_P(MvnLayerTest, CompareWithRefs) { - Run(); -}; - } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/non_max_suppression.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/non_max_suppression.cpp similarity index 98% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/non_max_suppression.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/non_max_suppression.cpp index d9a6869e5a3..5554dcfd029 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/non_max_suppression.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/non_max_suppression.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "single_layer_tests/non_max_suppression.hpp" +#include "shared_test_classes/single_layer/non_max_suppression.hpp" namespace LayerTestsDefinitions { @@ -133,8 +133,4 @@ void NmsLayerTest::SetUp() { function = std::make_shared(OutputVector{nms_0_identity, nms_1_identity, nms_2_identity}, params, "NMS"); } -TEST_P(NmsLayerTest, CompareWithRefs) { - Run(); -}; - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/nonzero.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/nonzero.cpp similarity index 82% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/nonzero.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/nonzero.cpp index ccfe5c59e26..3964348637c 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/nonzero.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/nonzero.cpp @@ -3,18 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "single_layer_tests/nonzero.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "ie_core.hpp" - -#include -#include -#include -#include +#include "shared_test_classes/single_layer/nonzero.hpp" namespace LayerTestsDefinitions { @@ -49,8 +38,4 @@ void NonZeroLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(nonZeroOp)}; function = std::make_shared(results, ngraph::ParameterVector{paramNode}, "non_zero"); } - -TEST_P(NonZeroLayerTest, CompareWithReference) { - Run(); -} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/normalize_l2.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/normalize_l2.cpp similarity index 93% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/normalize_l2.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/normalize_l2.cpp index 3d6c472e3fc..5562bba1b29 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/normalize_l2.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/normalize_l2.cpp @@ -2,8 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "single_layer_tests/normalize_l2.hpp" - +#include "shared_test_classes/single_layer/normalize_l2.hpp" namespace LayerTestsDefinitions { @@ -40,8 +39,4 @@ void NormalizeL2LayerTest::SetUp() { function = std::make_shared(results, params, "NormalizeL2"); } -TEST_P(NormalizeL2LayerTest, CompareWithRefs) { - Run(); -} - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/pad.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/pad.cpp similarity index 90% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/pad.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/pad.cpp index 08c62661b87..0a0ef76222f 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/pad.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/pad.cpp @@ -2,14 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "single_layer_tests/pad.hpp" - +#include "shared_test_classes/single_layer/pad.hpp" namespace LayerTestsDefinitions { @@ -57,9 +50,4 @@ void PadLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(pad)}; function = std::make_shared(results, params, "pad"); } - -TEST_P(PadLayerTest, CompareWithRefs) { - Run(); -} - } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/pooling.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/pooling.cpp similarity index 92% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/pooling.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/pooling.cpp index f77b4d38b3a..f768a27d954 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/pooling.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/pooling.cpp @@ -3,22 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - - -#include "single_layer_tests/pooling.hpp" +#include "shared_test_classes/single_layer/pooling.hpp" namespace LayerTestsDefinitions { @@ -177,16 +162,4 @@ void GlobalPoolingLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(pooling)}; function = std::make_shared(results, params, "pooling"); } - -TEST_P(PoolingLayerTest, CompareWithRefs) { - Run(); -} - -TEST_P(GlobalPoolingLayerTest, CompareWithRefs) { - Run(); - - if (targetDevice == std::string{CommonTestUtils::DEVICE_GPU}) { - PluginCache::get().reset(); - } -} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/power.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/power.cpp similarity index 89% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/power.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/power.cpp index 56413e815c2..6f8f341f7a8 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/power.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/power.cpp @@ -2,10 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "single_layer_tests/power.hpp" +#include "shared_test_classes/single_layer/power.hpp" namespace LayerTestsDefinitions { std::string PowerLayerTest::getTestCaseName(const testing::TestParamInfo &obj) { @@ -44,8 +41,4 @@ namespace LayerTestsDefinitions { function = std::make_shared(pow, paramsIn, "power"); } - - TEST_P(PowerLayerTest, CompareWithRefs){ - Run(); - }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/prior_box_clustered.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/prior_box_clustered.cpp similarity index 92% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/prior_box_clustered.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/prior_box_clustered.cpp index 1530eaa6252..57bab8cdacf 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/prior_box_clustered.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/prior_box_clustered.cpp @@ -3,24 +3,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include -#include - -#include "ie_core.hpp" -#include "ie_precision.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/prior_box_clustered.hpp" #include "legacy/ngraph_ops/prior_box_clustered_ie.hpp" +#include "shared_test_classes/single_layer/prior_box_clustered.hpp" namespace LayerTestsDefinitions { std::string PriorBoxClusteredLayerTest::getTestCaseName(const testing::TestParamInfo& obj) { @@ -186,8 +170,4 @@ void PriorBoxClusteredLayerTest::SetUp() { ngraph::ResultVector results{ std::make_shared(priorBoxClustered) }; function = std::make_shared(results, paramsIn, "PB_Clustered"); } - -TEST_P(PriorBoxClusteredLayerTest, CompareWithRefs) { - Run(); -}; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/proposal.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/proposal.cpp similarity index 92% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/proposal.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/proposal.cpp index 5a8cdb39c11..ac4838fd083 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/proposal.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/proposal.cpp @@ -2,21 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/proposal.hpp" +#include "shared_test_classes/single_layer/proposal.hpp" namespace LayerTestsDefinitions { @@ -151,8 +137,4 @@ InferenceEngine::Blob::Ptr ProposalLayerTest::GenerateInput(const InferenceEngin // TODO: for validation, reference version is required (#28373) void ProposalLayerTest::Validate() {} - -TEST_P(ProposalLayerTest, CompareWithRefs) { - Run(); -} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/psroi_pooling.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/psroi_pooling.cpp similarity index 92% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/psroi_pooling.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/psroi_pooling.cpp index d184a8ec456..bcc0ee146d8 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/psroi_pooling.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/psroi_pooling.cpp @@ -3,19 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/psroi_pooling.hpp" - -using namespace InferenceEngine; -using namespace FuncTestUtils::PrecisionUtils; +#include "shared_test_classes/single_layer/psroi_pooling.hpp" namespace LayerTestsDefinitions { @@ -98,7 +86,7 @@ namespace LayerTestsDefinitions { size_t it = 0; for (const auto &input : cnnNetwork.getInputsInfo()) { const auto &info = input.second; - Blob::Ptr blob; + InferenceEngine::Blob::Ptr blob; if (it == 1) { blob = make_blob_with_precision(info->getTensorDesc()); @@ -139,8 +127,4 @@ namespace LayerTestsDefinitions { ngraph::ResultVector results{std::make_shared(psroiPooling)}; function = std::make_shared(results, params, "psroi_pooling"); } - - TEST_P(PSROIPoolingLayerTest, CompareWithRefs) { - Run(); - } } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/range.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/range.cpp similarity index 93% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/range.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/range.cpp index 55dcc0cf129..2a4d5d61bb4 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/range.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/range.cpp @@ -3,17 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "ie_precision.hpp" - -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/range.hpp" +#include "shared_test_classes/single_layer/range.hpp" namespace LayerTestsDefinitions { @@ -128,9 +118,4 @@ void RangeNumpyLayerTest::SetUp() { const ngraph::ResultVector results{std::make_shared(range)}; function = std::make_shared(results, params, "Range"); } - -TEST_P(RangeNumpyLayerTest, CompareWithRefs) { - Run(); -} - } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/reduce_ops.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/reduce_ops.cpp similarity index 86% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/reduce_ops.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/reduce_ops.cpp index 507944f692c..34f055bcdbf 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/reduce_ops.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/reduce_ops.cpp @@ -2,20 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "ie_core.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/reduce_ops.hpp" +#include "shared_test_classes/single_layer/reduce_ops.hpp" namespace LayerTestsDefinitions { @@ -83,10 +70,6 @@ void ReduceOpsLayerTest::SetUp() { function = std::make_shared(results, params, "Reduce"); } -TEST_P(ReduceOpsLayerTest, CompareWithRefs) { - Run(); -} - InferenceEngine::Blob::Ptr ReduceOpsLayerWithSpecificInputTest::GenerateInput(const InferenceEngine::InputInfo &info) const { auto axis_vec = std::get<0>(GetParam()); IE_ASSERT(axis_vec.size() == 1); @@ -105,8 +88,4 @@ InferenceEngine::Blob::Ptr ReduceOpsLayerWithSpecificInputTest::GenerateInput(co return blob; } -TEST_P(ReduceOpsLayerWithSpecificInputTest, CompareWithRefs) { - Run(); -} - } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/region_yolo.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/region_yolo.cpp similarity index 82% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/region_yolo.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/region_yolo.cpp index fbbd2cc627d..928954ddb6e 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/region_yolo.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/region_yolo.cpp @@ -2,15 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/skip_tests_config.hpp" - -#include "single_layer_tests/region_yolo.hpp" +#include "shared_test_classes/single_layer/region_yolo.hpp" namespace LayerTestsDefinitions { @@ -56,8 +48,4 @@ void RegionYoloLayerTest::SetUp() { function = std::make_shared(std::make_shared(region_yolo), ngraph::ParameterVector{param}, "RegionYolo"); } -TEST_P(RegionYoloLayerTest, CompareWithRefs) { - Run(); -}; - } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/reorg_yolo.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/reorg_yolo.cpp similarity index 77% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/reorg_yolo.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/reorg_yolo.cpp index 716e271d0d5..bd4087cb228 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/reorg_yolo.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/reorg_yolo.cpp @@ -2,15 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/skip_tests_config.hpp" - -#include "single_layer_tests/reorg_yolo.hpp" +#include "shared_test_classes/single_layer/reorg_yolo.hpp" namespace LayerTestsDefinitions { @@ -39,8 +31,4 @@ void ReorgYoloLayerTest::SetUp() { function = std::make_shared(std::make_shared(reorg_yolo), ngraph::ParameterVector{param}, "ReorgYolo"); } -TEST_P(ReorgYoloLayerTest, CompareWithRefs) { - Run(); -}; - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/reshape.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/reshape.cpp similarity index 83% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/reshape.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/reshape.cpp index cda6f4b9dde..b36296b69dd 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/reshape.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/reshape.cpp @@ -2,18 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include -#include - -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "common_test_utils/common_utils.hpp" -#include "single_layer_tests/reshape.hpp" +#include "shared_test_classes/single_layer/reshape.hpp" namespace LayerTestsDefinitions { std::string ReshapeLayerTest::getTestCaseName(testing::TestParamInfo obj) { @@ -54,8 +43,4 @@ void ReshapeLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(reshape)}; function = std::make_shared(results, paramsIn, "Reshape"); } - -TEST_P(ReshapeLayerTest, CompareWithRefsDynamicBath) { - Run(); -} } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/reverse_sequence.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/reverse_sequence.cpp similarity index 86% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/reverse_sequence.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/reverse_sequence.cpp index d56bb12b25b..0977ddcd1fb 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/reverse_sequence.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/reverse_sequence.cpp @@ -2,16 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" - -#include "single_layer_tests/reverse_sequence.hpp" +#include "shared_test_classes/single_layer/reverse_sequence.hpp" namespace LayerTestsDefinitions { std::string ReverseSequenceLayerTest::getTestCaseName(const testing::TestParamInfo &obj) { @@ -60,8 +51,4 @@ void ReverseSequenceLayerTest::SetUp() { function = std::make_shared(results, paramsIn, "ReverseSequence"); } -TEST_P(ReverseSequenceLayerTest, CompareWithRefs) { - Run(); -}; - } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/rnn_cell.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/rnn_cell.cpp similarity index 83% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/rnn_cell.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/rnn_cell.cpp index be04765dd6f..9175872007e 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/rnn_cell.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/rnn_cell.cpp @@ -2,22 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/skip_tests_config.hpp" - -#include -#include "single_layer_tests/rnn_cell.hpp" +#include "transformations/op_conversions/rnn_cell_decomposition.hpp" +#include "shared_test_classes/single_layer/rnn_cell.hpp" namespace LayerTestsDefinitions { @@ -75,9 +61,4 @@ void RNNCellTest::SetUp() { m.run_passes(function); } } - - -TEST_P(RNNCellTest, CompareWithRefs) { - Run(); -}; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/rnn_sequence.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/rnn_sequence.cpp similarity index 89% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/rnn_sequence.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/rnn_sequence.cpp index 42aab9d64be..e0a660203cf 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/rnn_sequence.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/rnn_sequence.cpp @@ -2,23 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/skip_tests_config.hpp" - -#include "single_layer_tests/rnn_sequence.hpp" -#include -#include +#include "transformations/op_conversions/bidirectional_sequences_decomposition.hpp" +#include "transformations/op_conversions/convert_sequences_to_tensor_iterator.hpp" +#include "shared_test_classes/single_layer/rnn_sequence.hpp" namespace LayerTestsDefinitions { @@ -126,8 +112,4 @@ namespace LayerTestsDefinitions { } inferRequest.Infer(); } - - TEST_P(RNNSequenceTest, CompareWithRefs) { - Run(); - }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/roi_pooling.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/roi_pooling.cpp similarity index 89% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/roi_pooling.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/roi_pooling.cpp index c2f7d584558..d0b7efa2889 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/roi_pooling.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/roi_pooling.cpp @@ -3,19 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/roi_pooling.hpp" - -using namespace InferenceEngine; -using namespace FuncTestUtils::PrecisionUtils; +#include "shared_test_classes/single_layer/roi_pooling.hpp" namespace LayerTestsDefinitions { @@ -59,7 +47,7 @@ namespace LayerTestsDefinitions { size_t it = 0; for (const auto &input : cnnNetwork.getInputsInfo()) { const auto &info = input.second; - Blob::Ptr blob; + InferenceEngine::Blob::Ptr blob; if (it == 1) { blob = make_blob_with_precision(info->getTensorDesc()); @@ -97,8 +85,4 @@ namespace LayerTestsDefinitions { ngraph::ResultVector results{std::make_shared(roi_pooling)}; function = std::make_shared(results, params, "roi_pooling"); } - - TEST_P(ROIPoolingLayerTest, CompareWithRefs) { - Run(); - } } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/scatter_ND_update.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/scatter_ND_update.cpp similarity index 87% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/scatter_ND_update.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/scatter_ND_update.cpp index 2191c30138e..d8c07e3fad8 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/scatter_ND_update.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/scatter_ND_update.cpp @@ -2,23 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "common_test_utils/common_utils.hpp" - -#include "single_layer_tests/scatter_ND_update.hpp" - -using namespace ngraph::opset3; +#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/scatter_ND_update.hpp" namespace LayerTestsDefinitions { @@ -86,9 +71,4 @@ void ScatterNDUpdateLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(s2d)}; function = std::make_shared(results, paramVector, "ScatterNDUpdate"); } - -TEST_P(ScatterNDUpdateLayerTest, CompareWithRefs) { - Run(); -}; - } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/scatter_elements_update.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/scatter_elements_update.cpp similarity index 84% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/scatter_elements_update.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/scatter_elements_update.cpp index c0a9904f297..b9422c46fdf 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/scatter_elements_update.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/scatter_elements_update.cpp @@ -2,23 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "common_test_utils/common_utils.hpp" - -#include "single_layer_tests/scatter_elements_update.hpp" - -using namespace ngraph::opset3; +#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/scatter_elements_update.hpp" namespace LayerTestsDefinitions { @@ -74,9 +59,4 @@ void ScatterElementsUpdateLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(s2d)}; function = std::make_shared(results, paramVector, "ScatterElementsUpdate"); } - -TEST_P(ScatterElementsUpdateLayerTest, CompareWithRefs) { - Run(); -}; - } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/scatter_update.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/scatter_update.cpp similarity index 89% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/scatter_update.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/scatter_update.cpp index ae5909acec2..07cf1e1a72a 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/scatter_update.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/scatter_update.cpp @@ -2,26 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "common_test_utils/common_utils.hpp" - -#include "single_layer_tests/scatter_update.hpp" - -using namespace ngraph::opset3; +#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/scatter_update.hpp" namespace LayerTestsDefinitions { - std::string ScatterUpdateLayerTest::getTestCaseName(const testing::TestParamInfo &obj) { axisUpdateShapeInShape shapeDescript; std::vector inShape; @@ -97,9 +81,4 @@ void ScatterUpdateLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(s2d)}; function = std::make_shared(results, paramVector, "ScatterUpdate"); } - -TEST_P(ScatterUpdateLayerTest, CompareWithRefs) { - Run(); -}; - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/select.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/select.cpp similarity index 82% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/select.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/select.cpp index 52d28308ff2..43f20309cb2 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/select.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/select.cpp @@ -2,21 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include - -#include -#include - -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "functional_test_utils/plugin_cache.hpp" - -#include "single_layer_tests/select.hpp" +#include "shared_test_classes/single_layer/select.hpp" namespace LayerTestsDefinitions { enum { CONDITION, THEN, ELSE, numOfInputs }; @@ -56,9 +42,4 @@ namespace LayerTestsDefinitions { ngraph::ResultVector results{std::make_shared(select)}; function = std::make_shared(results, paramNodesVector, "select"); } - - TEST_P(SelectLayerTest, CompareWithRefImpl) { - Run(); - } - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/shape_of.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/shape_of.cpp similarity index 71% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/shape_of.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/shape_of.cpp index e1cafa6df63..98522daf5e7 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/shape_of.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/shape_of.cpp @@ -2,22 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "ie_core.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/shape_of.hpp" +#include "shared_test_classes/single_layer/shape_of.hpp" namespace LayerTestsDefinitions { @@ -45,8 +30,4 @@ namespace LayerTestsDefinitions { function = std::make_shared(results, param, "shapeOf"); } - TEST_P(ShapeOfLayerTest, CompareWithRefs) { - Run(); - } - } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/shuffle_channels.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/shuffle_channels.cpp similarity index 91% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/shuffle_channels.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/shuffle_channels.cpp index 397d341b794..1217ea256c6 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/shuffle_channels.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/shuffle_channels.cpp @@ -2,14 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "single_layer_tests/shuffle_channels.hpp" #include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/shuffle_channels.hpp" namespace LayerTestsDefinitions { @@ -53,8 +47,4 @@ void ShuffleChannelsLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(shuffleChannels)}; function = std::make_shared(results, params, "shuffleChannels"); } - -TEST_P(ShuffleChannelsLayerTest, CompareWithRefs) { - Run(); -} } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/softmax.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/softmax.cpp similarity index 83% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/softmax.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/softmax.cpp index dfa6d64880f..1b00d622882 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/softmax.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/softmax.cpp @@ -3,20 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "single_layer_tests/softmax.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "ie_core.hpp" - -#include "ngraph/op/softmax.hpp" - -#include -#include -#include -#include +#include "shared_test_classes/single_layer/softmax.hpp" namespace LayerTestsDefinitions { @@ -64,9 +51,4 @@ void SoftMaxLayerTest::SetUp() { function = std::make_shared(results, params, "softMax"); } - -TEST_P(SoftMaxLayerTest, CompareWithRefs) { - Run(); -} - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/space_to_batch.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/space_to_batch.cpp similarity index 82% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/space_to_batch.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/space_to_batch.cpp index ed576b42e0c..264d42e924a 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/space_to_batch.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/space_to_batch.cpp @@ -2,21 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "common_test_utils/common_utils.hpp" - -#include "single_layer_tests/space_to_batch.hpp" +#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/space_to_batch.hpp" namespace LayerTestsDefinitions { @@ -56,9 +43,4 @@ void SpaceToBatchLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(s2b)}; function = std::make_shared(results, params, "SpaceToBatch"); } - -TEST_P(SpaceToBatchLayerTest, CompareWithRefs) { - Run(); -} - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/space_to_depth.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/space_to_depth.cpp similarity index 83% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/space_to_depth.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/space_to_depth.cpp index ff61a2ae751..49266bd4db3 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/space_to_depth.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/space_to_depth.cpp @@ -2,26 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "common_test_utils/common_utils.hpp" - -#include "single_layer_tests/space_to_depth.hpp" - -using namespace ngraph::opset3; +#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/single_layer/space_to_depth.hpp" namespace LayerTestsDefinitions { +using namespace ngraph::opset3; + static inline std::string SpaceToDepthModeToString(const SpaceToDepth::SpaceToDepthMode& mode) { static std::map names = { {SpaceToDepth::SpaceToDepthMode::BLOCKS_FIRST, "BLOCKS_FIRST"}, @@ -64,9 +51,4 @@ void SpaceToDepthLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(s2d)}; function = std::make_shared(results, params, "SpaceToDepth"); } - -TEST_P(SpaceToDepthLayerTest, CompareWithRefs) { - Run(); -}; - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/split.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/split.cpp similarity index 82% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/split.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/split.cpp index b2a73675652..a0d0e205839 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/split.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/split.cpp @@ -2,22 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "ie_core.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/split.hpp" +#include "shared_test_classes/single_layer/split.hpp" namespace LayerTestsDefinitions { @@ -70,9 +55,4 @@ void SplitLayerTest::SetUp() { } function = std::make_shared(results, params, "split"); } - -TEST_P(SplitLayerTest, CompareWithRefs) { - Run(); -}; - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/squeeze_unsqueeze.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/squeeze_unsqueeze.cpp similarity index 82% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/squeeze_unsqueeze.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/squeeze_unsqueeze.cpp index 979511140ed..e2a760280a8 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/squeeze_unsqueeze.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/squeeze_unsqueeze.cpp @@ -3,18 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "ie_precision.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/squeeze_unsqueeze.hpp" +#include "shared_test_classes/single_layer/squeeze_unsqueeze.hpp" namespace LayerTestsDefinitions { std::string SqueezeUnsqueezeLayerTest::getTestCaseName(testing::TestParamInfo obj) { @@ -54,9 +43,4 @@ void SqueezeUnsqueezeLayerTest::SetUp() { const ngraph::ResultVector results{std::make_shared(squeeze)}; function = std::make_shared(results, params, "Squeeze"); } - -TEST_P(SqueezeUnsqueezeLayerTest, CompareWithRefs) { - Run(); -} - } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/strided_slice.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/strided_slice.cpp similarity index 86% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/strided_slice.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/strided_slice.cpp index 215da3225a6..4fd9c256262 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/strided_slice.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/strided_slice.cpp @@ -2,21 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include +#include "ngraph_functions/builders.hpp" -#include -#include - -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "common_test_utils/common_utils.hpp" - -#include "single_layer_tests/strided_slice.hpp" +#include "shared_test_classes/single_layer/strided_slice.hpp" namespace LayerTestsDefinitions { @@ -64,8 +52,4 @@ void StridedSliceLayerTest::SetUp() { function = std::make_shared(results, params, "StridedSlice"); } -TEST_P(StridedSliceLayerTest, CompareWithRefs) { - Run(); -} - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/tensor_iterator.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/tensor_iterator.cpp similarity index 96% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/tensor_iterator.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/tensor_iterator.cpp index 4b166d12909..411b3973c3b 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/tensor_iterator.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/tensor_iterator.cpp @@ -2,22 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/skip_tests_config.hpp" - -#include "single_layer_tests/tensor_iterator.hpp" #include +#include "shared_test_classes/single_layer/tensor_iterator.hpp" namespace LayerTestsDefinitions { @@ -235,8 +221,4 @@ namespace LayerTestsDefinitions { m.run_passes(function); } } - - TEST_P(TensorIteratorTest, CompareWithRefs) { - Run(); - }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/tile.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/tile.cpp similarity index 90% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/tile.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/tile.cpp index f5650714e32..d4ce236d9a2 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/tile.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/tile.cpp @@ -2,14 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "single_layer_tests/tile.hpp" - +#include "shared_test_classes/single_layer/tile.hpp" namespace LayerTestsDefinitions { @@ -48,8 +41,4 @@ void TileLayerTest::SetUp() { function = std::make_shared(results, params, "tile"); } -TEST_P(TileLayerTest, CompareWithRefs) { - Run(); -} - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/topk.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/topk.cpp similarity index 94% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/topk.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/topk.cpp index a16f0fe3052..fb59c80fcce 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/topk.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/topk.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "single_layer_tests/topk.hpp" +#include "shared_test_classes/single_layer/topk.hpp" namespace LayerTestsDefinitions { std::string TopKLayerTest::getTestCaseName(testing::TestParamInfo obj) { @@ -52,8 +52,4 @@ void TopKLayerTest::SetUp() { } function = std::make_shared(results, params, "TopK"); } - -TEST_P(TopKLayerTest, CompareWithRefsDynamicBath) { - Run(); -} } // namespace LayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/transpose.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/transpose.cpp similarity index 84% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/transpose.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/transpose.cpp index d743f71367a..d05d90d8ce7 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/transpose.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/transpose.cpp @@ -2,20 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "ie_core.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/transpose.hpp" +#include "shared_test_classes/single_layer/transpose.hpp" namespace LayerTestsDefinitions { @@ -58,8 +45,4 @@ void TransposeLayerTest::SetUp() { function = std::make_shared(results, params, "Transpose"); } -TEST_P(TransposeLayerTest, CompareWithRefs) { - Run(); -}; - } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/variadic_split.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/variadic_split.cpp similarity index 80% rename from inference-engine/tests/functional/plugin/shared/src/single_layer_tests/variadic_split.cpp rename to inference-engine/tests/functional/shared_test_classes/src/single_layer/variadic_split.cpp index f3b7e8c9e82..9922080182b 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/variadic_split.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/variadic_split.cpp @@ -2,22 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "ie_core.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "single_layer_tests/variadic_split.hpp" +#include "shared_test_classes/single_layer/variadic_split.hpp" namespace LayerTestsDefinitions { @@ -63,8 +48,4 @@ namespace LayerTestsDefinitions { function = std::make_shared(results, params, "VariadicSplit"); } - TEST_P(VariadicSplitLayerTest, CompareWithRefs) { - Run(); - } - -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/activation_concats_eltwise.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/activation_concats_eltwise.cpp similarity index 81% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/activation_concats_eltwise.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/activation_concats_eltwise.cpp index ecf97d9acb8..70f947f9bee 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/activation_concats_eltwise.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/activation_concats_eltwise.cpp @@ -1,20 +1,10 @@ // Copyright (C) 2019 Intel Corporation // SPDX-License-Identifier: Apache-2.0 -// -#include -#include -#include -#include -#include -#include "common_test_utils/common_utils.hpp" -#include "common_test_utils/data_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "subgraph_tests/activation_concats_eltwise.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "ngraph_functions/builders.hpp" -namespace LayerTestsDefinitions { +#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/subgraph/activation_concats_eltwise.hpp" + +namespace SubgraphTestsDefinitions { using namespace CommonTestUtils; using namespace InferenceEngine; @@ -62,8 +52,4 @@ void ActivationConcatsEltwise::SetUp() { auto final_reshape = std::make_shared(eltw, reshape_pattern, false); function = std::make_shared(final_reshape, input, "ActivationConcatsEltwise"); } - -TEST_P(ActivationConcatsEltwise, CompareWithRefs) { - Run(); -} -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/basic_lstm.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/basic_lstm.cpp similarity index 66% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/basic_lstm.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/basic_lstm.cpp index 077a5e4db85..d0ab98bdc30 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/basic_lstm.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/basic_lstm.cpp @@ -2,27 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include -#include - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "ngraph_functions/pass/convert_prc.hpp" -#include "transformations/control_flow/unroll_tensor_iterator.hpp" -#include "transformations/common_optimizations/low_latency.hpp" - -#include "subgraph_tests/basic_lstm.hpp" - +#include +#include "shared_test_classes/subgraph/basic_lstm.hpp" #include "ngraph_functions/builders.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string Basic_LSTM_S::getTestCaseName(testing::TestParamInfo obj) { InferenceEngine::Precision netPrecision; @@ -54,10 +38,10 @@ void Basic_LSTM_S::SetUp() { } std::shared_ptr Basic_LSTM_S::GetNetwork(size_t thirdDimOut, - size_t hiddenSize, - const InferenceEngine::Precision& netPrecission, - std::vector* hidden_memory_init_out, - std::vector* cell_memory_init_out) { + size_t hiddenSize, + const InferenceEngine::Precision& netPrecission, + std::vector* hidden_memory_init_out, + std::vector* cell_memory_init_out) { auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecission); auto params = ngraph::builder::makeParams(ngPrc, { {1, 10 * thirdDimOut} }); @@ -181,57 +165,4 @@ std::vector> Basic_LSTM_S::CalculateRefs() { return referenceOutputs; } -TEST_P(Basic_LSTM_S, CompareWithRefImpl) { - Run(); -}; - -TEST_P(Basic_LSTM_S, CompareWithRefImpl_LowLatencyTransformation) { - InferenceEngine::TensorDesc state_description(InferenceEngine::Precision::FP32, - InferenceEngine::SizeVector({1, hidden_size}), - InferenceEngine::Layout::NC); - // Reshape - auto params = ngraph::builder::makeParams(function->get_parameters().at(0)->get_element_type(), { {1, 49} }); - function->replace_parameter(0, params[0]); - - // todo: it is better to modify the model -> use ShapeOf() and Gather() - std::vector outFormShapes1 = { 1, 1, 49 }; - auto pattern1 = std::make_shared(ngraph::element::Type_t::i64, ngraph::Shape{3}, outFormShapes1); - auto param_target_inputs = function->get_parameters().at(0)->output(0).get_target_inputs(); - - // replace hardcoded shape - for (const auto& target : param_target_inputs.begin()->get_node()->input(1).get_source_output().get_target_inputs()) { - target.replace_source_output(pattern1); - } - function->validate_nodes_and_infer_types(); - - // Calculate References for the network before transformation passes - auto referenceOutputs = CalculateRefs(); - - // Apply LowLatency and UnrollTensorIterator transformations - ngraph::pass::Manager manager; - manager.register_pass(); // LowLatency enables UnrollTI - manager.run_passes(function); - LoadNetwork(); - IE_SUPPRESS_DEPRECATED_START - auto states = executableNetwork.QueryState(); - for (auto& state : states) { - auto name = state.GetName(); - if (name.find("cell_state_1") != std::string::npos) { - auto blob = FuncTestUtils::createAndFillBlobWithFloatArray(state_description, - cell_memory_init.data(), cell_memory_init.size()); - state.SetState(blob); - } else if (name.find("hidden_state_1") != std::string::npos) { - auto blob = FuncTestUtils::createAndFillBlobWithFloatArray(state_description, - hidden_memory_init.data(), hidden_memory_init.size()); - state.SetState(blob); - } else { - GTEST_FAIL() << "unknown memory state"; - } - } - IE_SUPPRESS_DEPRECATED_END - // Run and compare - Infer(); - const auto& actualOutputs = GetOutputs(); - Compare(referenceOutputs, actualOutputs); -}; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/broadcast_power.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/broadcast_power.cpp similarity index 85% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/broadcast_power.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/broadcast_power.cpp index 3fd88279fce..8af1e2d4b2d 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/broadcast_power.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/broadcast_power.cpp @@ -2,13 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "subgraph_tests/broadcast_power.hpp" +#include "shared_test_classes/subgraph/broadcast_power.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string BroadcastPowerTest::getTestCaseName(testing::TestParamInfo obj) { InferenceEngine::Precision netPrecision; std::string targetDevice; @@ -45,8 +41,4 @@ void BroadcastPowerTest::SetUp() { auto reshape_2 = std::make_shared(sum, reshape_pattern_2, false); function = std::make_shared(reshape_2, params, "BroadcastPowerPass"); } - -TEST_P(BroadcastPowerTest, CompareWithRefImpl) { - Run(); -}; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/cascade_concat.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/cascade_concat.cpp similarity index 90% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/cascade_concat.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/cascade_concat.cpp index 53b20a7e869..29b160da341 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/cascade_concat.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/cascade_concat.cpp @@ -1,13 +1,10 @@ // Copyright (C) 2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 // -#include -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "subgraph_tests/cascade_concat.hpp" -namespace LayerTestsDefinitions { +#include "shared_test_classes/subgraph/cascade_concat.hpp" + +namespace SubgraphTestsDefinitions { std::string CascadeConcat::getTestCaseName(const testing::TestParamInfo &obj) { std::vector> input1, input2, input3; @@ -59,8 +56,4 @@ void CascadeConcat::SetUp() { } function = std::make_shared(results, input, "concat_reshape_reshape_concat_mul"); } - -TEST_P(CascadeConcat, CompareWithRefs) { - Run(); -} -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/concat_multi_input.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/concat_multi_input.cpp similarity index 86% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/concat_multi_input.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/concat_multi_input.cpp index 8c51603c381..4e29db92b5a 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/concat_multi_input.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/concat_multi_input.cpp @@ -2,25 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include - -#include - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" - -#include "ngraph_functions/pass/convert_prc.hpp" - -#include "subgraph_tests/concat_multi_input.hpp" - - -namespace LayerTestsDefinitions { +#include "shared_test_classes/subgraph/concat_multi_input.hpp" +namespace SubgraphTestsDefinitions { std::string ConcatMultiInput::getTestCaseName(testing::TestParamInfo obj) { std::vector> inputShapes; @@ -121,14 +105,4 @@ void ConcatMultiInput::GenerateConstOnlyModel() { function = std::make_shared(results, input_vector, "ConcatConstOnly"); } -TEST_P(ConcatMultiInput, CompareWithRefStridedSlice) { - GenerateStridedSliceModel(); - Run(); -}; - -TEST_P(ConcatMultiInput, CompareWithRefConstOnly) { - GenerateConstOnlyModel(); - Run(); -}; - -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/concat_qunatization.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/concat_qunatization.cpp similarity index 77% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/concat_qunatization.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/concat_qunatization.cpp index 6ded72df083..c9b45485854 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/concat_qunatization.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/concat_qunatization.cpp @@ -2,20 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include +#include "shared_test_classes/subgraph/concat_quantization.hpp" -#include - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" - -#include "subgraph_tests/concat_quantization.hpp" - - -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string ConcatQuantization::getTestCaseName(testing::TestParamInfo obj) { InferenceEngine::Precision netPrecision; @@ -68,20 +57,4 @@ void ConcatQuantization::SetUp() { ngraph::ResultVector results{std::make_shared(concat)}; function = std::make_shared(results, params, "ConcatQuantization"); } - -TEST_P(ConcatQuantization, CompareWithRefImpl) { - InferenceEngine::Core* core = PluginCache::get().ie(targetDevice).get(); - if (!configuration.empty()) { - core->SetConfig(configuration, targetDevice); - } - - try { - InferenceEngine::CNNNetwork cnnNetwork = InferenceEngine::CNNNetwork{ function }; - executableNetwork = core->LoadNetwork(cnnNetwork, targetDevice); - } - catch (InferenceEngine::details::InferenceEngineException ex) { - FAIL() << ex.what(); - } -}; - -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/constant_result.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/constant_result.cpp similarity index 84% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/constant_result.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/constant_result.cpp index bd54c89c6bd..a6fc6c11ed8 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/constant_result.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/constant_result.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "subgraph_tests/constant_result.hpp" +#include "shared_test_classes/subgraph/constant_result.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string ConstantResultSubgraphTest::getTestCaseName(testing::TestParamInfo obj) { std::string targetDevice; @@ -28,9 +28,5 @@ void ConstantResultSubgraphTest::SetUp() { function = std::make_shared(results, params, "ConstResult"); } -TEST_P(ConstantResultSubgraphTest, CompareWithRefs) { - Run(); -} - -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/conv_eltwise_fusion.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/conv_eltwise_fusion.cpp similarity index 87% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/conv_eltwise_fusion.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/conv_eltwise_fusion.cpp index c5d4a755b29..df3462318a1 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/conv_eltwise_fusion.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/conv_eltwise_fusion.cpp @@ -1,17 +1,14 @@ // Copyright (C) 2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 // -#include -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "subgraph_tests/conv_eltwise_fusion.hpp" -#include -#include -#include -#include -namespace LayerTestsDefinitions { +#include "transformations/common_optimizations/conv_mul_fusion.hpp" +#include "transformations/op_conversions/convert_convolutions.hpp" +#include "transformations/common_optimizations/conv_bias_fusion.hpp" +#include "ngraph/pass/constant_folding.hpp" +#include "shared_test_classes/subgraph/conv_eltwise_fusion.hpp" + +namespace SubgraphTestsDefinitions { std::string ConvEltwiseFusion::getTestCaseName(const testing::TestParamInfo &obj) { ngraph::NodeTypeInfo conv_type, eltwise_type; @@ -89,8 +86,4 @@ void ConvEltwiseFusion::SetUp() { ASSERT_EQ(cloned_function->get_ops().size(), expected_number_of_ops); } - -TEST_P(ConvEltwiseFusion, CompareWithRefs) { - Run(); -} -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/convert_pad_to_group_conv.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/convert_pad_to_group_conv.cpp similarity index 83% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/convert_pad_to_group_conv.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/convert_pad_to_group_conv.cpp index 4d28a166a24..027d2c7fb8b 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/convert_pad_to_group_conv.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/convert_pad_to_group_conv.cpp @@ -1,13 +1,10 @@ // Copyright (C) 2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 // -#include -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "subgraph_tests/convert_pad_to_group_conv.hpp" -namespace LayerTestsDefinitions { +#include "shared_test_classes/subgraph/convert_pad_to_group_conv.hpp" + +namespace SubgraphTestsDefinitions { std::string ConvertPadToConvTests::getTestCaseName(const testing::TestParamInfo &obj) { ngraph::Shape input_shape; @@ -44,8 +41,4 @@ void ConvertPadToConvTests::SetUp() { function = std::make_shared(ngraph::OutputVector{relu}, ngraph::ParameterVector{param}, "pad"); } } - -TEST_P(ConvertPadToConvTests, CompareWithRefs) { - Run(); -} -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/delayed_copy_layer.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/delayed_copy_layer.cpp similarity index 88% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/delayed_copy_layer.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/delayed_copy_layer.cpp index 7180cacb4ac..43aba42012e 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/delayed_copy_layer.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/delayed_copy_layer.cpp @@ -1,17 +1,9 @@ // Copyright (C) 2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "subgraph_tests/delayed_copy_layer.hpp" +#include "shared_test_classes/subgraph/delayed_copy_layer.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string DelayedCopyTest::getTestCaseName(const testing::TestParamInfo &obj) { InferenceEngine::Precision netPrecision; std::string targetName; @@ -76,7 +68,4 @@ namespace LayerTestsDefinitions { Validate(); } - TEST_P(DelayedCopyTest, CompareWithRefs) { - Run(); -}; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/first_connect_input_concat.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/first_connect_input_concat.cpp similarity index 74% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/first_connect_input_concat.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/first_connect_input_concat.cpp index 01e8fbc91d6..597dcfd7cd7 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/first_connect_input_concat.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/first_connect_input_concat.cpp @@ -2,24 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include - -#include - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" - -#include "ngraph_functions/pass/convert_prc.hpp" - -#include "subgraph_tests/first_connect_input_concat.hpp" +#include "shared_test_classes/subgraph/first_connect_input_concat.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string ConcatFirstInputTest::getTestCaseName(testing::TestParamInfo obj) { std::vector> inputShapes; @@ -51,8 +37,4 @@ void ConcatFirstInputTest::SetUp() { function = std::make_shared(results, params, "ConcatMultiInput"); } - -TEST_P(ConcatFirstInputTest, CompareWithRefImpl) { - Run(); -}; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/get_output_before_activation.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/get_output_before_activation.cpp similarity index 84% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/get_output_before_activation.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/get_output_before_activation.cpp index 3f7207ad4c4..6c8450482af 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/get_output_before_activation.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/get_output_before_activation.cpp @@ -1,21 +1,8 @@ // Copyright (C) 2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 -#include -#include -#include -#include -#include -#include -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "ngraph_functions/pass/convert_prc.hpp" - -#include "ngraph_functions/utils/ngraph_helpers.hpp" #include "ngraph_functions/builders.hpp" -#include "subgraph_tests/get_output_before_activation.hpp" +#include "shared_test_classes/subgraph/get_output_before_activation.hpp" namespace SubgraphTestsDefinitions { std::ostream& operator<<(std::ostream& os, const midOutputType& oType) { @@ -89,8 +76,4 @@ void OutputBeforeActivation::SetUp() { InferenceEngine::Blob::Ptr OutputBeforeActivation::GenerateInput(const InferenceEngine::InputInfo &info) const { return FuncTestUtils::createAndFillBlob(info.getTensorDesc(), 2, -1, 100); } - -TEST_P(OutputBeforeActivation, CompareWithRefs) { - Run(); -}; } // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/handling_orientation_conv.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/handling_orientation_conv.cpp similarity index 89% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/handling_orientation_conv.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/handling_orientation_conv.cpp index be38326f132..5b09e39de5c 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/handling_orientation_conv.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/handling_orientation_conv.cpp @@ -1,16 +1,10 @@ // Copyright (C) 2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "subgraph_tests/handling_orientation_conv.hpp" -namespace LayerTestsDefinitions { +#include "shared_test_classes/subgraph/handling_orientation_conv.hpp" + +namespace SubgraphTestsDefinitions { std::string HandlingOrientationClass::getTestCaseName(const testing::TestParamInfo &obj) { InferenceEngine::Precision netPrecision; std::string targetName; @@ -60,8 +54,4 @@ namespace LayerTestsDefinitions { std::make_shared(reshape4)}; function = std::make_shared(results, params, "RemovePermutationPass"); } - - TEST_P(HandlingOrientationClass, CompareWithRefs){ - Run(); - }; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/input_conv.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/input_conv.cpp similarity index 88% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/input_conv.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/input_conv.cpp index 9dc052a5956..adceb26d194 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/input_conv.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/input_conv.cpp @@ -2,24 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "ngraph_functions/pass/convert_prc.hpp" - -#include "subgraph_tests/input_conv.hpp" - +#include "shared_test_classes/subgraph/input_conv.hpp" #include "ngraph_functions/builders.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string InputConvTest::getTestCaseName(testing::TestParamInfo obj) { InferenceEngine::Precision netPrecision; @@ -110,9 +96,4 @@ void InputConvTest::SetUp() { function = std::make_shared(results, params, "InputConvTest"); } } - -TEST_P(InputConvTest, CompareWithRefImpl) { - Run(); -}; - -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/matmul_squeeze_add.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/matmul_squeeze_add.cpp similarity index 82% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/matmul_squeeze_add.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/matmul_squeeze_add.cpp index 05f65ebfb35..7cb45319172 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/matmul_squeeze_add.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/matmul_squeeze_add.cpp @@ -2,24 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "ngraph_functions/pass/convert_prc.hpp" - -#include "subgraph_tests/matmul_squeeze_add.hpp" - +#include "shared_test_classes/subgraph/matmul_squeeze_add.hpp" #include "ngraph_functions/builders.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string MatmulSqueezeAddTest::getTestCaseName(testing::TestParamInfo obj) { InferenceEngine::Precision netPrecision; @@ -70,9 +56,4 @@ void MatmulSqueezeAddTest::SetUp() { ngraph::ResultVector results {std::make_shared(squeeze_0)}; function = std::make_shared(results, params, "MatmulSqueezeAddTest"); } - -TEST_P(MatmulSqueezeAddTest, CompareWithRefImpl) { - Run(); -}; - -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/memory_LSTMCell.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/memory_LSTMCell.cpp similarity index 94% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/memory_LSTMCell.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/memory_LSTMCell.cpp index 1f3dc9ffcc1..20b522ed19b 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/memory_LSTMCell.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/memory_LSTMCell.cpp @@ -2,27 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include +#include +#include -#include "ie_core.hpp" - -#include "ie_transformations.hpp" -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "ngraph/pass/low_latency.hpp" #include "ngraph_functions/builders.hpp" - -#include -#include "transformations/control_flow/unroll_tensor_iterator.hpp" -#include "transformations/common_optimizations/low_latency.hpp" -#include "subgraph_tests/memory_LSTMCell.hpp" +#include "shared_test_classes/subgraph/memory_LSTMCell.hpp" namespace SubgraphTestsDefinitions { @@ -291,7 +276,7 @@ namespace SubgraphTestsDefinitions { cnnNetwork = InferenceEngine::CNNNetwork{function}; InferenceEngine::LowLatency(cnnNetwork); ConfigureNetwork(); - executableNetwork = core->LoadNetwork(cnnNetwork, targetDevice, configuration); + executableNetwork = core->LoadNetwork(static_cast(cnnNetwork), targetDevice, configuration); } else { // Apply LowLatency (insert Assigns/ReadValues) and UnrollTensorIterator ngraph::pass::Manager manager; @@ -324,16 +309,4 @@ namespace SubgraphTestsDefinitions { manager_2.run_passes(function); Validate(); } - - TEST_P(MemoryLSTMCellTest, CompareWithRefs) { - Run(); - }; - - TEST_P(MemoryLSTMCellTest, CompareWithRefs_LowLatencyTransformation) { - RunLowLatency(); - }; - - TEST_P(MemoryLSTMCellTest, CompareWithRefs_LowLatencyRegularAPITransformation) { - RunLowLatency(true); - }; } // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/memory_eltwise_reshape_concat.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/memory_eltwise_reshape_concat.cpp similarity index 91% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/memory_eltwise_reshape_concat.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/memory_eltwise_reshape_concat.cpp index a1754b04157..985252c06a4 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/memory_eltwise_reshape_concat.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/memory_eltwise_reshape_concat.cpp @@ -2,24 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" -#include "ngraph_functions/builders.hpp" #include -#include "subgraph_tests/memory_eltwise_reshape_concat.hpp" + +#include "ngraph_functions/builders.hpp" +#include "shared_test_classes/subgraph/memory_eltwise_reshape_concat.hpp" namespace SubgraphTestsDefinitions { @@ -145,8 +132,4 @@ void MemoryEltwiseReshapeConcatTest::Run() { initNgraphFriendlyModel(); Validate(); } - -TEST_P(MemoryEltwiseReshapeConcatTest, CompareWithRefs) { - Run(); -}; } // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/multioutput_eltwise_squeeze_eltwise.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/multioutput_eltwise_squeeze_eltwise.cpp similarity index 84% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/multioutput_eltwise_squeeze_eltwise.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/multioutput_eltwise_squeeze_eltwise.cpp index 6ad09862dce..d95b33eb7af 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/multioutput_eltwise_squeeze_eltwise.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/multioutput_eltwise_squeeze_eltwise.cpp @@ -1,17 +1,9 @@ // Copyright (C) 2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "subgraph_tests/multioutput_eltwise_squeeze_eltwise.hpp" +#include "shared_test_classes/subgraph/multioutput_eltwise_squeeze_eltwise.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string MultioutputEltwiseReshapeEltwise::getTestCaseName(const testing::TestParamInfo &obj) { std::vector> input; InferenceEngine::Precision netPrecision; @@ -49,8 +41,4 @@ namespace LayerTestsDefinitions { std::make_shared(eltwise3)}; function = std::make_shared(results, input, "eltwise_reshape_eltwise_multioutput"); } - - TEST_P(MultioutputEltwiseReshapeEltwise, CompareWithRefs){ - Run(); - }; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/multiple_LSTMCell.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/multiple_LSTMCell.cpp similarity index 96% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/multiple_LSTMCell.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/multiple_LSTMCell.cpp index f52d1a95af1..1bb7454a53b 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/multiple_LSTMCell.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/multiple_LSTMCell.cpp @@ -2,28 +2,14 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include +#include "ngraph/pass/low_latency.hpp" -#include "ie_core.hpp" +#include "ie_transformations.hpp" +#include "transformations/control_flow/unroll_tensor_iterator.hpp" -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" #include "ngraph_functions/builders.hpp" -#include -#include -#include -#include "transformations/control_flow/unroll_tensor_iterator.hpp" -#include "transformations/common_optimizations/low_latency.hpp" -#include "subgraph_tests/multiple_LSTMCell.hpp" +#include "shared_test_classes/subgraph/multiple_LSTMCell.hpp" namespace SubgraphTestsDefinitions { std::string MultipleLSTMCellTest::getTestCaseName(const testing::TestParamInfo &obj) { @@ -486,16 +472,4 @@ void MultipleLSTMCellTest::RunLowLatency(bool regular_api) { manager_2.run_passes(function); Validate(); } - -TEST_P(MultipleLSTMCellTest, CompareWithRefs) { - Run(); -}; - -TEST_P(MultipleLSTMCellTest, CompareWithRefs_LowLatencyTransformation) { - RunLowLatency(); -}; - -TEST_P(MultipleLSTMCellTest, CompareWithRefs_LowLatencyRegularAPITransformation) { - RunLowLatency(true); -}; } // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/multiple_concat.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/multiple_concat.cpp similarity index 80% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/multiple_concat.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/multiple_concat.cpp index 01291111b5f..d9b57e0a6c6 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/multiple_concat.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/multiple_concat.cpp @@ -2,22 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" #include "ngraph_functions/builders.hpp" -#include "subgraph_tests/multiple_concat.hpp" +#include "shared_test_classes/subgraph/multiple_concat.hpp" namespace SubgraphTestsDefinitions { @@ -64,8 +50,4 @@ void MultipleConcatTest::SetUp() { function = std::make_shared(act, input_parameter, "multiple_concat"); } - -TEST_P(MultipleConcatTest, CompareWithRefs) { - Run(); -}; } // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/multiply_add.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/multiply_add.cpp similarity index 75% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/multiply_add.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/multiply_add.cpp index 1be404d6396..9ee694f9e9d 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/multiply_add.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/multiply_add.cpp @@ -2,23 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include -#include "ie_core.hpp" +#include "shared_test_classes/subgraph/multiply_add.hpp" -#include "subgraph_tests/multiply_add.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/skip_tests_config.hpp" - -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string MultiplyAddLayerTest::getTestCaseName(const testing::TestParamInfo &obj) { std::vector inputShapes; InferenceEngine::Precision netPrecision; @@ -51,8 +37,4 @@ void MultiplyAddLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(add)}; function = std::make_shared(results, params, "multiplyAdd"); } - -TEST_P(MultiplyAddLayerTest, CompareWithRefs) { - Run(); -}; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/negative_memory_layer_offset.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/negative_memory_layer_offset.cpp similarity index 90% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/negative_memory_layer_offset.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/negative_memory_layer_offset.cpp index d1efd0eff1b..ee715e0ce96 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/negative_memory_layer_offset.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/negative_memory_layer_offset.cpp @@ -1,17 +1,10 @@ // Copyright (C) 2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "subgraph_tests/negative_memory_layer_offset.hpp" -namespace LayerTestsDefinitions { +#include "shared_test_classes/subgraph/negative_memory_layer_offset.hpp" + +namespace SubgraphTestsDefinitions { std::string NegativeMemoryOffsetTest::getTestCaseName(const testing::TestParamInfo& obj) { InferenceEngine::Precision netPrecision; std::string targetName; @@ -96,8 +89,4 @@ namespace LayerTestsDefinitions { switchToNgraphFriendlyModel(); Validate(); } - - TEST_P(NegativeMemoryOffsetTest, CompareWithRefs) { - Run(); - }; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/perm_conv_perm_concat.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/perm_conv_perm_concat.cpp similarity index 92% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/perm_conv_perm_concat.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/perm_conv_perm_concat.cpp index b816e3aeace..8ec5bb0ccac 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/perm_conv_perm_concat.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/perm_conv_perm_concat.cpp @@ -1,16 +1,7 @@ // Copyright (C) 2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 -#include -#include -#include -#include -#include -#include -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "subgraph_tests/perm_conv_perm_concat.hpp" +#include "shared_test_classes/subgraph/perm_conv_perm_concat.hpp" namespace SubgraphTestsDefinitions { std::string PermConvPermConcat::getTestCaseName(testing::TestParamInfo obj) { @@ -115,8 +106,4 @@ void PermConvPermConcat::Run() { Validate(); } - -TEST_P(PermConvPermConcat, CompareWithRefs) { - Run(); -} } // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/quantized_convolution_backprop_data.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/quantized_convolution_backprop_data.cpp similarity index 87% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/quantized_convolution_backprop_data.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/quantized_convolution_backprop_data.cpp index 2e265454425..6f3ed8ce463 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/quantized_convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/quantized_convolution_backprop_data.cpp @@ -2,26 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "subgraph_tests/quantized_convolution_backprop_data.hpp" +#include "shared_test_classes/subgraph/quantized_convolution_backprop_data.hpp" +namespace SubgraphTestsDefinitions { using ngraph::helpers::QuantizationGranularity; -namespace LayerTestsDefinitions { - std::string QuantConvBackpropDataLayerTest::getTestCaseName(testing::TestParamInfo obj) { quantConvBackpropDataSpecificParams groupConvBackpropDataParams; InferenceEngine::Precision netPrecision; @@ -93,8 +78,4 @@ void QuantConvBackpropDataLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(convBackpropData)}; function = std::make_shared(results, params, "QuantConvolutionBackpropData"); } - -TEST_P(QuantConvBackpropDataLayerTest, CompareWithRefs) { - Run(); -} -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/quantized_group_convolution.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/quantized_group_convolution.cpp similarity index 88% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/quantized_group_convolution.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/quantized_group_convolution.cpp index 0f86ef693ee..032c394a0ca 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/quantized_group_convolution.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/quantized_group_convolution.cpp @@ -2,25 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "subgraph_tests/quantized_group_convolution.hpp" +#include "shared_test_classes/subgraph/quantized_group_convolution.hpp" using ngraph::helpers::QuantizationGranularity; -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string QuantGroupConvLayerTest::getTestCaseName(testing::TestParamInfo obj) { quantGroupConvSpecificParams groupConvParams; @@ -107,8 +93,4 @@ void QuantGroupConvLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(groupConv)}; function = std::make_shared(results, params, "QuantGroupConvolution"); } - -TEST_P(QuantGroupConvLayerTest, CompareWithRefs) { - Run(); -} -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/quantized_group_convolution_backprop_data.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/quantized_group_convolution_backprop_data.cpp similarity index 88% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/quantized_group_convolution_backprop_data.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/quantized_group_convolution_backprop_data.cpp index 545084c9e2a..007185bbfd0 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/quantized_group_convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/quantized_group_convolution_backprop_data.cpp @@ -2,26 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "subgraph_tests/quantized_group_convolution_backprop_data.hpp" +#include "shared_test_classes/subgraph/quantized_group_convolution_backprop_data.hpp" +namespace SubgraphTestsDefinitions { using ngraph::helpers::QuantizationGranularity; -namespace LayerTestsDefinitions { - std::string QuantGroupConvBackpropDataLayerTest::getTestCaseName(testing::TestParamInfo obj) { quantGroupConvBackpropDataSpecificParams groupConvBackpropDataParams; InferenceEngine::Precision netPrecision; @@ -99,8 +84,4 @@ void QuantGroupConvBackpropDataLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(groupConvBackpropData)}; function = std::make_shared(results, params, "QuantGroupConvolutionBackpropData"); } - -TEST_P(QuantGroupConvBackpropDataLayerTest, CompareWithRefs) { - Run(); -} -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/quantized_mat_mul.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/quantized_mat_mul.cpp similarity index 92% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/quantized_mat_mul.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/quantized_mat_mul.cpp index f35992c7eef..a1c55c0357b 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/quantized_mat_mul.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/quantized_mat_mul.cpp @@ -2,18 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - -#include "subgraph_tests/quantized_mat_mul.hpp" +#include "shared_test_classes/subgraph/quantized_mat_mul.hpp" #include "ngraph_functions/builders.hpp" -using ngraph::helpers::QuantizationGranularity; +namespace SubgraphTestsDefinitions { -namespace LayerTestsDefinitions { +using ngraph::helpers::QuantizationGranularity; std::string QuantMatMulTest::getTestCaseName(const testing::TestParamInfo &obj) { QuantParams quantParams; @@ -80,9 +74,4 @@ void QuantMatMulTest::SetUp() { ngraph::ResultVector results{std::make_shared(MatMul)}; function = std::make_shared(results, params, "QuantMatMul"); } - -TEST_P(QuantMatMulTest, CompareWithRefs) { - Run(); -}; - -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/range_add.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/range_add.cpp similarity index 92% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/range_add.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/range_add.cpp index 6ea03edde43..751e1b441a0 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/range_add.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/range_add.cpp @@ -2,13 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "subgraph_tests/range_add.hpp" +#include "shared_test_classes/subgraph/range_add.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { // ------------------------------ V0 ------------------------------ -std::string RangeAddSubgraphTest::getTestCaseName(testing::TestParamInfo obj) { +std::string RangeAddSubgraphTest::getTestCaseName(testing::TestParamInfo obj) { InferenceEngine::Precision netPrecision; InferenceEngine::Precision inPrc, outPrc; InferenceEngine::Layout inLayout, outLayout; @@ -43,13 +43,9 @@ void RangeAddSubgraphTest::SetUp() { function = std::make_shared(results, params, "RangeEltwise"); } -TEST_P(RangeAddSubgraphTest, CompareWithRefs) { - Run(); -} - // ------------------------------ V4 ------------------------------ -std::string RangeNumpyAddSubgraphTest::getTestCaseName(testing::TestParamInfo obj) { +std::string RangeNumpyAddSubgraphTest::getTestCaseName(testing::TestParamInfo obj) { InferenceEngine::Precision netPrc; InferenceEngine::Precision constPrc; InferenceEngine::Precision outPrc; @@ -87,9 +83,4 @@ void RangeNumpyAddSubgraphTest::SetUp() { const ngraph::ResultVector results{std::make_shared(eltwise)}; function = std::make_shared(results, params, "RangeEltwise"); } - -TEST_P(RangeNumpyAddSubgraphTest, CompareWithRefs) { - Run(); -} - -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/relu_shape_of.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/relu_shape_of.cpp similarity index 85% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/relu_shape_of.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/relu_shape_of.cpp index 4edd6bf6472..bc5c6e6b929 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/relu_shape_of.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/relu_shape_of.cpp @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "subgraph_tests/relu_shape_of.hpp" +#include "shared_test_classes/subgraph/relu_shape_of.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { - std::string ReluShapeOfSubgraphTest::getTestCaseName(testing::TestParamInfo obj) { + std::string ReluShapeOfSubgraphTest::getTestCaseName(testing::TestParamInfo obj) { InferenceEngine::SizeVector inputShapes; InferenceEngine::Precision inputPrecision; std::string targetDevice; @@ -29,8 +29,4 @@ namespace LayerTestsDefinitions { const ngraph::ResultVector results{std::make_shared(shapeOf)}; function = std::make_shared(results, param, "ReluShapeOf"); } - -TEST_P(ReluShapeOfSubgraphTest, CompareWithRefs) { - Run(); -} -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace SubgraphTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/reshape_permute_conv_permute_reshape_act.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/reshape_permute_conv_permute_reshape_act.cpp similarity index 90% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/reshape_permute_conv_permute_reshape_act.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/reshape_permute_conv_permute_reshape_act.cpp index e1951c88755..0157f720716 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/reshape_permute_conv_permute_reshape_act.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/reshape_permute_conv_permute_reshape_act.cpp @@ -1,18 +1,9 @@ // Copyright (C) 2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 -#include -#include -#include -#include -#include -#include -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "subgraph_tests/reshape_permute_conv_permute_reshape_act.hpp" +#include "shared_test_classes/subgraph/reshape_permute_conv_permute_reshape_act.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string ConvReshapeAct::getTestCaseName(testing::TestParamInfo obj) { InferenceEngine::Precision netPrecision; std::string targetName; @@ -112,8 +103,4 @@ namespace LayerTestsDefinitions { threshold = 0.1; Validate(); } - - TEST_P(ConvReshapeAct, CompareWithRefs) { - Run(); - } -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/reshape_permute_reshape.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/reshape_permute_reshape.cpp similarity index 85% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/reshape_permute_reshape.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/reshape_permute_reshape.cpp index d149da0d645..4620bbe8b0c 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/reshape_permute_reshape.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/reshape_permute_reshape.cpp @@ -1,17 +1,10 @@ // Copyright (C) 2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 -#include -#include -#include -#include #include -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "subgraph_tests/reshape_permute_reshape.hpp" +#include "shared_test_classes/subgraph/reshape_permute_reshape.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string ReshapePermuteReshape::getTestCaseName(const testing::TestParamInfo &obj) { std::vector> input; InferenceEngine::Precision netPrecision; @@ -47,8 +40,4 @@ namespace LayerTestsDefinitions { auto reshape2 = std::make_shared(permute, reshape2_pattern, false); function = std::make_shared(reshape2, input, "reshape_permute_reshape"); } - - TEST_P(ReshapePermuteReshape, CompareWithRefs) { - Run(); - } -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/reshape_squeeze_reshape_relu.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/reshape_squeeze_reshape_relu.cpp similarity index 85% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/reshape_squeeze_reshape_relu.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/reshape_squeeze_reshape_relu.cpp index c29e1c4f8d2..573a022b07d 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/reshape_squeeze_reshape_relu.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/reshape_squeeze_reshape_relu.cpp @@ -1,17 +1,11 @@ // Copyright (C) 2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "subgraph_tests/reshape_squeeze_reshape_relu.hpp" -namespace LayerTestsDefinitions { +#include +#include "shared_test_classes/subgraph/reshape_squeeze_reshape_relu.hpp" + +namespace SubgraphTestsDefinitions { std::string ReshapeSqueezeReshapeRelu::getTestCaseName(const testing::TestParamInfo &obj) { ShapeAxesTuple squeezeShape; InferenceEngine::Precision netPrecision; @@ -51,8 +45,4 @@ namespace LayerTestsDefinitions { function = std::make_shared(func, input, "reshape_squeeze_reshape_relu"); } - - TEST_P(ReshapeSqueezeReshapeRelu, CompareWithRefs){ - Run(); - }; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/scale_shift.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/scale_shift.cpp similarity index 86% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/scale_shift.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/scale_shift.cpp index b31280766ce..ae95e5e6ed2 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/scale_shift.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/scale_shift.cpp @@ -2,13 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 // -#include #include "ngraph_functions/builders.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "subgraph_tests/scaleshift.hpp" +#include "shared_test_classes/subgraph/scaleshift.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string ScaleShiftLayerTest::getTestCaseName(const testing::TestParamInfo &obj) { std::vector> inputShapes; InferenceEngine::Precision netPrecision; @@ -41,8 +38,4 @@ namespace LayerTestsDefinitions { auto add = std::make_shared(mul, add_const); function = std::make_shared(add, paramsIn, "scale_shift"); } - - TEST_P(ScaleShiftLayerTest, CompareWithRefs){ - Run(); - }; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/softsign.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/softsign.cpp similarity index 84% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/softsign.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/softsign.cpp index 47ffe1eb418..45f69e10852 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/softsign.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/softsign.cpp @@ -2,24 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "ngraph_functions/pass/convert_prc.hpp" #include -#include "subgraph_tests/softsign.hpp" - +#include "shared_test_classes/subgraph/softsign.hpp" #include "ngraph_functions/builders.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string SoftsignTest::getTestCaseName(testing::TestParamInfo obj) { InferenceEngine::Precision netPrecision; @@ -83,9 +70,4 @@ std::shared_ptr SoftsignTest::GenerateNgraphFriendlySoftSign() ngraph::ResultVector results{ std::make_shared(mul) }; return std::make_shared(results, params, "SoftSignTest"); } - -TEST_P(SoftsignTest, CompareWithRefImpl) { - Run(); -}; - -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/split_concat_memory.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/split_concat_memory.cpp similarity index 62% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/split_concat_memory.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/split_concat_memory.cpp index 98518f9c551..fb2ce486f16 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/split_concat_memory.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/split_concat_memory.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "subgraph_tests/split_concat_memory.hpp" +#include "shared_test_classes/subgraph/split_concat_memory.hpp" #include "common_test_utils/xml_net_builder/ir_net.hpp" -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { using namespace CommonTestUtils; using namespace InferenceEngine; @@ -79,58 +79,4 @@ void SplitConcatMemory::SetUp() { ngraph::ParameterVector {input}, "CyclicBuffer4"); } - -TEST_P(SplitConcatMemory, cyclicBufferCorrectness) { - auto ie = PluginCache::get().ie(); - cnnNetwork = InferenceEngine::CNNNetwork{function}; - - auto exe_net = ie->LoadNetwork(cnnNetwork, "CPU"); - auto inf_reg = exe_net.CreateInferRequest(); - - /* - * cnc1 out | mem | In|q - * |===============| - * iter_1 | 0 | 0 | 0 | 1 | - * iter_2 | 0 | 0 | 1 | 2 | - * iter 3 | 0 | 1 | 2 | 3 | - */ - - auto i_blob = inf_reg.GetBlob("input"); - auto o_blob = inf_reg.GetBlob("plus_one"); - - auto o_blob_ref = make_blob_with_precision(o_blob->getTensorDesc()); - o_blob_ref->allocate(); - - auto fill_by_quarter = [this] (Blob::Ptr& blob, std::vector vals) { - IE_ASSERT(vals.size() == 4); - auto quarter_blocked_shape = blob->getTensorDesc().getDims(); - - // splis axis dimension into chunk - IE_ASSERT(quarter_blocked_shape[axis] % vals.size() == 0); - quarter_blocked_shape[axis] /= vals.size(); - quarter_blocked_shape.insert(quarter_blocked_shape.begin() + axis, vals.size()); - - auto quarter_blocked_view = make_reshape_view(blob, quarter_blocked_shape); - fill_data_with_broadcast(quarter_blocked_view, axis, vals); - }; - - // iteration 1 - fill_data_const(i_blob, 1); - fill_by_quarter(o_blob_ref, {1, 1, 1, 2}); - inf_reg.Infer(); - Compare(o_blob_ref, o_blob); - - // iteration 2 - fill_data_const(i_blob, 2); - fill_by_quarter(o_blob_ref, {1, 1, 2, 3}); - inf_reg.Infer(); - Compare(o_blob_ref, o_blob); - - // iteration 3 - fill_data_const(i_blob, 3); - fill_by_quarter(o_blob_ref, {1, 2, 3, 4}); - inf_reg.Infer(); - Compare(o_blob_ref, o_blob); -} - -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace SubgraphTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/split_conv_concat.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/split_conv_concat.cpp similarity index 77% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/split_conv_concat.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/split_conv_concat.cpp index d247ac28fdb..a6e4018938a 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/split_conv_concat.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/split_conv_concat.cpp @@ -2,24 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include +#include "shared_test_classes/subgraph/split_conv_concat.hpp" -#include - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" - -#include "ngraph_functions/pass/convert_prc.hpp" - -#include "subgraph_tests/split_conv_concat.hpp" - - -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string SplitConvConcat::getTestCaseName(testing::TestParamInfo obj) { InferenceEngine::Precision netPrecision; @@ -57,8 +42,4 @@ void SplitConvConcat::SetUp() { function = std::make_shared(results, params, "SplitConvConcat"); } -TEST_P(SplitConvConcat, CompareWithRefImpl) { - Run(); -}; - -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace SubgraphTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/split_relu.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/split_relu.cpp similarity index 81% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/split_relu.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/split_relu.cpp index 914df8931b9..adebfbf0139 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/split_relu.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/split_relu.cpp @@ -1,17 +1,10 @@ // Copyright (C) 2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "subgraph_tests/split_relu.hpp" -namespace LayerTestsDefinitions { +#include "shared_test_classes/subgraph/split_relu.hpp" + +namespace SubgraphTestsDefinitions { std::string SplitRelu::getTestCaseName(const testing::TestParamInfo &obj) { std::vector> input; std::vector connect_input; @@ -46,8 +39,4 @@ namespace LayerTestsDefinitions { } function = std::make_shared(results, input, "split_relu"); } - - TEST_P(SplitRelu, CompareWithRefs){ - Run(); - }; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/split_trivial_permute_concat.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/split_trivial_permute_concat.cpp similarity index 82% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/split_trivial_permute_concat.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/split_trivial_permute_concat.cpp index c04e2a5d176..ec3d46f2d38 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/split_trivial_permute_concat.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/split_trivial_permute_concat.cpp @@ -1,18 +1,10 @@ // Copyright (C) 2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "subgraph_tests/split_trivial_permute_concat.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" -namespace LayerTestsDefinitions { +#include "shared_test_classes/subgraph/split_trivial_permute_concat.hpp" + +namespace SubgraphTestsDefinitions { std::string SplitTrivialPermuteConcatTest::getTestCaseName(const testing::TestParamInfo& obj) { InferenceEngine::Precision netPrecision; std::string targetName; @@ -54,8 +46,4 @@ namespace LayerTestsDefinitions { auto act = ngraph::builder::makeActivation(concat, ngPrc, ngraph::helpers::ActivationTypes::Relu); function = std::make_shared(act, input, "split_trivial_permute_concat"); } - - TEST_P(SplitTrivialPermuteConcatTest, CompareWithRefs) { - Run(); - }; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/trivial_concat.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/trivial_concat.cpp similarity index 82% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/trivial_concat.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/trivial_concat.cpp index 9626204fe78..7b4d2a3982b 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/trivial_concat.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/trivial_concat.cpp @@ -2,24 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include +#include "shared_test_classes/subgraph/trivial_concat.hpp" -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "common_test_utils/data_utils.hpp" -#include "functional_test_utils/precision_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/skip_tests_config.hpp" - -#include "subgraph_tests/trivial_concat.hpp" - -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string TrivialConcatLayerTest::getTestCaseName(const testing::TestParamInfo &obj) { int axis; @@ -70,9 +55,4 @@ void TrivialConcatLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(act)}; function = std::make_shared(results, params, "trivial_concat"); } - - -TEST_P(TrivialConcatLayerTest, CompareWithRefs) { - Run(); -}; -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/two_fake_quantize_to_fullyconnected.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/two_fake_quantize_to_fullyconnected.cpp similarity index 92% rename from inference-engine/tests/functional/plugin/shared/src/subgraph_tests/two_fake_quantize_to_fullyconnected.cpp rename to inference-engine/tests/functional/shared_test_classes/src/subgraph/two_fake_quantize_to_fullyconnected.cpp index 70f18870136..dc71ff14ed4 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/two_fake_quantize_to_fullyconnected.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/two_fake_quantize_to_fullyconnected.cpp @@ -2,24 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include +#include "shared_test_classes/subgraph/two_fake_quantize_to_fullyconnected.hpp" -#include "ie_core.hpp" - -#include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/plugin_cache.hpp" -#include "functional_test_utils/layer_test_utils.hpp" - -#include "subgraph_tests/two_fake_quantize_to_fullyconnected.hpp" - - -namespace LayerTestsDefinitions { +namespace SubgraphTestsDefinitions { std::string FakeQuantizeSubgraphTest::getTestCaseName(testing::TestParamInfo obj) { fqSpecificParams fqParams; @@ -161,8 +146,4 @@ InferenceEngine::Blob::Ptr FakeQuantizeSubgraphTest::GenerateInput(const Inferen return FuncTestUtils::createAndFillBlob(info.getTensorDesc(), inputDataMax - inputDataMin, inputDataMin, 1 / inputDataResolution, seed); } - -TEST_P(FakeQuantizeSubgraphTest, CompareWithRefs) { - Run(); -} -} // namespace LayerTestsDefinitions +} // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/functional_test_utils/CMakeLists.txt index 3ebae5a7da7..623648e691d 100644 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/CMakeLists.txt +++ b/inference-engine/tests/ie_test_utils/functional_test_utils/CMakeLists.txt @@ -14,13 +14,17 @@ list(APPEND EXPORT_DEPENDENCIES addIeTarget( NAME ${TARGET_NAME} TYPE STATIC - ROOT ${CMAKE_CURRENT_SOURCE_DIR} + ROOT "${CMAKE_CURRENT_SOURCE_DIR}/include" ADD_CPPLINT DEVELOPER_PACKAGE + INCLUDES + PUBLIC + "${CMAKE_CURRENT_SOURCE_DIR}/include" + ADDITIONAL_SOURCE_DIRS + ${CMAKE_CURRENT_SOURCE_DIR}/src LINK_LIBRARIES PUBLIC ${EXPORT_DEPENDENCIES} - ngraphFunctions inference_engine_transformations INCLUDES PUBLIC @@ -30,6 +34,6 @@ addIeTarget( ) ie_faster_build(${TARGET_NAME} - PCH PRIVATE "precomp.hpp" + PCH PRIVATE "src/precomp.hpp" ) diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/blob_utils.hpp b/inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/blob_utils.hpp similarity index 100% rename from inference-engine/tests/ie_test_utils/functional_test_utils/blob_utils.hpp rename to inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/blob_utils.hpp diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/core_config.hpp b/inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/core_config.hpp new file mode 100644 index 00000000000..ea043267b79 --- /dev/null +++ b/inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/core_config.hpp @@ -0,0 +1,9 @@ +// Copyright (C) 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include "shared_test_classes/base/layer_test_utils.hpp" + +void CoreConfiguration(LayerTestsUtils::LayerTestsCommon* test); diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.hpp b/inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/network_utils.hpp similarity index 100% rename from inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.hpp rename to inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/network_utils.hpp diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/plugin_cache.hpp b/inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/plugin_cache.hpp similarity index 100% rename from inference-engine/tests/ie_test_utils/functional_test_utils/plugin_cache.hpp rename to inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/plugin_cache.hpp diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/precision_utils.hpp b/inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/precision_utils.hpp similarity index 100% rename from inference-engine/tests/ie_test_utils/functional_test_utils/precision_utils.hpp rename to inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/precision_utils.hpp diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/skip_tests_config.hpp b/inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/skip_tests_config.hpp similarity index 100% rename from inference-engine/tests/ie_test_utils/functional_test_utils/skip_tests_config.hpp rename to inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/skip_tests_config.hpp diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/test_model/test_model.hpp b/inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/test_model/test_model.hpp similarity index 100% rename from inference-engine/tests/ie_test_utils/functional_test_utils/test_model/test_model.hpp rename to inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/test_model/test_model.hpp diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/plugin_config.hpp b/inference-engine/tests/ie_test_utils/functional_test_utils/plugin_config.hpp deleted file mode 100644 index 6bbf7f750dc..00000000000 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/plugin_config.hpp +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (C) 2020 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#pragma once - -#include "functional_test_utils/layer_test_utils.hpp" - -void PreparePluginConfiguration(LayerTestsUtils::LayerTestsCommon* test); diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.cpp b/inference-engine/tests/ie_test_utils/functional_test_utils/src/network_utils.cpp similarity index 99% rename from inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.cpp rename to inference-engine/tests/ie_test_utils/functional_test_utils/src/network_utils.cpp index ced9fc340c6..8d92cdc2ccd 100644 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.cpp +++ b/inference-engine/tests/ie_test_utils/functional_test_utils/src/network_utils.cpp @@ -9,9 +9,9 @@ #include #include -#include "network_utils.hpp" +#include "functional_test_utils/network_utils.hpp" #include "cpp/ie_cnn_network.h" -#include "blob_utils.hpp" +#include "functional_test_utils/blob_utils.hpp" #include namespace FuncTestUtils { diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/plugin_cache.cpp b/inference-engine/tests/ie_test_utils/functional_test_utils/src/plugin_cache.cpp similarity index 98% rename from inference-engine/tests/ie_test_utils/functional_test_utils/plugin_cache.cpp rename to inference-engine/tests/ie_test_utils/functional_test_utils/src/plugin_cache.cpp index 99a29052262..16f1aedd06f 100644 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/plugin_cache.cpp +++ b/inference-engine/tests/ie_test_utils/functional_test_utils/src/plugin_cache.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "plugin_cache.hpp" +#include "functional_test_utils/plugin_cache.hpp" #include #include diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/precomp.hpp b/inference-engine/tests/ie_test_utils/functional_test_utils/src/precomp.hpp similarity index 100% rename from inference-engine/tests/ie_test_utils/functional_test_utils/precomp.hpp rename to inference-engine/tests/ie_test_utils/functional_test_utils/src/precomp.hpp diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/skip_tests_config.cpp b/inference-engine/tests/ie_test_utils/functional_test_utils/src/skip_tests_config.cpp similarity index 100% rename from inference-engine/tests/ie_test_utils/functional_test_utils/skip_tests_config.cpp rename to inference-engine/tests/ie_test_utils/functional_test_utils/src/skip_tests_config.cpp diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/test_model/test_model.cpp b/inference-engine/tests/ie_test_utils/functional_test_utils/src/test_model/test_model.cpp similarity index 99% rename from inference-engine/tests/ie_test_utils/functional_test_utils/test_model/test_model.cpp rename to inference-engine/tests/ie_test_utils/functional_test_utils/src/test_model/test_model.cpp index 3adca88c832..17b08a40d97 100644 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/test_model/test_model.cpp +++ b/inference-engine/tests/ie_test_utils/functional_test_utils/src/test_model/test_model.cpp @@ -8,7 +8,7 @@ #include #include -#include "test_model.hpp" +#include "functional_test_utils/test_model/test_model.hpp" #include "common_test_utils/xml_net_builder/ir_net.hpp" #include "common_test_utils/xml_net_builder/xml_filler.hpp" #include "common_test_utils/common_layers_params.hpp"