From ab900606cd443042944b039d84b9f4135fd34f72 Mon Sep 17 00:00:00 2001 From: Oleg Pipikin Date: Wed, 23 Aug 2023 18:57:29 +0200 Subject: [PATCH] Remove makeDynamicParams (#19226) * Remove makeDynamicParams * Apply comments * Fix1 * Fix2 * Fix3 --- .../single_layer_tests/adaptive_pooling.cpp | 2 +- .../single_layer_tests/augru_cell.cpp | 5 +- .../single_layer_tests/augru_sequence.cpp | 5 +- .../single_layer_tests/batch_to_space.cpp | 2 +- .../single_layer_tests/classes/activation.cpp | 6 +- .../single_layer_tests/classes/conversion.cpp | 5 +- .../single_layer_tests/classes/eltwise.cpp | 7 +- .../single_layer_tests/classes/mvn.cpp | 9 +- .../single_layer_tests/classes/reduce.cpp | 5 +- .../single_layer_tests/classes/transpose.cpp | 6 +- .../functional/single_layer_tests/concat.cpp | 5 +- .../single_layer_tests/convolution.cpp | 5 +- .../convolution_backprop_data.cpp | 2 +- .../single_layer_tests/ctc_greedy_decoder.cpp | 5 +- .../ctc_greedy_decoder_seq_len.cpp | 17 +- .../single_layer_tests/ctc_loss.cpp | 6 +- .../functional/single_layer_tests/cum_sum.cpp | 5 +- .../custom_op_internal_dyn.cpp | 7 +- .../deformable_convolution.cpp | 6 +- .../single_layer_tests/depth_to_space.cpp | 5 +- .../single_layer_tests/detection_output.cpp | 5 +- .../extract_image_patches.cpp | 5 +- .../functional/single_layer_tests/eye.cpp | 5 +- .../single_layer_tests/fake_quantize.cpp | 5 +- .../single_layer_tests/gather_nd.cpp | 10 +- .../single_layer_tests/gather_tree.cpp | 2 +- .../single_layer_tests/grid_sample.cpp | 3 +- .../functional/single_layer_tests/grn.cpp | 6 +- .../single_layer_tests/group_convolution.cpp | 5 +- .../group_convolution_backprop_data.cpp | 2 +- .../single_layer_tests/gru_cell.cpp | 5 +- .../single_layer_tests/gru_sequence.cpp | 5 +- .../single_layer_tests/interpolate.cpp | 3 +- .../single_layer_tests/log_softmax.cpp | 2 +- .../functional/single_layer_tests/loop.cpp | 30 +- .../functional/single_layer_tests/lrn.cpp | 5 +- .../single_layer_tests/lstm_cell.cpp | 5 +- .../single_layer_tests/lstm_sequence.cpp | 5 +- .../functional/single_layer_tests/matmul.cpp | 2 +- .../single_layer_tests/matmul_sparse.cpp | 6 +- .../non_max_suppression.cpp | 5 +- .../functional/single_layer_tests/nonzero.cpp | 5 +- .../single_layer_tests/normalize.cpp | 5 +- .../functional/single_layer_tests/one_hot.cpp | 2 +- .../functional/single_layer_tests/pad.cpp | 5 +- .../functional/single_layer_tests/pooling.cpp | 11 +- .../single_layer_tests/prior_box.cpp | 6 +- .../prior_box_clustered.cpp | 6 +- .../single_layer_tests/proposal.cpp | 5 +- .../single_layer_tests/region_yolo.cpp | 6 +- .../single_layer_tests/reverse_sequence.cpp | 2 +- .../single_layer_tests/rnn_cell.cpp | 5 +- .../single_layer_tests/rnn_sequence.cpp | 5 +- .../single_layer_tests/roi_pooling.cpp | 5 +- .../single_layer_tests/roialign.cpp | 11 +- .../functional/single_layer_tests/roll.cpp | 6 +- .../single_layer_tests/scatter_ND_update.cpp | 13 +- .../scatter_elements_update.cpp | 13 +- .../single_layer_tests/scatter_update.cpp | 5 +- .../functional/single_layer_tests/select.cpp | 7 +- .../single_layer_tests/shape_ops.cpp | 9 +- .../functional/single_layer_tests/shapeof.cpp | 5 +- .../single_layer_tests/shuffle_channels.cpp | 5 +- .../functional/single_layer_tests/slice.cpp | 5 +- .../functional/single_layer_tests/softmax.cpp | 6 +- .../single_layer_tests/space_to_batch.cpp | 2 +- .../single_layer_tests/space_to_depth.cpp | 5 +- .../functional/single_layer_tests/split.cpp | 5 +- .../single_layer_tests/strided_slice.cpp | 5 +- .../single_layer_tests/tensor_iterator.cpp | 5 +- .../functional/single_layer_tests/topk.cpp | 2 +- .../functional/single_layer_tests/unique.cpp | 5 +- .../single_layer_tests/variadic_split.cpp | 2 +- .../src/arm/convert_group_conv.cpp | 5 +- .../src/arm/convert_group_conv1d.cpp | 5 +- .../src/arm/convert_reduce_multi_axis.cpp | 5 +- .../subgraph_tests/src/broadcast_eltwise.cpp | 6 +- .../src/concat_reshape_concat.cpp | 6 +- .../subgraph_tests/src/conv_dw_conv.cpp | 5 +- .../subgraph_tests/src/conv_sum_broadcast.cpp | 10 +- .../src/convert_fq_rnn_to_quantized_rnn.cpp | 6 +- .../src/custom_op_insert_convert_i64.cpp | 5 +- .../subgraph_tests/src/eltwise_chain.cpp | 2 +- .../src/matmul_decompress_convert.cpp | 7 +- .../src/matmul_weights_decompression.cpp | 2 +- .../functional/subgraph_tests/src/ngram.cpp | 7 +- .../subgraph_tests/src/remove_convert.cpp | 12 +- .../subgraph_tests/src/reshape_chain.cpp | 5 +- .../subgraph_tests/src/reshape_fc.cpp | 2 +- .../subgraph_tests/src/seq_native_order.cpp | 7 +- .../subgraph_tests/src/split_concat_add.cpp | 5 +- .../src/split_matmul_concat.cpp | 2 +- .../subgraph_tests/src/static_zero_dims.cpp | 6 +- .../src/strided_slice_zero_dims.cpp | 5 +- .../test_utils/fusing_test_utils.hpp | 4 +- .../preprocess_tests/precision_convert.cpp | 5 +- .../functional/behavior/memory_dyn_batch.cpp | 8 +- .../single_layer_tests/convolution.cpp | 5 +- .../dynamic/batch_to_space.cpp | 2 +- .../dynamic/convolution.cpp | 5 +- .../dynamic/convolution_backprop_data.cpp | 2 +- .../single_layer_tests/dynamic/cum_sum.cpp | 5 +- .../dynamic/detection_output.cpp | 5 +- .../dynamic/deth_to_space.cpp | 5 +- .../dynamic/gather_tree.cpp | 2 +- .../dynamic/grid_sample.cpp | 3 +- .../group_convolution_backprop_data.cpp | 2 +- .../dynamic/groupconvolution.cpp | 5 +- .../dynamic/interpolate.cpp | 2 +- .../single_layer_tests/dynamic/matmul.cpp | 2 +- .../single_layer_tests/dynamic/mvn.cpp | 9 +- .../dynamic/non_max_suppression.cpp | 5 +- .../dynamic/normalize_l2.cpp | 9 +- .../single_layer_tests/dynamic/pooling.cpp | 6 +- .../single_layer_tests/dynamic/prior_box.cpp | 5 +- .../dynamic/random_uniform.cpp | 7 +- .../single_layer_tests/dynamic/range.cpp | 11 +- .../single_layer_tests/dynamic/reduce.cpp | 5 +- .../dynamic/region_yolo.cpp | 5 +- .../dynamic/roi_pooling.cpp | 5 +- .../dynamic/scatter_nd_update.cpp | 13 +- .../single_layer_tests/dynamic/shapeof.cpp | 6 +- .../single_layer_tests/dynamic/softmax.cpp | 5 +- .../dynamic/space_to_batch.cpp | 2 +- .../single_layer_tests/dynamic/split.cpp | 4 +- .../dynamic/strided_slice.cpp | 2 +- .../single_layer_tests/dynamic/top_k.cpp | 2 +- .../single_layer_tests/dynamic/unique.cpp | 5 +- .../dynamic/broadcast_eltwise.cpp | 6 +- .../dynamic_model_static_split_layer.cpp | 5 +- .../dynamic_smoke_test_gen_impl_key.cpp | 5 +- ...mic_smoke_test_shape_of_reduce_reshape.cpp | 5 +- .../dynamic_smoke_test_with_empty_tensor.cpp | 5 +- .../dynamic/read_value_assign.cpp | 5 +- .../src/op_impl_check/single_op_graph.cpp | 346 +++++++++++------- .../ov_infer_request/inference_chaining.cpp | 15 +- .../ov_infer_request/iteration_chaining.cpp | 10 +- .../single_layer/softmax.hpp | 5 +- .../src/single_layer/eltwise.cpp | 7 +- ...xperimental_detectron_detection_output.cpp | 5 +- ...ectron_generate_proposals_single_image.cpp | 5 +- ...imental_detectron_prior_grid_generator.cpp | 5 +- ...rimental_detectron_roifeatureextractor.cpp | 5 +- .../experimental_detectron_topkrois.cpp | 5 +- .../src/single_layer/generate_proposals.cpp | 5 +- .../src/single_layer/is_inf.cpp | 5 +- .../src/single_layer/matrix_nms.cpp | 5 +- .../src/single_layer/multiclass_nms.cpp | 11 +- .../src/single_layer/slice.cpp | 5 +- .../src/subgraph/simple_if.cpp | 30 +- .../src/markup_bias_function.cpp | 2 +- .../include/ngraph_functions/builders.hpp | 4 - .../ngraph_functions/src/input_layer.cpp | 2 +- .../ngraph_functions/src/params_vector.cpp | 35 -- 154 files changed, 822 insertions(+), 424 deletions(-) delete mode 100644 src/tests/ngraph_helpers/ngraph_functions/src/params_vector.cpp diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/adaptive_pooling.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/adaptive_pooling.cpp index f7c6db523b8..37e8afb7e14 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/adaptive_pooling.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/adaptive_pooling.cpp @@ -102,7 +102,7 @@ protected: } std::shared_ptr createFunction(bool secondInputConst) { - auto params = ngraph::builder::makeDynamicParams(ngraph::element::f32, { inputDynamicShapes[0] }); + ov::ParameterVector params{std::make_shared(ngraph::element::f32, inputDynamicShapes[0])}; params.front()->set_friendly_name("ParamsInput"); std::shared_ptr secondInput; if (secondInputConst) { diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/augru_cell.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/augru_cell.cpp index 7fceaf9b4de..ed1f72d434e 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/augru_cell.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/augru_cell.cpp @@ -93,7 +93,10 @@ protected: selectedType = makeSelectedTypeStr(selectedType, netPrecision); } - auto params = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } std::vector WRB = {{3 * hiddenSize, inputSize}, {3 * hiddenSize, hiddenSize}, {(linearBeforeReset ? 4 : 3) * hiddenSize}}; auto augruCellOp = ngraph::builder::makeAUGRU( ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)), WRB, hiddenSize/*, activations, {}, {}, clip, linearBeforeReset*/); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/augru_sequence.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/augru_sequence.cpp index 6457a39e76f..f54605b78a2 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/augru_sequence.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/augru_sequence.cpp @@ -104,7 +104,10 @@ protected: selectedType = makeSelectedTypeStr(selectedType, netPrecision); } - auto params = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } const size_t batchSize = inputDynamicShapes[0][0].is_static() ? inputDynamicShapes[0][0].get_length() : inputDynamicShapes[1][0].is_static() ? inputDynamicShapes[1][0].get_length() : inputDynamicShapes.size() > 2 && inputDynamicShapes[2][0].is_static() ? inputDynamicShapes[2][0].get_length() : diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/batch_to_space.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/batch_to_space.cpp index 7449df56e7f..cf86d8759b8 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/batch_to_space.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/batch_to_space.cpp @@ -109,7 +109,7 @@ protected: else selectedType = std::string("ref_any_") + netPrecision.name(); - auto params = ngraph::builder::makeDynamicParams(ngPrec, {inputDynamicShapes.front()}); + ov::ParameterVector params{std::make_shared(ngPrec, inputDynamicShapes.front())}; auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); paramShape = {paramOuts[0].get_partial_shape().size()}; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/activation.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/activation.cpp index b77bf15f1f3..f061a6482de 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/activation.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/activation.cpp @@ -121,10 +121,10 @@ void ActivationLayerCPUTest::SetUp() { init_input_shapes(inputShapes); auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); - auto params = ngraph::builder::makeDynamicParams(ngPrc, {inputDynamicShapes.front()}); - auto activation = ngraph::builder::makeActivation(params[0], ngPrc, activationType, activationShapes, constantsValue); + auto params = std::make_shared(ngPrc, inputDynamicShapes.front()); + auto activation = ngraph::builder::makeActivation(params, ngPrc, activationType, activationShapes, constantsValue); activation->get_rt_info() = getCPUInfo(); - function = std::make_shared(ngraph::NodeVector{activation}, params, "Activation"); + function = std::make_shared(ngraph::NodeVector{activation}, ov::ParameterVector{params}, "Activation"); } TEST_P(ActivationLayerCPUTest, CompareWithRefs) { diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/conversion.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/conversion.cpp index b4b9d7516cd..d0f59a43929 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/conversion.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/conversion.cpp @@ -79,7 +79,10 @@ void ConvertCPULayerTest::SetUp() { auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(inPrc); auto targetPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(outPrc); - ParameterVector params = builder::makeDynamicParams(ngPrc, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(ngPrc, shape)); + } auto conversion = ngraph::builder::makeConversion(params.front(), targetPrc, helpers::ConversionTypes::CONVERT); function = makeNgraphFunction(ngPrc, params, conversion, "ConversionCPU"); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/eltwise.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/eltwise.cpp index 1b42f33e9b8..f7d4845a989 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/eltwise.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/eltwise.cpp @@ -126,11 +126,12 @@ void EltwiseLayerCPUTest::SetUp() { } #endif - auto parameters = ngraph::builder::makeDynamicParams(netType, {inputDynamicShapes.front()}); + ov::ParameterVector parameters{std::make_shared(netType, inputDynamicShapes.front())}; std::shared_ptr secondaryInput; if (secondaryInputType == ngraph::helpers::InputLayerType::PARAMETER) { - secondaryInput = ngraph::builder::makeDynamicParams(netType, {inputDynamicShapes.back()}).front(); - parameters.push_back(std::dynamic_pointer_cast(secondaryInput)); + auto param = std::make_shared(netType, inputDynamicShapes.back()); + secondaryInput = param; + parameters.push_back(param); } else { auto pShape = inputDynamicShapes.back(); ngraph::Shape shape; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/mvn.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/mvn.cpp index 9d7d2130a5e..c9234bfd32b 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/mvn.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/mvn.cpp @@ -99,9 +99,12 @@ void MvnLayerCPUTest::SetUp() { init_input_shapes({inputShapes}); - auto param = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } auto paramOuts = - ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(param)); + ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); auto mvn = ngraph::builder::makeMVN(paramOuts[0], acrossChanels, normalizeVariance, eps); if (!axes.empty()) { mvn = ngraph::builder::makeMVN(paramOuts[0], axes, normalizeVariance, eps); @@ -116,7 +119,7 @@ void MvnLayerCPUTest::SetUp() { configuration.insert(additionalConfig.begin(), additionalConfig.end()); updateSelectedType(getPrimitiveType(), netPrecision, configuration); - function = makeNgraphFunction(netPrecision, param, mvn, "mvn"); + function = makeNgraphFunction(netPrecision, params, mvn, "mvn"); } TEST_P(MvnLayerCPUTest, CompareWithRefs) { diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/reduce.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/reduce.cpp index 19806d7c182..95c23f98399 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/reduce.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/reduce.cpp @@ -94,7 +94,10 @@ void ReduceCPULayerTest::SetUp() { init_input_shapes(inputShapes); - auto params = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/transpose.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/transpose.cpp index 8edfa9c7084..029e97a2eae 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/transpose.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/transpose.cpp @@ -59,15 +59,15 @@ void TransposeLayerCPUTest::SetUp() { init_input_shapes({inputShapes}); - auto params = ngraph::builder::makeDynamicParams(inType, {inputDynamicShapes[0]}); + auto params = std::make_shared(inType, inputDynamicShapes[0]); const auto inputOrderOp = std::make_shared(ov::element::i64, ov::Shape({inputOrder.size()}), inputOrder); - const auto transpose = std::make_shared(params[0], inputOrderOp); + const auto transpose = std::make_shared(params, inputOrderOp); transpose->get_rt_info() = getCPUInfo(); const ov::ResultVector results{std::make_shared(transpose)}; - function = std::make_shared(results, params, "TransposeLayerCPUTest"); + function = std::make_shared(results, ov::ParameterVector{params}, "TransposeLayerCPUTest"); functionRefs = ngraph::clone_function(*function); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/concat.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/concat.cpp index eb634ce8fa5..25be06d1818 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/concat.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/concat.cpp @@ -78,7 +78,10 @@ protected: init_input_shapes(inputShape); - auto params = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector( ngraph::helpers::castOps2Nodes(params)); auto concat = std::make_shared(paramOuts, axis); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/convolution.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/convolution.cpp index 372bd10edf7..a8bf5c83a2e 100755 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/convolution.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/convolution.cpp @@ -199,7 +199,10 @@ protected: size_t convOutChannels; std::tie(kernel, stride, padBegin, padEnd, dilation, convOutChannels, padType) = convParams; - auto inputParams = ngraph::builder::makeDynamicParams(ngraph::element::f32, inputDynamicShapes); + ov::ParameterVector inputParams; + for (auto&& shape : inputDynamicShapes) { + inputParams.push_back(std::make_shared(ov::element::f32, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(inputParams)); auto convolutionNode = ngraph::builder::makeConvolution(paramOuts.front(), netType, kernel, stride, padBegin, diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/convolution_backprop_data.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/convolution_backprop_data.cpp index 56cb5ab9502..5b0496e6ca7 100755 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/convolution_backprop_data.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/convolution_backprop_data.cpp @@ -168,7 +168,7 @@ public: } std::shared_ptr createGraph(const std::vector& inShapes, ngraph::helpers::InputLayerType outShapeType) { - auto params = ngraph::builder::makeDynamicParams(prec, {inShapes.front()}); + ov::ParameterVector params{std::make_shared(prec, inShapes.front())}; std::shared_ptr outShapeNode; if (!outShapeData.empty()) { if (outShapeType == ngraph::helpers::InputLayerType::PARAMETER) { diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_greedy_decoder.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_greedy_decoder.cpp index 008a0ebf1e4..fc3bbd7d248 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_greedy_decoder.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_greedy_decoder.cpp @@ -82,7 +82,10 @@ protected: targetStaticShapes.push_back({{T, N, C}, {T, N}}); } - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } auto ctcGreedyDecoder = std::make_shared(params[0], params[1], mergeRepeated); ngraph::ResultVector results{std::make_shared(ctcGreedyDecoder)}; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_greedy_decoder_seq_len.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_greedy_decoder_seq_len.cpp index 44f66c1d92b..f605dfd39bd 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_greedy_decoder_seq_len.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_greedy_decoder_seq_len.cpp @@ -33,16 +33,6 @@ using CTCGreedyDecoderSeqLenLayerCPUTestParams = std::tuple; -inline ngraph::ParameterVector makeDynamicParams(const std::vector& types, - const std::vector& shapes) { - ngraph::ParameterVector outs; - NGRAPH_CHECK(types.size() == shapes.size()); - for (size_t i = 0; i < types.size(); i++) { - auto paramNode = std::make_shared(types[i], shapes[i]); - outs.push_back(paramNode); - } - return outs; -} class CTCGreedyDecoderSeqLenLayerCPUTest : public testing::WithParamInterface, virtual public SubgraphBaseTest, @@ -95,6 +85,7 @@ protected: inputDynamicShapes = {ov::PartialShape{in_dyn_N, in_dyn_T, in_dyc_C}, ov::PartialShape{in_dyn_N}, blank_rank == 0 ? ov::PartialShape{} : ov::PartialShape{1}}; + OPENVINO_ASSERT(inType.size() == inputDynamicShapes.size()); for (auto& shape : shapes.second) { size_t N; @@ -107,7 +98,11 @@ protected: targetStaticShapes.push_back({{N, T, C}, {N}, {1}}); } - auto params = makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector params; + for (size_t i = 0; i < inType.size(); i++) { + auto param_node = std::make_shared(inType[i], inputDynamicShapes[i]); + params.push_back(param_node); + } auto ctcGreedyDecoderSeqLen = std::make_shared(params[0], params[1], params[2], diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_loss.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_loss.cpp index 4eb794f61b6..777e54f9a93 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_loss.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_loss.cpp @@ -96,7 +96,11 @@ protected: std::vector types{fPrecision, iPrecision, iPrecision, iPrecision}; std::vector partialShapes{inputDynamicShapesValues, shapeN, shapeNT, shapeN}; - auto params = ngraph::builder::makeDynamicParams(types, partialShapes); + ov::ParameterVector params; + for (size_t i = 0; i < types.size(); i++) { + auto param_node = std::make_shared(types[i], partialShapes[i]); + params.push_back(param_node); + } auto bankNode = ngraph::op::Constant::create(ngraph::element::i64, ngraph::Shape{ }, {blank}); auto ctcLoss = std::make_shared(params[0], params[1], params[2], diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/cum_sum.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/cum_sum.cpp index a6477df5d5e..7b55be22f22 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/cum_sum.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/cum_sum.cpp @@ -57,7 +57,10 @@ protected: selectedType = makeSelectedTypeStr("ref_any", inType); init_input_shapes({shapes}); - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } auto axisNode = ngraph::opset1::Constant::create(ngraph::element::i32, ngraph::Shape{}, std::vector{axis})->output(0); auto cumSum = ngraph::builder::makeCumSum(params[0], axisNode, exclusive, reverse); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/custom_op_internal_dyn.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/custom_op_internal_dyn.cpp index de3aaba28a4..9741f84747e 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/custom_op_internal_dyn.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/custom_op_internal_dyn.cpp @@ -85,8 +85,11 @@ protected: InputShape inputShapes{{-1, -1, -1}, {{10, 5, 3}, {16, 24, 16}, {4, 8, 12}}}; init_input_shapes({inputShapes}); - auto ngPrc = ngraph::element::f32; - auto inputParams = ngraph::builder::makeDynamicParams(ngPrc, inputDynamicShapes); + ov::ParameterVector inputParams; + for (auto&& shape : inputDynamicShapes) { + inputParams.push_back(std::make_shared(ngraph::element::f32, shape)); + } + auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(inputParams)); auto customOp = std::make_shared(paramOuts); auto shapeOf = std::make_shared(customOp->output(1)); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/deformable_convolution.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/deformable_convolution.cpp index 8f506721dbc..071afdda412 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/deformable_convolution.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/deformable_convolution.cpp @@ -156,8 +156,10 @@ protected: bool withBilinearInterpolationPad, withModulation; std::tie(withBilinearInterpolationPad, withModulation, offsetType) = dcSpecificParams; auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); - auto inputParams = ngraph::builder::makeDynamicParams(ngPrc, inputDynamicShapes); - + ov::ParameterVector inputParams; + for (auto&& shape : inputDynamicShapes) { + inputParams.push_back(std::make_shared(ngPrc, shape)); + } auto data = inputParams[0]; data->set_friendly_name("a_data"); auto offset_vals = inputParams[1]; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/depth_to_space.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/depth_to_space.cpp index 41ea2876034..30f1617d3cf 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/depth_to_space.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/depth_to_space.cpp @@ -71,7 +71,10 @@ protected: targetDevice = ov::test::utils::DEVICE_CPU; init_input_shapes({shapes}); - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } auto d2s = ngraph::builder::makeDepthToSpace(params[0], mode, blockSize); function = makeNgraphFunction(inType, params, d2s, "DepthToSpace"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/detection_output.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/detection_output.cpp index 391c8708cf5..049ccd4ec80 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/detection_output.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/detection_output.cpp @@ -199,7 +199,10 @@ public: init_input_shapes({ inShapes }); - auto params = ngraph::builder::makeDynamicParams(ngraph::element::f32, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(ov::element::f32, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); auto detOut = ngraph::builder::makeDetectionOutput(paramOuts, attrs); ngraph::ResultVector results{std::make_shared(detOut)}; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/extract_image_patches.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/extract_image_patches.cpp index 6a77712e0ff..86b943b0d84 100755 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/extract_image_patches.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/extract_image_patches.cpp @@ -60,7 +60,10 @@ protected: init_input_shapes({ inputShapes }); - auto params = ngraph::builder::makeDynamicParams(inputPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inputPrecision, shape)); + } auto extImgPatches = std::make_shared(params[0], kernelSize, strides, rates, padType); function = makeNgraphFunction(inputPrecision, params, extImgPatches, "ExtractImagePatches"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/eye.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/eye.cpp index 7b6b6c94674..d984aee2152 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/eye.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/eye.cpp @@ -84,7 +84,10 @@ protected: } std::shared_ptr createFunction() { - auto inputParams = ngraph::builder::makeDynamicParams(ngraph::element::i32, inputDynamicShapes); + ov::ParameterVector inputParams; + for (auto&& shape : inputDynamicShapes) { + inputParams.push_back(std::make_shared(ov::element::i32, shape)); + } auto rowsPar = inputParams[0]; rowsPar->set_friendly_name("rows"); auto colsPar = inputParams[1]; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/fake_quantize.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/fake_quantize.cpp index 99434e87dd7..85872a673b3 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/fake_quantize.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/fake_quantize.cpp @@ -111,7 +111,10 @@ protected: std::tie(inDataLowBounds, inDataHighBounds, rangesBounds[2], rangesBounds[3], levels) = fqParams; auto ngInPrec = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(inPrec); - ParameterVector params = builder::makeDynamicParams(ngInPrec, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(ngInPrec, shape)); + } auto paramOuts = helpers::convert2OutputVector(helpers::castOps2Nodes(params)); auto il = builder::makeConstant(ngInPrec, ranges[0], rangesBounds[0], rangesBounds[0].empty()); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather_nd.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather_nd.cpp index 8f73cc1a974..9a526db7982 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather_nd.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather_nd.cpp @@ -55,7 +55,10 @@ protected: targetDevice = ov::test::utils::DEVICE_CPU; init_input_shapes({shapes}); - auto params = ngraph::builder::makeDynamicParams(dataElementType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(dataElementType, shape)); + } auto indexes_node = ngraph::opset3::Constant::create(idxElementType, indexes.first, indexes.second); auto gather_nd = std::make_shared(params[0], indexes_node, batchDims); ngraph::ResultVector results{std::make_shared(gather_nd)}; @@ -81,7 +84,10 @@ protected: targetDevice = ov::test::utils::DEVICE_CPU; init_input_shapes({shapes}); - auto params = ngraph::builder::makeDynamicParams(dataElementType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(dataElementType, shape)); + } auto indexes_node = ngraph::opset3::Constant::create(idxElementType, indexes.first, indexes.second); auto gather_nd = std::make_shared(params[0], indexes_node, batchDims); ngraph::ResultVector results{std::make_shared(gather_nd)}; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather_tree.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather_tree.cpp index 3751abce8c1..6ab22cba1ba 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather_tree.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather_tree.cpp @@ -86,7 +86,7 @@ protected: std::shared_ptr inp3; std::shared_ptr inp4; - auto paramsIn = ngraph::builder::makeDynamicParams(netPrecision, {inputDynamicShapes[0]}); + ov::ParameterVector paramsIn{std::make_shared(netPrecision, inputDynamicShapes[0])}; if (ngraph::helpers::InputLayerType::PARAMETER == secondaryInputType) { inp2 = ngraph::builder::makeDynamicInputLayer(netPrecision, secondaryInputType, inputDynamicShapes[1]); inp3 = ngraph::builder::makeDynamicInputLayer(netPrecision, secondaryInputType, inputDynamicShapes[2]); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/grid_sample.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/grid_sample.cpp index 208e6d64c54..f177ad4248a 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/grid_sample.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/grid_sample.cpp @@ -99,7 +99,8 @@ protected: rel_threshold = 0.01f; } - auto params = ngraph::builder::makeDynamicParams({dataPrecision, gridPrecision}, inputDynamicShapes); + ov::ParameterVector params{std::make_shared(dataPrecision, inputDynamicShapes[0]), + std::make_shared(gridPrecision, inputDynamicShapes[1])}; params[0]->set_friendly_name("data"); params[1]->set_friendly_name("grid"); auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/grn.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/grn.cpp index d351a4219a7..89d4b65feef 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/grn.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/grn.cpp @@ -67,8 +67,10 @@ protected: init_input_shapes({inputShape}); - const auto paramsIn = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); - + ov::ParameterVector paramsIn; + for (auto&& shape : inputDynamicShapes) { + paramsIn.push_back(std::make_shared(netPrecision, shape)); + } const auto paramsOut = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(paramsIn)); const auto grn = std::make_shared(paramsOut[0], bias); const ngraph::ResultVector results{std::make_shared(grn)}; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/group_convolution.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/group_convolution.cpp index 0606d06a9aa..3d7bd15fd05 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/group_convolution.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/group_convolution.cpp @@ -192,7 +192,10 @@ protected: size_t convOutChannels, numGroups; std::tie(kernel, stride, padBegin, padEnd, dilation, convOutChannels, numGroups, padType) = groupConvParams; - auto params = ngraph::builder::makeDynamicParams(netType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netType, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector( ngraph::helpers::castOps2Nodes(params)); auto groupConv = std::dynamic_pointer_cast( diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/group_convolution_backprop_data.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/group_convolution_backprop_data.cpp index b6ca60a9118..e053dfab9f5 100755 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/group_convolution_backprop_data.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/group_convolution_backprop_data.cpp @@ -167,7 +167,7 @@ public: } std::shared_ptr createGraph(const std::vector& inShapes, ngraph::helpers::InputLayerType outShapeType) { - auto params = ngraph::builder::makeDynamicParams(prec, {inShapes.front()}); + ov::ParameterVector params{std::make_shared(prec, inShapes.front())}; std::shared_ptr outShapeNode; if (!outShapeData.empty()) { if (outShapeType == ngraph::helpers::InputLayerType::PARAMETER) { diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_cell.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_cell.cpp index 6fe31330b04..3beb4415d28 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_cell.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_cell.cpp @@ -93,7 +93,10 @@ protected: selectedType = makeSelectedTypeStr(selectedType, netPrecision); } - auto params = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } std::vector WRB = {{3 * hiddenSize, inputSize}, {3 * hiddenSize, hiddenSize}, {(linearBeforeReset ? 4 : 3) * hiddenSize}}; auto gruCellOp = ngraph::builder::makeGRU( ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)), WRB, hiddenSize, activations, {}, {}, clip, linearBeforeReset); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_sequence.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_sequence.cpp index 57bfd9e4aed..bde807ca637 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_sequence.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_sequence.cpp @@ -104,7 +104,10 @@ protected: selectedType = makeSelectedTypeStr(selectedType, netPrecision); } - auto params = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } const size_t batchSize = inputDynamicShapes[0][0].is_static() ? inputDynamicShapes[0][0].get_length() : inputDynamicShapes[1][0].is_static() ? inputDynamicShapes[1][0].get_length() : inputDynamicShapes.size() > 2 && inputDynamicShapes[2][0].is_static() ? inputDynamicShapes[2][0].get_length() : diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/interpolate.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/interpolate.cpp index bdb52f7f11d..7cb20b34e66 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/interpolate.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/interpolate.cpp @@ -214,8 +214,7 @@ protected: init_input_shapes(inputShapes); - auto params = ngraph::builder::makeDynamicParams(ngPrc, {inputDynamicShapes.front()}); - + ov::ParameterVector params{std::make_shared(ngPrc, inputDynamicShapes.front())}; std::shared_ptr sizesInput, scalesInput; if (shapeCalcMode == ov::op::v11::Interpolate::ShapeCalcMode::SCALES) { if (shapeInputType == ngraph::helpers::InputLayerType::PARAMETER) { diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/log_softmax.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/log_softmax.cpp index 2564a069d01..f7ec400c3db 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/log_softmax.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/log_softmax.cpp @@ -64,7 +64,7 @@ protected: selectedType = std::string("unknown_") + netPrecision.name(); init_input_shapes(inputShapes); - const auto params = ngraph::builder::makeDynamicParams(ngPrc, {inputDynamicShapes.front()}); + ov::ParameterVector params{std::make_shared(ngPrc, inputDynamicShapes.front())}; const auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); const auto logSoftmax = std::make_shared(paramOuts[0], axis); const ngraph::ResultVector results{std::make_shared(logSoftmax)}; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/loop.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/loop.cpp index 094e48f8139..3070c4f3f91 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/loop.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/loop.cpp @@ -95,8 +95,10 @@ protected: targetDevice = ov::test::utils::DEVICE_CPU; init_input_shapes(shapes); - auto params = ngraph::builder::makeDynamicParams(netType, inputDynamicShapes); - + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netType, shape)); + } // Set up the cell body, a function from (Xi, Yi) -> (Zo) // Body parameters const std::vector body_params_shapes(shapes.size(), ngraph::PartialShape::dynamic()); @@ -177,8 +179,10 @@ protected: for (auto& target : targetStaticShapes) target.insert(target.begin(), ngraph::Shape{}); - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); - + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } // Body parameters const std::vector body_params_shapes(shapes.size(), ngraph::PartialShape::dynamic()); ngraph::ParameterVector body_params = { std::make_shared(ngraph::element::i64, ngraph::Shape{}) }; @@ -246,8 +250,10 @@ protected: targetDevice = ov::test::utils::DEVICE_CPU; init_input_shapes(shapes); - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); - + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } // Set up the cell body, a function from (Xi, Yi) -> (Zo) // Body parameters const std::vector body_params_shapes(shapes.size(), ngraph::PartialShape::dynamic()); @@ -317,12 +323,16 @@ protected: targetDevice = ov::test::utils::DEVICE_CPU; init_input_shapes(shapes); - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); - + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } // Body parameters const std::vector body_params_shapes(shapes.size(), ngraph::PartialShape::dynamic()); - auto body_params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); - + ov::ParameterVector body_params; + for (auto&& shape : inputDynamicShapes) { + body_params.push_back(std::make_shared(inType, shape)); + } auto body_condition_const = std::make_shared(ngraph::element::boolean, ngraph::Shape{1}, true); auto exec_condition = std::make_shared(ngraph::element::boolean, ngraph::Shape{1}, exec_cond); std::shared_ptr trip_count_input; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/lrn.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/lrn.cpp index 6804b000c8a..b6cf98a2e28 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/lrn.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/lrn.cpp @@ -55,7 +55,10 @@ protected: init_input_shapes({ inputShapes }); selectedType = makeSelectedTypeStr("ref_any", inputPrecision); - auto params = ngraph::builder::makeDynamicParams(inputPrecision, { inputDynamicShapes }); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inputPrecision, shape)); + } auto axesNode = ngraph::opset1::Constant::create(ngraph::element::i32, { axes.size() }, axes); auto lrn = std::make_shared(params[0], axesNode, alpha, beta, bias, size); function = makeNgraphFunction(inputPrecision, params, lrn, "LRN"); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_cell.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_cell.cpp index 46af2abaab2..99ec9750d6f 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_cell.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_cell.cpp @@ -92,7 +92,10 @@ protected: selectedType = makeSelectedTypeStr(selectedType, netPrecision); } - auto params = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } auto paramsOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); std::vector WRB = {{4 * hiddenSize, inputSize}, {4 * hiddenSize, hiddenSize}, {4 * hiddenSize}}; auto lstmCellOp = ngraph::builder::makeLSTM(paramsOuts, WRB, hiddenSize, activations, {}, {}, clip); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_sequence.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_sequence.cpp index 96055ccd22b..ea36f3744ac 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_sequence.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_sequence.cpp @@ -111,7 +111,10 @@ protected: selectedType = makeSelectedTypeStr(selectedType, netPrecision); } - auto params = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } const size_t batchSize = inputDynamicShapes[0][0].is_static() ? inputDynamicShapes[0][0].get_length() : inputDynamicShapes[1][0].is_static() ? inputDynamicShapes[1][0].get_length() : inputDynamicShapes[2][0].is_static() ? inputDynamicShapes[2][0].get_length() : diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/matmul.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/matmul.cpp index d08e4399ad5..824c72ac1d3 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/matmul.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/matmul.cpp @@ -158,7 +158,7 @@ protected: cpuNodeType = nodeType == MatMulNodeType::MatMul ? "MatMul" : "FullyConnected"; selectedType = makeSelectedTypeStr(selectedType, outType); - auto params = builder::makeDynamicParams(netType, {inShapeA}); + ov::ParameterVector params{std::make_shared(netType, inShapeA)}; auto matrixB = builder::makeDynamicInputLayer(netType, secondaryInputType, inShapeB); if (secondaryInputType == helpers::InputLayerType::PARAMETER) { diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/matmul_sparse.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/matmul_sparse.cpp index 0ed18172b74..79e5546b136 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/matmul_sparse.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/matmul_sparse.cpp @@ -129,11 +129,11 @@ protected: bool transpose_b, const std::vector& weiData) { using namespace ngraph; - auto inputParamsFP32 = builder::makeDynamicParams(element::f32, {A.get_partial_shape()}); + auto inputParamsFP32 = std::make_shared(element::f32, A.get_partial_shape()); auto matrixBFP32 = builder::makeDynamicInputLayer(element::f32, helpers::InputLayerType::CONSTANT, inShapeB); auto matMulRelaxed = std::make_shared>( - *as_type_ptr(builder::makeMatMul(inputParamsFP32[0], matrixBFP32, transpose_a, transpose_b)), + *as_type_ptr(builder::makeMatMul(inputParamsFP32, matrixBFP32, transpose_a, transpose_b)), element::f32); auto matrixB = ngraph::builder::makeConstant(weiType, inShapeB.get_shape(), weiData); @@ -189,7 +189,7 @@ protected: cpuNodeType = "FullyConnected"; selectedType = makeSelectedTypeStr(selectedType, element::i8); - auto params = builder::makeDynamicParams(inType, {inShapeA}); + ov::ParameterVector params{std::make_shared(inType, inShapeA)}; auto paramOuts = helpers::convert2OutputVector(helpers::castOps2Nodes(params)); auto matrixB = builder::makeDynamicInputLayer(element::f32, helpers::InputLayerType::CONSTANT, inShapeB); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/non_max_suppression.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/non_max_suppression.cpp index a44efdbc0aa..09ffa26e16c 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/non_max_suppression.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/non_max_suppression.cpp @@ -147,7 +147,10 @@ protected: } std::shared_ptr maxOutBoxesPerClassNode; - auto params = ngraph::builder::makeDynamicParams(paramsPrec, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(paramsPrec, shape)); + } params[0]->set_friendly_name("param_1"); params[1]->set_friendly_name("param_2"); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/nonzero.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/nonzero.cpp index 8d51256334c..6e23e4025da 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/nonzero.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/nonzero.cpp @@ -82,7 +82,10 @@ protected: std::tie(startFrom, range) = genData; init_input_shapes({inputShape}); - auto inputParams = ngraph::builder::makeDynamicParams(netType, inputDynamicShapes); + ov::ParameterVector inputParams; + for (auto&& shape : inputDynamicShapes) { + inputParams.push_back(std::make_shared(netType, shape)); + } auto nonZero = std::make_shared(inputParams[0]); // I8 was used as a special placeholder during calculating of primitive type if input was U8, diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/normalize.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/normalize.cpp index 558b0d78002..e91dfbcc5b7 100755 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/normalize.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/normalize.cpp @@ -74,7 +74,10 @@ protected: targetDevice = ov::test::utils::DEVICE_CPU; init_input_shapes({shapes}); - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } auto normalize = builder::makeNormalizeL2(params[0], axes, eps, epsMode); function = makeNgraphFunction(inType, params, normalize, "Normalize"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/one_hot.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/one_hot.cpp index 69e495f5fd9..18713351eb1 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/one_hot.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/one_hot.cpp @@ -129,7 +129,7 @@ protected: compare(expectedOutputs, actualOutputs); } std::shared_ptr createFunction(bool depthConst) { - auto params = ngraph::builder::makeDynamicParams(ngraph::element::i32, {inputDynamicShapes.front()}); + ov::ParameterVector params{std::make_shared(ngraph::element::i32, inputDynamicShapes.front())}; params.front()->set_friendly_name("ParamsIndices"); std::shared_ptr depth; if (depthConst) { diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/pad.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/pad.cpp index dcb1b954dfe..227933e2a3f 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/pad.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/pad.cpp @@ -94,7 +94,10 @@ protected: targetShapes.push_back({padsEnd.size()}); targetShapes.push_back({}); } - auto params = ngraph::builder::makeDynamicParams(dataType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(dataType, shape)); + } std::shared_ptr pad; if (secondaryInputType == ngraph::helpers::InputLayerType::PARAMETER) { ov::Shape inShape = {padsBegin.size()}; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/pooling.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/pooling.cpp index 82f3b7df49e..6cb669f8af1 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/pooling.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/pooling.cpp @@ -108,8 +108,10 @@ protected: init_input_shapes({inputShapes}); - auto params = ngraph::builder::makeDynamicParams(inPrc, inputDynamicShapes); - + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inPrc, shape)); + } std::shared_ptr poolInput = params[0]; if (isInt8) { ov::Shape newShape(poolInput->get_output_partial_shape(0).size(), 1); @@ -194,7 +196,10 @@ protected: init_input_shapes({inputShapes}); - auto params = ngraph::builder::makeDynamicParams(inPrc, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inPrc, shape)); + } std::shared_ptr pooling = ngraph::builder::makeMaxPoolingV8(params[0], stride, dilation, padBegin, padEnd, kernel, roundingType, padType, indexElementType, axis); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/prior_box.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/prior_box.cpp index c41a5e49ce3..f865451a112 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/prior_box.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/prior_box.cpp @@ -137,8 +137,10 @@ protected: attributes.variance, attributes.scale_all_sizes) = specParams; - auto params = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); - + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } auto shape_of_1 = std::make_shared(params[0]); auto shape_of_2 = std::make_shared(params[1]); auto priorBox = std::make_shared( diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/prior_box_clustered.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/prior_box_clustered.cpp index acd47133390..2200f3754f5 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/prior_box_clustered.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/prior_box_clustered.cpp @@ -124,8 +124,10 @@ protected: attributes.offset, attributes.variances) = specParams; - auto params = ngraph::builder::makeDynamicParams(netPrecision, { inputShapes.first, imageShapes.first }); - + ov::ParameterVector params; + for (auto&& shape : { inputShapes.first, imageShapes.first }) { + params.push_back(std::make_shared(netPrecision, shape)); + } auto shape_of_1 = std::make_shared(params[0]); auto shape_of_2 = std::make_shared(params[1]); auto priorBoxClustered = std::make_shared( diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/proposal.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/proposal.cpp index cf3a892d935..2e770ad041a 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/proposal.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/proposal.cpp @@ -139,7 +139,10 @@ protected: init_input_shapes(inputShapes); auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); - auto params = ngraph::builder::makeDynamicParams(ngPrc, {inputDynamicShapes[0], inputDynamicShapes[1], inputDynamicShapes[2]}); + ov::ParameterVector params; + for (auto&& shape : {inputDynamicShapes[0], inputDynamicShapes[1], inputDynamicShapes[2]}) { + params.push_back(std::make_shared(ngPrc, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); ngraph::op::ProposalAttrs attrs; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/region_yolo.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/region_yolo.cpp index 582d655c0be..eae24f1a1eb 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/region_yolo.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/region_yolo.cpp @@ -79,8 +79,10 @@ protected: configuration.insert(additionalConfig.begin(), additionalConfig.end()); selectedType = getPrimitiveType() + "_" + InferenceEngine::details::convertPrecision(inPrc).name(); - auto paramRegionYolo = ngraph::builder::makeDynamicParams(inPrc, inputDynamicShapes); - + ov::ParameterVector paramRegionYolo; + for (auto&& shape : inputDynamicShapes) { + paramRegionYolo.push_back(std::make_shared(inPrc, shape)); + } const auto region_yolo = std::make_shared(paramRegionYolo[0], attributes.coordinates, attributes.classes, attributes.num_regions, attributes.do_softmax, mask, attributes.start_axis, attributes.end_axis); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/reverse_sequence.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/reverse_sequence.cpp index 52d598e31ee..2bca3ce329d 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/reverse_sequence.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/reverse_sequence.cpp @@ -70,7 +70,7 @@ protected: init_input_shapes({dataInputShape, seqLengthsShape}); const auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); - auto paramsIn = ngraph::builder::makeDynamicParams(ngPrc, {inputDynamicShapes[0]}); + ov::ParameterVector paramsIn{std::make_shared(ngPrc, inputDynamicShapes[0])}; constexpr auto seqLengthsPrc = ngraph::element::Type_t::i32; //according to the specification std::shared_ptr seqLengthsInput; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_cell.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_cell.cpp index ae420350cac..fff37ec8498 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_cell.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_cell.cpp @@ -88,7 +88,10 @@ protected: selectedType = makeSelectedTypeStr(selectedType, netPrecision); } - auto params = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } auto paramsOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); std::vector WRB = {{hiddenSize, inputSize}, {hiddenSize, hiddenSize}, {hiddenSize}}; auto rnnCellOp = ngraph::builder::makeRNN(paramsOuts, WRB, hiddenSize, activations, {}, {}, clip); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_sequence.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_sequence.cpp index 9e0ccfb486b..9dfff36079e 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_sequence.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_sequence.cpp @@ -106,7 +106,10 @@ protected: rel_threshold = 1e-4; } - auto params = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } const size_t batchSize = inputDynamicShapes[0][0].is_static() ? inputDynamicShapes[0][0].get_length() : inputDynamicShapes[1][0].is_static() ? inputDynamicShapes[1][0].get_length() : inputDynamicShapes.size() > 2 && inputDynamicShapes[2][0].is_static() ? inputDynamicShapes[2][0].get_length() : diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/roi_pooling.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/roi_pooling.cpp index 16a160ec8f1..f8c2235f02c 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/roi_pooling.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/roi_pooling.cpp @@ -205,7 +205,10 @@ protected: init_input_shapes(inputShapes); auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); - auto params = ngraph::builder::makeDynamicParams(ngPrc, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(ngPrc, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector( ngraph::helpers::castOps2Nodes(params)); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/roialign.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/roialign.cpp index 83124875d38..f764f79a896 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/roialign.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/roialign.cpp @@ -147,12 +147,15 @@ protected: init_input_shapes(inputShapes); - auto float_params = ngraph::builder::makeDynamicParams(inputPrecision, { inputDynamicShapes[0], inputDynamicShapes[1] }); - auto int_params = ngraph::builder::makeDynamicParams(ngraph::element::i32, { inputDynamicShapes[2] }); + ov::ParameterVector float_params; + for (auto&& shape : { inputDynamicShapes[0], inputDynamicShapes[1] }) { + float_params.push_back(std::make_shared(inputPrecision, shape)); + } + auto int_param = std::make_shared(ngraph::element::i32, inputDynamicShapes[2]); auto pooling_mode = ngraph::EnumNames::as_enum(mode); auto aligned_mode = ngraph::EnumNames::as_enum(alignedMode); - auto roialign = std::make_shared(float_params[0], float_params[1], int_params[0], pooledH, pooledW, + auto roialign = std::make_shared(float_params[0], float_params[1], int_param, pooledH, pooledW, samplingRatio, spatialScale, pooling_mode, aligned_mode); selectedType = makeSelectedTypeStr(selectedType, inputPrecision); @@ -160,7 +163,7 @@ protected: rel_threshold = 1e-2; } - ngraph::ParameterVector params{ float_params[0], float_params[1], int_params[0] }; + ngraph::ParameterVector params{ float_params[0], float_params[1], int_param }; function = makeNgraphFunction(inputPrecision, params, roialign, "ROIAlign"); } }; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/roll.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/roll.cpp index 13292bb25ed..17a47a969c5 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/roll.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/roll.cpp @@ -54,8 +54,10 @@ protected: init_input_shapes({inputShape}); - const auto paramsIn = ngraph::builder::makeDynamicParams(inputPrecision, inputDynamicShapes); - + ov::ParameterVector paramsIn; + for (auto&& shape : inputDynamicShapes) { + paramsIn.push_back(std::make_shared(inputPrecision, shape)); + } auto shiftNode = std::make_shared(ngraph::element::Type_t::i64, ngraph::Shape{shift.size()}, shift)->output(0); auto axesNode = std::make_shared(ngraph::element::Type_t::i64, ngraph::Shape{axes.size()}, axes)->output(0); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_ND_update.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_ND_update.cpp index 5cb7af051ba..79b3258b0c2 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_ND_update.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_ND_update.cpp @@ -101,15 +101,18 @@ protected: init_input_shapes(inputShapes); selectedType = makeSelectedTypeStr("unknown", inputPrecision); - auto dataParams = ngraph::builder::makeDynamicParams(inputPrecision, { inputDynamicShapes[0], inputDynamicShapes[2] }); - auto indicesParam = ngraph::builder::makeDynamicParams(idxPrecision, { inputDynamicShapes[1] }); + ov::ParameterVector dataParams; + for (auto&& shape : { inputDynamicShapes[0], inputDynamicShapes[2] }) { + dataParams.push_back(std::make_shared(inputPrecision, shape)); + } + auto indicesParam = std::make_shared(idxPrecision, inputDynamicShapes[1]); dataParams[0]->set_friendly_name("Param_1"); - indicesParam[0]->set_friendly_name("Param_2"); + indicesParam->set_friendly_name("Param_2"); dataParams[1]->set_friendly_name("Param_3"); - auto scatter = std::make_shared(dataParams[0], indicesParam[0], dataParams[1]); + auto scatter = std::make_shared(dataParams[0], indicesParam, dataParams[1]); - ngraph::ParameterVector allParams{ dataParams[0], indicesParam[0], dataParams[1] }; + ngraph::ParameterVector allParams{ dataParams[0], indicesParam, dataParams[1] }; function = makeNgraphFunction(inputPrecision, allParams, scatter, "ScatterNDUpdateLayerCPUTest"); } }; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_elements_update.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_elements_update.cpp index 88b9b651acc..a63edb957f1 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_elements_update.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_elements_update.cpp @@ -105,16 +105,19 @@ protected: init_input_shapes(inputShapes); selectedType = makeSelectedTypeStr("unknown", inputPrecision); - auto dataParams = ngraph::builder::makeDynamicParams(inputPrecision, { inputDynamicShapes[0], inputDynamicShapes[2] }); - auto indicesParam = ngraph::builder::makeDynamicParams(idxPrecision, { inputDynamicShapes[1] }); + ov::ParameterVector dataParams; + for (auto&& shape : { inputDynamicShapes[0], inputDynamicShapes[2] }) { + dataParams.push_back(std::make_shared(inputPrecision, shape)); + } + auto indicesParam = std::make_shared(idxPrecision, inputDynamicShapes[1]); dataParams[0]->set_friendly_name("Param_1"); - indicesParam[0]->set_friendly_name("Param_2"); + indicesParam->set_friendly_name("Param_2"); dataParams[1]->set_friendly_name("Param_3"); auto axisNode = ngraph::opset3::Constant::create(idxPrecision, {}, { axis }); - auto scatter = std::make_shared(dataParams[0], indicesParam[0], dataParams[1], axisNode); + auto scatter = std::make_shared(dataParams[0], indicesParam, dataParams[1], axisNode); - ngraph::ParameterVector allParams{ dataParams[0], indicesParam[0], dataParams[1] }; + ngraph::ParameterVector allParams{ dataParams[0], indicesParam, dataParams[1] }; function = makeNgraphFunction(inputPrecision, allParams, scatter, "ScatterElementsUpdateLayerCPUTest"); } }; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_update.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_update.cpp index ae1929dc179..2217ecb260b 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_update.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_update.cpp @@ -70,7 +70,10 @@ protected: init_input_shapes(inputShapes); selectedType = makeSelectedTypeStr("unknown", inputPrecision); - auto params = ngraph::builder::makeDynamicParams(inputPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inputPrecision, shape)); + } auto indicesNode = ngraph::opset1::Constant::create(idxPrecision, indicesDescr.first, indicesDescr.second); auto axis_node = ngraph::opset1::Constant::create(idxPrecision, {}, { axis }); auto scatter = std::make_shared(params[0], indicesNode, params[1], axis_node); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/select.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/select.cpp index 85b98fe8259..eda55181ff6 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/select.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/select.cpp @@ -60,7 +60,12 @@ protected: std::tie(inFmts, outFmts, priority, selectedType) = emptyCPUSpec; selectedType = makeSelectedTypeStr(getPrimitiveType(), ov::element::i8); - auto parameters = ngraph::builder::makeDynamicParams(ov::element::TypeVector{ov::element::boolean, precision, precision}, inputDynamicShapes); + ov::element::TypeVector types{ov::element::boolean, precision, precision}; + ov::ParameterVector parameters; + for (size_t i = 0; i < types.size(); i++) { + auto param_node = std::make_shared(types[i], inputDynamicShapes[i]); + parameters.push_back(param_node); + } auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(parameters)); auto select = ngraph::builder::makeSelect(paramOuts, broadcast); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/shape_ops.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/shape_ops.cpp index 06ec80bd0bf..3b09dad3c7b 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/shape_ops.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/shape_ops.cpp @@ -159,14 +159,15 @@ protected: init_input_shapes(inputShapes); auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(prc); - auto inputs = ngraph::builder::makeDynamicParams(ngPrc, {inputDynamicShapes.front()}); + ov::ParameterVector inputs{std::make_shared(ngPrc, inputDynamicShapes.front())}; auto dataInput = inputs.front(); dataInput->set_friendly_name("param_1"); std::shared_ptr secondaryInput; if (secondType == ngraph::helpers::InputLayerType::PARAMETER) { - secondaryInput = ngraph::builder::makeDynamicParams(secondInPrc, {inputDynamicShapes.back()}).front(); - secondaryInput->set_friendly_name("param_2"); - inputs.push_back(std::dynamic_pointer_cast(secondaryInput)); + auto param = std::make_shared(secondInPrc, inputDynamicShapes.back()); + param->set_friendly_name("param_2"); + secondaryInput = param; + inputs.push_back(param); } else { secondaryInput = ngraph::builder::makeConstant(secondInPrc, {inpDesc.data[0].size()}, inpDesc.data[0]); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/shapeof.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/shapeof.cpp index ab493a7377f..c5ad3064000 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/shapeof.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/shapeof.cpp @@ -68,7 +68,10 @@ protected: outType = ElementType::i32; selectedType = makeSelectedTypeStr("ref", inType); - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); auto shapeOf = std::make_shared(paramOuts[0], ngraph::element::i32); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/shuffle_channels.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/shuffle_channels.cpp index e82671cf9d7..d182943e772 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/shuffle_channels.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/shuffle_channels.cpp @@ -65,7 +65,10 @@ protected: targetDevice = ov::test::utils::DEVICE_CPU; init_input_shapes({shapes}); - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } auto shuffleChannels = std::dynamic_pointer_cast( ngraph::builder::makeShuffleChannels(params[0], axis, group)); function = makeNgraphFunction(inType, params, shuffleChannels, "ShuffleChannels"); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/slice.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/slice.cpp index 28d00f8753b..4068e5702cc 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/slice.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/slice.cpp @@ -98,7 +98,10 @@ protected: targetShapes.push_back({sliceParams.axes.size()}); } - auto params = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } std::shared_ptr sliceNode; if (secondaryInputType == ngraph::helpers::InputLayerType::PARAMETER) { // Slice start, stop, step, axes are parameters. diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/softmax.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/softmax.cpp index fdc249e91fc..70484a14b25 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/softmax.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/softmax.cpp @@ -68,8 +68,10 @@ protected: } selectedType = makeSelectedTypeStr(selectedType, inType); init_input_shapes({config.inputShape}); - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); - + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } const auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/space_to_batch.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/space_to_batch.cpp index 45bb4db576b..82f4e23cf75 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/space_to_batch.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/space_to_batch.cpp @@ -106,7 +106,7 @@ protected: else selectedType = std::string("ref_any_") + netPrecision.name(); - auto params = ngraph::builder::makeDynamicParams(ngPrec, {inputDynamicShapes.front()}); + ov::ParameterVector params{std::make_shared(ngPrec, inputDynamicShapes.front())}; auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); paramShape = {paramOuts[0].get_partial_shape().size()}; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/space_to_depth.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/space_to_depth.cpp index bf6bdc858a8..8e840ed01ce 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/space_to_depth.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/space_to_depth.cpp @@ -72,7 +72,10 @@ protected: targetDevice = ov::test::utils::DEVICE_CPU; init_input_shapes({shapes}); - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } auto d2s = ngraph::builder::makeSpaceToDepth(params[0], mode, blockSize); function = makeNgraphFunction(inType, params, d2s, "SpaceToDepthCPU"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/split.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/split.cpp index 059d0651344..4842902d045 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/split.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/split.cpp @@ -70,7 +70,10 @@ protected: init_input_shapes({inputShapes}); - auto params = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector( ngraph::helpers::castOps2Nodes(params)); auto split = std::dynamic_pointer_cast(ngraph::builder::makeSplit(paramOuts[0], diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/strided_slice.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/strided_slice.cpp index e60cd029973..47d8b529e8a 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/strided_slice.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/strided_slice.cpp @@ -103,7 +103,10 @@ protected: targetShapes.push_back({ssParams.strides.size()}); } - auto params = ngraph::builder::makeDynamicParams(dataType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(dataType, shape)); + } std::shared_ptr ss; if (secondaryInputType == ngraph::helpers::InputLayerType::PARAMETER) { ov::Shape inShape = {ssParams.begin.size()}; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/tensor_iterator.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/tensor_iterator.cpp index 9b583a2c58c..6452fb86579 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/tensor_iterator.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/tensor_iterator.cpp @@ -54,7 +54,10 @@ protected: const size_t sequence_axis = 1; auto tensor_iterator = std::make_shared(); - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } ngraph::ParameterVector body_params; for (size_t i = 0; i < shapes.size(); i++) { diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/topk.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/topk.cpp index c78e198d6ce..f829ec6db4d 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/topk.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/topk.cpp @@ -116,7 +116,7 @@ protected: } } - auto params = ngraph::builder::makeDynamicParams(netPrecision, {inputDynamicShapes[0]}); + ov::ParameterVector params{std::make_shared(netPrecision, inputDynamicShapes[0])}; // static shape need specific const k to test different sorting algorithms, dynamic shape tests random param k std::shared_ptr topk; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/unique.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/unique.cpp index e68e8b0f333..1a61880e727 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/unique.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/unique.cpp @@ -94,7 +94,10 @@ protected: selectedType = makeSelectedTypeStr(selectedType, dataPrecision); } - auto params = ngraph::builder::makeDynamicParams(dataPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(dataPrecision, shape)); + } params[0]->set_friendly_name("data"); auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); std::shared_ptr uniqueNode; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/variadic_split.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/variadic_split.cpp index 0abb4c6859a..21d239eccf5 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/variadic_split.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/variadic_split.cpp @@ -74,7 +74,7 @@ protected: } init_input_shapes(shapesToInit); - auto params = ngraph::builder::makeDynamicParams(netPrecision, {inputDynamicShapes[0]}); + ov::ParameterVector params{std::make_shared(netPrecision, inputDynamicShapes[0])}; std::shared_ptr splitLengthsOp; if (lengthsType == ngraph::helpers::InputLayerType::PARAMETER) { diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/arm/convert_group_conv.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/arm/convert_group_conv.cpp index 41c82ea98ed..057b29e1fa1 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/arm/convert_group_conv.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/arm/convert_group_conv.cpp @@ -58,7 +58,10 @@ protected: const size_t numOutChannels = 30; const op::PadType paddingType = op::PadType::EXPLICIT; - auto inputParams = ngraph::builder::makeDynamicParams(ngraph::element::f32, inputDynamicShapes); + ov::ParameterVector inputParams; + for (auto&& shape : inputDynamicShapes) { + inputParams.push_back(std::make_shared(ngraph::element::f32, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(inputParams)); conv = builder::makeGroupConvolution(paramOuts.front(), element::f32, kernelSize, strides, padBegin, padEnd, dilation, paddingType, numOutChannels, numOfGroups); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/arm/convert_group_conv1d.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/arm/convert_group_conv1d.cpp index f6cf8e64552..2b68d838946 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/arm/convert_group_conv1d.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/arm/convert_group_conv1d.cpp @@ -63,7 +63,10 @@ protected: const size_t numOfGroups = 2; const op::PadType paddingType = op::PadType::EXPLICIT; - auto inputParams = ngraph::builder::makeDynamicParams(ngraph::element::f32, inputDynamicShapes); + ov::ParameterVector inputParams; + for (auto&& shape : inputDynamicShapes) { + inputParams.push_back(std::make_shared(ngraph::element::f32, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(inputParams)); switch (convType) { case nodeType::convolution : { diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/arm/convert_reduce_multi_axis.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/arm/convert_reduce_multi_axis.cpp index 6ffefea6464..8273d5dcd2a 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/arm/convert_reduce_multi_axis.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/arm/convert_reduce_multi_axis.cpp @@ -63,7 +63,10 @@ protected: init_input_shapes(inputShapes); - auto params = ngraph::builder::makeDynamicParams(ngraph::element::f32, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(ngraph::element::f32, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); std::vector shapeAxes; shapeAxes.push_back(axes.size()); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/broadcast_eltwise.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/broadcast_eltwise.cpp index 479e5048b78..8eca244cc02 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/broadcast_eltwise.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/broadcast_eltwise.cpp @@ -53,7 +53,11 @@ protected: init_input_shapes(input_shapes); ov::element::TypeVector input_precisions{input_precision, ov::element::i64}; - const auto params = ngraph::builder::makeDynamicParams(input_precisions, inputDynamicShapes); + ov::ParameterVector params; + for (size_t i = 0; i < input_precisions.size(); i++) { + auto param_node = std::make_shared(input_precisions[i], inputDynamicShapes[i]); + params.push_back(param_node); + } const auto bcast_data = ov::opset10::Constant::create(input_precision, {}, {1.f}); const auto bcast = std::make_shared(bcast_data, params[1]); const auto add = std::make_shared(params[0], bcast); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/concat_reshape_concat.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/concat_reshape_concat.cpp index 4cb280a10f3..41507b4ae9e 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/concat_reshape_concat.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/concat_reshape_concat.cpp @@ -79,8 +79,10 @@ public: auto& InputShapes = this->GetParam(); ASSERT_EQ(InputShapes.size(), number_of_params) << "Unexpected number of input shapes"; init_input_shapes(InputShapes); - auto input_params = ngraph::builder::makeDynamicParams(netPrc, inputDynamicShapes); - + ov::ParameterVector input_params; + for (auto&& shape : inputDynamicShapes) { + input_params.push_back(std::make_shared(netPrc, shape)); + } ov::NodeVector first_level_reshapes; for (size_t i = 0; i < number_of_params; ++i) { diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_dw_conv.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_dw_conv.cpp index 8416c34dd8a..b13b3c0a440 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_dw_conv.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_dw_conv.cpp @@ -19,7 +19,10 @@ protected: init_input_shapes({input_shape}); - auto params = ngraph::builder::makeDynamicParams(precision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(precision, shape)); + } auto conv_weights = ngraph::builder::makeConstant(precision, std::vector{32, 32, 1, 1}, std::vector{}, true); auto conv = ngraph::builder::makeConvolution(params[0], conv_weights, diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_sum_broadcast.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_sum_broadcast.cpp index b4eb72521c9..c33cd1aa784 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_sum_broadcast.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_sum_broadcast.cpp @@ -61,7 +61,11 @@ public: } virtual ngraph::ParameterVector makeParams() { - return ngraph::builder::makeDynamicParams(ngraph::element::f32, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(ngraph::element::f32, shape)); + } + return params; } virtual std::shared_ptr makeConv(const ngraph::ParameterVector& inputParams) { @@ -188,10 +192,10 @@ public: std::shared_ptr makeConv(const ngraph::ParameterVector& inputParams) override { using namespace ngraph; - auto inputParamsFP32 = builder::makeDynamicParams(element::f32, { inputParams.front()->get_partial_shape() }); + auto inputParamsFP32 = std::make_shared(element::f32, inputParams.front()->get_partial_shape()); auto convolutionNodeRelaxed = std::make_shared>( - *as_type_ptr(builder::makeConvolution(inputParamsFP32.front(), element::f32, _kernel, _stride, _padBegin, + *as_type_ptr(builder::makeConvolution(inputParamsFP32, element::f32, _kernel, _stride, _padBegin, _padEnd, _dilation, ngraph::op::PadType::EXPLICIT, _convOutChannels)), element::f32); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/convert_fq_rnn_to_quantized_rnn.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/convert_fq_rnn_to_quantized_rnn.cpp index 41eaf8e25c4..0c0832c486e 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/convert_fq_rnn_to_quantized_rnn.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/convert_fq_rnn_to_quantized_rnn.cpp @@ -110,10 +110,12 @@ protected: const size_t numOfBiasGates = rnnType == "LBRGRUSequence" ? numOfGates + 1 : numOfGates; const auto ngPrec = element::f32; - ngraph::ParameterVector inputParams; std::shared_ptr H; - inputParams = ngraph::builder::makeDynamicParams(ngPrec, inputDynamicShapes); + ov::ParameterVector inputParams; + for (auto&& shape : inputDynamicShapes) { + inputParams.push_back(std::make_shared(ngPrec, shape)); + } const auto outputNodes = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(inputParams)); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/custom_op_insert_convert_i64.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/custom_op_insert_convert_i64.cpp index afde4960bc3..0e75077664e 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/custom_op_insert_convert_i64.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/custom_op_insert_convert_i64.cpp @@ -101,7 +101,10 @@ protected: std::tie(inType, inputShape) = this->GetParam(); init_input_shapes({inputShape}); - auto inputParams = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector inputParams; + for (auto&& shape : inputDynamicShapes) { + inputParams.push_back(std::make_shared(inType, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(inputParams)); auto customOp = std::make_shared(paramOuts); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/eltwise_chain.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/eltwise_chain.cpp index 0eac2591bd7..a40023a1592 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/eltwise_chain.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/eltwise_chain.cpp @@ -97,7 +97,7 @@ protected: ngraphInputs.push_back(ngraphParam.back()); } } else { - ngraphParam = ngraph::builder::makeDynamicParams(inputPrecisions[0], {inputDynamicShapes.front()}); + ngraphParam = ov::ParameterVector {std::make_shared(inputPrecisions[0], inputDynamicShapes.front())}; for (size_t i = 1; i < inputPrecisions.size(); i++) { std::vector ngraphInput1Data(ngraph::shape_size(targetStaticShapes[0][i])); ngraphInputs.push_back(ngraph::builder::makeConstant(inputPrecisions[i], targetStaticShapes[0][i], diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/matmul_decompress_convert.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/matmul_decompress_convert.cpp index d61280efc5e..7688dd403c1 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/matmul_decompress_convert.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/matmul_decompress_convert.cpp @@ -208,7 +208,7 @@ protected: std::string cpuNodeType = "FullyConnected"; selectedType = makeSelectedTypeStr(selectedType, outType); - auto params = builder::makeDynamicParams(inType, {inShapeA}); + ov::ParameterVector params{std::make_shared(inType, inShapeA)}; auto paramOuts = helpers::convert2OutputVector(helpers::castOps2Nodes(params)); std::shared_ptr inputB = builder::makeConstant(weiConstElemType, inShapeB.get_shape(), {}, true); if (weiConstElemType == ElementType::f16) { @@ -490,7 +490,10 @@ protected: std::string cpuNodeType = "FullyConnected"; selectedType = makeSelectedTypeStr(selectedType, outType); - auto params = builder::makeDynamicParams(inType, {inShapeFC0, inShapeFC1}); + ov::ParameterVector params; + for (auto&& shape : {inShapeFC0, inShapeFC1}) { + params.push_back(std::make_shared(inType, shape)); + } auto paramOuts = helpers::convert2OutputVector(helpers::castOps2Nodes(params)); std::shared_ptr inputWeights = builder::makeConstant(weiConstElemType, inShapeWeights.get_shape(), {}, true); if (weiConstElemType == ElementType::f16) { diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/matmul_weights_decompression.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/matmul_weights_decompression.cpp index ab625987398..a7f52069b98 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/matmul_weights_decompression.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/matmul_weights_decompression.cpp @@ -100,7 +100,7 @@ protected: const bool transpose_weights, const bool add_subtract, const bool reshape_on_decompression) { - auto params = builder::makeDynamicParams(data_precision, {inputShapes[0]}); + ov::ParameterVector params{std::make_shared(data_precision, inputShapes[0])}; auto transpose_if_necessary = [&](const ov::Shape& shape) { if (!transpose_weights) return shape; diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/ngram.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/ngram.cpp index 1a5580a55d5..898be51eb21 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/ngram.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/ngram.cpp @@ -52,8 +52,11 @@ static std::shared_ptr initNgram(std::vector& input const size_t mid_idx = left_pad; ov::element::TypeVector input_precisions{data_et, idces_et}; - auto params = ngraph::builder::makeDynamicParams(input_precisions, input_shapes); - + ov::ParameterVector params; + for (size_t i = 0; i < input_precisions.size(); i++) { + auto param_node = std::make_shared(input_precisions[i], input_shapes[i]); + params.push_back(param_node); + } auto shape_of = std::make_shared(params[0], idces_et); auto shape_ss_begin = ov::opset1::Constant::create(idces_et, {1}, {0}); auto shape_ss_end = ov::opset1::Constant::create(idces_et, {1}, {1}); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/remove_convert.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/remove_convert.cpp index 7e3f13bf4fd..3d7b72d31a3 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/remove_convert.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/remove_convert.cpp @@ -42,8 +42,8 @@ public: std::tie(inFmts, outFmts, priority, selectedType) = CPUSpecificParams{{}, {}, {}, makeSelectedTypeStr("ref", inType)}; init_input_shapes({inputShape}); - auto input_params = builder::makeDynamicParams(inType, {inputShape.first}); - auto convert = builder::makeConversion(input_params[0], element::f32, ::helpers::ConversionTypes::CONVERT); + auto input_params = std::make_shared(inType, inputShape.first); + auto convert = builder::makeConversion(input_params, element::f32, ::helpers::ConversionTypes::CONVERT); auto begin = builder::makeConstant(element::i64, ov::Shape{4}, std::vector{0, 0, 0, 0}); auto end = builder::makeConstant(element::i64, ov::Shape{4}, std::vector{0, 0, 16, 0}); auto stride = builder::makeConstant(element::i64, ov::Shape{4}, std::vector{1, 1, 1, 1}); @@ -58,7 +58,7 @@ public: {}, {}); auto convert2 = builder::makeConversion(slice, inType, ::helpers::ConversionTypes::CONVERT); - function = std::make_shared(convert2, input_params, "remove_convert"); + function = std::make_shared(convert2, ov::ParameterVector{input_params}, "remove_convert"); }; }; @@ -83,12 +83,12 @@ public: targetDevice = ov::test::utils::DEVICE_CPU; init_input_shapes({inputShape}); - auto input_params = builder::makeDynamicParams(inType, {inputShape.first}); + auto input_params = std::make_shared(inType, inputShape.first); // Such complicated graph is necessary to cover the case when Convert has several children and connected to non zero output const auto split_axis = builder::makeConstant(element::i64, ov::Shape{}, std::vector{1}); const auto split_lengths = builder::makeConstant(element::i64, ov::Shape{2}, std::vector{-1, 1}); - const auto split = std::make_shared(input_params[0], split_axis, split_lengths); + const auto split = std::make_shared(input_params, split_axis, split_lengths); auto convert = builder::makeConversion(split->output(1), inType, ::helpers::ConversionTypes::CONVERT); auto relu = builder::makeActivation(convert, inType, ::helpers::ActivationTypes::Relu); @@ -98,7 +98,7 @@ public: std::make_shared(relu), }; - function = std::make_shared(results, input_params, "remove_convert"); + function = std::make_shared(results, ov::ParameterVector{input_params}, "remove_convert"); }; }; diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_chain.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_chain.cpp index 3699b593815..daaeb933649 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_chain.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_chain.cpp @@ -21,7 +21,10 @@ class ReshapeChain : public SubgraphBaseTest { init_input_shapes({inputShapes}); auto ngPrc = ngraph::element::f32; const auto secondInPrc = ngraph::element::Type_t::i32; - auto inputParams = ngraph::builder::makeDynamicParams(ngPrc, inputDynamicShapes); + ov::ParameterVector inputParams; + for (auto&& shape : inputDynamicShapes) { + inputParams.push_back(std::make_shared(ngPrc, shape)); + } auto reshapeParam1 = ngraph::builder::makeConstant(secondInPrc, {3}, {0, 0, -1}); auto reshape1 = std::make_shared(inputParams.front(), reshapeParam1, true); auto reshapeParam2 = ngraph::builder::makeConstant(secondInPrc, {2}, {0, -1}); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_fc.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_fc.cpp index ec388d56067..4653de36314 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_fc.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_fc.cpp @@ -81,7 +81,7 @@ protected: init_input_shapes(shapes); - auto params = ngraph::builder::makeDynamicParams(prc, {inputDynamicShapes.front()}); + ov::ParameterVector params{std::make_shared(prc, inputDynamicShapes.front())}; auto reshapeData = ngraph::builder::makeConstant(ElementType::i32, {data.size()}, data); auto reshape = std::make_shared(params[0], reshapeData, true); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/seq_native_order.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/seq_native_order.cpp index e76ddd9cee1..e0310b4937c 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/seq_native_order.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/seq_native_order.cpp @@ -171,8 +171,11 @@ protected: if (seqInType == ngraph::helpers::InputLayerType::PARAMETER) { types.back() = ElementType::i64; } - auto params = ngraph::builder::makeDynamicParams(types, inputDynamicShapes); - + ov::ParameterVector params; + for (size_t i = 0; i < types.size(); i++) { + auto param_node = std::make_shared(types[i], inputDynamicShapes[i]); + params.push_back(param_node); + } std::vector order_ref_before = {1, 0, 2}; const auto order_before = std::make_shared(ov::element::i64, ov::Shape({order_ref_before.size()}), diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/split_concat_add.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/split_concat_add.cpp index 2e013ae4493..7f7b2d6eb24 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/split_concat_add.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/split_concat_add.cpp @@ -42,7 +42,10 @@ protected: ov::test::InputShape input_shape{{}, {{1, 3, 3, 3}}}; init_input_shapes({input_shape}); - auto params = ngraph::builder::makeDynamicParams(precision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(precision, shape)); + } auto split = ngraph::builder::makeSplit(params.front(), precision, 3, 1); auto add_const = ngraph::builder::makeConstant(precision, {1}, std::vector({1.0f})); auto add_1 = ngraph::builder::makeEltwise(split->output(0), add_const, ngraph::helpers::EltwiseTypes::ADD); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/split_matmul_concat.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/split_matmul_concat.cpp index 22dda41fb1a..215eb6c8839 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/split_matmul_concat.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/split_matmul_concat.cpp @@ -106,7 +106,7 @@ protected: const auto& inShapeA = inputDynamicShapes[0]; const auto& inShapeB = inputDynamicShapes[1]; - auto params = builder::makeDynamicParams(ElementType::f32, {inShapeA}); + ov::ParameterVector params{std::make_shared(ElementType::f32, inShapeA)}; auto paramOuts = helpers::convert2OutputVector(helpers::castOps2Nodes(params)); std::shared_ptr inputB = builder::makeConstant(ElementType::f32, inShapeB.get_shape(), {}, true); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/static_zero_dims.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/static_zero_dims.cpp index 5c6d2e20a7d..6bfbef66a25 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/static_zero_dims.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/static_zero_dims.cpp @@ -21,8 +21,10 @@ protected: init_input_shapes({inputShapes}); auto ngPrc = ngraph::element::f32; - auto inputParams = ngraph::builder::makeDynamicParams(ngPrc, inputDynamicShapes); - + ov::ParameterVector inputParams; + for (auto&& shape : inputDynamicShapes) { + inputParams.push_back(std::make_shared(ngPrc, shape)); + } auto splitAxisOp = std::make_shared(ngraph::element::i64, ngraph::Shape{}, std::vector{0}); std::vector splitLenght = {1, 0, 6}; auto splitLengthsOp = std::make_shared(ngraph::element::i32, ngraph::Shape{splitLenght.size()}, splitLenght); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/strided_slice_zero_dims.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/strided_slice_zero_dims.cpp index d5e3a38b9aa..5b9a2f5b1f7 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/strided_slice_zero_dims.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/strided_slice_zero_dims.cpp @@ -36,7 +36,10 @@ public: InputShape inpShape0 = {{}, {{56}}}; InputShape inpShape1 = {{-1, -1, 768}, {{1, 544, 768}}}; init_input_shapes({inpShape0, inpShape1}); - auto inputParams = builder::makeDynamicParams(element::f32, inputDynamicShapes); + ov::ParameterVector inputParams; + for (auto&& shape : inputDynamicShapes) { + inputParams.push_back(std::make_shared(ov::element::f32, shape)); + } auto end = builder::makeConstant(element::i64, {1}, std::vector{2147483647}); auto stride = builder::makeConstant(element::i64, {1}, std::vector{1}); auto indices = builder::makeConstant(element::i64, {1}, std::vector{1}); diff --git a/src/plugins/intel_cpu/tests/functional/test_utils/fusing_test_utils.hpp b/src/plugins/intel_cpu/tests/functional/test_utils/fusing_test_utils.hpp index 6bc37a3a068..32d22393bef 100644 --- a/src/plugins/intel_cpu/tests/functional/test_utils/fusing_test_utils.hpp +++ b/src/plugins/intel_cpu/tests/functional/test_utils/fusing_test_utils.hpp @@ -360,7 +360,7 @@ const auto fusingFakeQuantizePerTensorRelu = fusingSpecificParams{std::make_shar const auto fusingSum = fusingSpecificParams{std::make_shared(std::vector{ {[](postNodeConfig& cfg){ auto shape = cfg.input->get_output_partial_shape(0); - ngraph::ParameterVector newParams = ngraph::builder::makeDynamicParams(cfg.type, {shape}); + ov::ParameterVector newParams{std::make_shared(cfg.type, shape)}; cfg.params.insert(cfg.params.end(), newParams.begin(), newParams.end()); auto newParamOuts = ngraph::helpers::convert2OutputVector( ngraph::helpers::castOps2Nodes(newParams)); @@ -370,7 +370,7 @@ const auto fusingSum = fusingSpecificParams{std::make_shared(std:: const auto fusingSumEluFQ = fusingSpecificParams{std::make_shared(std::vector{ {[](postNodeConfig& cfg){ auto shape = cfg.input->get_output_partial_shape(0); - ngraph::ParameterVector newParams = ngraph::builder::makeDynamicParams(cfg.type, {shape}); + ov::ParameterVector newParams{std::make_shared(cfg.type, shape)}; cfg.params.insert(cfg.params.end(), newParams.begin(), newParams.end()); auto newParamOuts = ngraph::helpers::convert2OutputVector( ngraph::helpers::castOps2Nodes(newParams)); diff --git a/src/plugins/intel_gna/tests/functional/preprocess_tests/precision_convert.cpp b/src/plugins/intel_gna/tests/functional/preprocess_tests/precision_convert.cpp index 0384f1f1956..7221fd751ec 100644 --- a/src/plugins/intel_gna/tests/functional/preprocess_tests/precision_convert.cpp +++ b/src/plugins/intel_gna/tests/functional/preprocess_tests/precision_convert.cpp @@ -54,7 +54,10 @@ protected: init_input_shapes({input_shapes}); - auto params = ngraph::builder::makeDynamicParams(net_type, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(net_type, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); auto concat = std::make_shared(paramOuts, 1); diff --git a/src/plugins/intel_gpu/tests/functional/behavior/memory_dyn_batch.cpp b/src/plugins/intel_gpu/tests/functional/behavior/memory_dyn_batch.cpp index 4d6550bf322..0eaa4a79240 100644 --- a/src/plugins/intel_gpu/tests/functional/behavior/memory_dyn_batch.cpp +++ b/src/plugins/intel_gpu/tests/functional/behavior/memory_dyn_batch.cpp @@ -54,14 +54,14 @@ public: } static std::shared_ptr buildModel(ElementType precision, const ov::PartialShape& shape) { - auto param = builder::makeDynamicParams(precision, { shape }); + auto param = std::make_shared(precision, shape); const VariableInfo variable_info { shape, precision, "v0" }; auto variable = std::make_shared(variable_info); - auto read_value = std::make_shared(param.at(0), variable); - auto add = std::make_shared(read_value, param.at(0)); + auto read_value = std::make_shared(param, variable); + auto add = std::make_shared(read_value, param); auto assign = std::make_shared(add, variable); auto res = std::make_shared(add); - return std::make_shared(ResultVector { res }, SinkVector { assign }, param, + return std::make_shared(ResultVector { res }, SinkVector { assign }, ov::ParameterVector{param}, "MemoryDynamicBatchTest"); } diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/convolution.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/convolution.cpp index 82e0caaff3f..85ad9b8f047 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/convolution.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/convolution.cpp @@ -84,7 +84,10 @@ protected: size_t convOutChannels; std::tie(kernel, stride, padBegin, padEnd, dilation, convOutChannels, padType) = convParams; - auto inputParams = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector inputParams; + for (auto&& shape : inputDynamicShapes) { + inputParams.push_back(std::make_shared(inType, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(inputParams)); auto convolutionNode = ngraph::builder::makeConvolution(paramOuts.front(), netType, kernel, stride, padBegin, diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/batch_to_space.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/batch_to_space.cpp index bb2bb3341b0..e327f14389b 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/batch_to_space.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/batch_to_space.cpp @@ -120,7 +120,7 @@ protected: init_input_shapes(inputShapes); - auto params = ngraph::builder::makeDynamicParams(inType, {inputDynamicShapes.front()}); + ov::ParameterVector params{std::make_shared(inType, inputDynamicShapes.front())}; std::shared_ptr blockInput, beginInput, endInput; if (restInputType == ngraph::helpers::InputLayerType::PARAMETER) { auto blockNode = std::make_shared(ngraph::element::Type_t::i64, ov::Shape{block.size()}); diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/convolution.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/convolution.cpp index 224fccc1d07..7ac53f647d8 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/convolution.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/convolution.cpp @@ -84,7 +84,10 @@ protected: size_t convOutChannels; std::tie(kernel, stride, padBegin, padEnd, dilation, convOutChannels, padType) = convParams; - auto inputParams = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector inputParams; + for (auto&& shape : inputDynamicShapes) { + inputParams.push_back(std::make_shared(inType, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(inputParams)); auto convolutionNode = ngraph::builder::makeConvolution(paramOuts.front(), netType, kernel, stride, padBegin, diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/convolution_backprop_data.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/convolution_backprop_data.cpp index 50a6d61457e..ab535def809 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/convolution_backprop_data.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/convolution_backprop_data.cpp @@ -164,7 +164,7 @@ public: } std::shared_ptr createGraph(const std::vector& inShapes, ngraph::helpers::InputLayerType outShapeType) { - auto params = ngraph::builder::makeDynamicParams(prec, {inShapes.front()}); + ov::ParameterVector params{std::make_shared(prec, inShapes.front())}; std::shared_ptr outShapeNode; if (!outShapeData.empty()) { if (outShapeType == ngraph::helpers::InputLayerType::PARAMETER) { diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/cum_sum.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/cum_sum.cpp index eccdbb73101..70e03b27df4 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/cum_sum.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/cum_sum.cpp @@ -59,7 +59,10 @@ protected: init_input_shapes({shapes}); - auto params = ngraph::builder::makeDynamicParams(inputPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inputPrecision, shape)); + } auto axisNode = ngraph::opset1::Constant::create(ngraph::element::i32, ngraph::Shape{}, std::vector{axis})->output(0); auto cumSum = std::make_shared(params[0], axisNode, exclusive, reverse); diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/detection_output.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/detection_output.cpp index cba4a9d88b3..2ae2dab3568 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/detection_output.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/detection_output.cpp @@ -195,7 +195,10 @@ protected: init_input_shapes({ inShapes }); - auto params = ngraph::builder::makeDynamicParams(ngraph::element::f32, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(ngraph::element::f32, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); if (attrs.num_classes == -1) { diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/deth_to_space.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/deth_to_space.cpp index 56c599268c0..d568c2ec10c 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/deth_to_space.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/deth_to_space.cpp @@ -64,7 +64,10 @@ protected: targetDevice = ov::test::utils::DEVICE_GPU; init_input_shapes({shapes}); - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } auto d2s = ngraph::builder::makeDepthToSpace(params[0], mode, blockSize); ngraph::ResultVector results; diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/gather_tree.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/gather_tree.cpp index e91f5a77440..72635ae748e 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/gather_tree.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/gather_tree.cpp @@ -77,7 +77,7 @@ protected: std::shared_ptr inp3; std::shared_ptr inp4; - auto paramsIn = ngraph::builder::makeDynamicParams(netPrecision, {inputDynamicShapes[0]}); + ov::ParameterVector paramsIn{std::make_shared(netPrecision, inputDynamicShapes[0])}; if (ngraph::helpers::InputLayerType::PARAMETER == secondaryInputType) { inp2 = ngraph::builder::makeDynamicInputLayer(netPrecision, secondaryInputType, inputDynamicShapes[1]); inp3 = ngraph::builder::makeDynamicInputLayer(netPrecision, secondaryInputType, inputDynamicShapes[2]); diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/grid_sample.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/grid_sample.cpp index 7abb0c94d8d..96f93e1ac05 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/grid_sample.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/grid_sample.cpp @@ -79,7 +79,8 @@ protected: rel_threshold = 0.01f; } - auto params = ngraph::builder::makeDynamicParams({dataPrecision, gridPrecision}, inputDynamicShapes); + ov::ParameterVector params{std::make_shared(dataPrecision, inputDynamicShapes[0]), + std::make_shared(gridPrecision, inputDynamicShapes[1])}; params[0]->set_friendly_name("data"); params[1]->set_friendly_name("grid"); auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/group_convolution_backprop_data.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/group_convolution_backprop_data.cpp index 9442992aba2..6da5efea12a 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/group_convolution_backprop_data.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/group_convolution_backprop_data.cpp @@ -165,7 +165,7 @@ public: } std::shared_ptr createGraph(const std::vector& inShapes, ngraph::helpers::InputLayerType outShapeType) { - auto params = ngraph::builder::makeDynamicParams(prec, {inShapes.front()}); + ov::ParameterVector params{std::make_shared(prec, inShapes.front())}; std::shared_ptr outShapeNode; if (!outShapeData.empty()) { if (outShapeType == ngraph::helpers::InputLayerType::PARAMETER) { diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/groupconvolution.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/groupconvolution.cpp index 30c06805359..c3cfa122bba 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/groupconvolution.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/groupconvolution.cpp @@ -86,7 +86,10 @@ protected: size_t numGroups; std::tie(kernel, stride, padBegin, padEnd, dilation, convOutChannels, numGroups, padType) = groupConvParams; - auto inputParams = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector inputParams; + for (auto&& shape : inputDynamicShapes) { + inputParams.push_back(std::make_shared(inType, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(inputParams)); auto groupConvolutionNode = ngraph::builder::makeGroupConvolution(paramOuts.front(), netType, kernel, stride, padBegin, diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/interpolate.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/interpolate.cpp index 3585acb8f30..99d3266e947 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/interpolate.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/interpolate.cpp @@ -204,7 +204,7 @@ protected: init_input_shapes(inputShapes); - auto params = ngraph::builder::makeDynamicParams(ngPrc, {inputDynamicShapes.front()}); + ov::ParameterVector params{std::make_shared(ngPrc, inputDynamicShapes.front())}; std::shared_ptr sizesInput, scalesInput; if (shapeCalcMode == ngraph::op::v4::Interpolate::ShapeCalcMode::SCALES) { diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/matmul.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/matmul.cpp index 75abed48dcf..1d14e01fc16 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/matmul.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/matmul.cpp @@ -116,7 +116,7 @@ protected: configuration.insert(additionalConfig.begin(), additionalConfig.end()); - auto params = builder::makeDynamicParams(netType, {inShapeA}); + ov::ParameterVector params{std::make_shared(netType, inShapeA)}; auto matrixB = builder::makeDynamicInputLayer(netType, secondaryInputType, inShapeB); if (secondaryInputType == helpers::InputLayerType::PARAMETER) { diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/mvn.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/mvn.cpp index e1de559151c..a4470087b65 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/mvn.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/mvn.cpp @@ -71,8 +71,11 @@ protected: auto axesType = ov::element::i64; std::string eps_mode = "inside_sqrt"; - auto param = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); - auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(param)); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } + auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); auto axesNode = ngraph::builder::makeConstant(axesType, ngraph::Shape{axes.size()}, axes); auto mvn = ngraph::builder::makeMVN6(paramOuts[0], axesNode, normalizeVariance, eps, eps_mode); @@ -82,7 +85,7 @@ protected: for (size_t i = 0; i < mvn->get_output_size(); ++i) { results.push_back(std::make_shared(mvn->output(i))); } - function = std::make_shared(results, param, "MVN"); + function = std::make_shared(results, params, "MVN"); } }; diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/non_max_suppression.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/non_max_suppression.cpp index a371fa3bcb9..40efd14936e 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/non_max_suppression.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/non_max_suppression.cpp @@ -151,7 +151,10 @@ protected: targetStaticShapes.push_back(std::vector{{numBatches, numBoxes, 4}, {numBatches, numClasses, numBoxes}}); } - auto params = ngraph::builder::makeDynamicParams(paramsPrec, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(paramsPrec, shape)); + } params[0]->set_friendly_name("param_1"); params[1]->set_friendly_name("param_2"); diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/normalize_l2.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/normalize_l2.cpp index 2f16be4d118..7e86c934a6c 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/normalize_l2.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/normalize_l2.cpp @@ -55,12 +55,15 @@ protected: init_input_shapes({inputShapes}); - auto param = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); - auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(param)); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } + auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); auto normalize = ngraph::builder::makeNormalizeL2(paramOuts[0], axes, eps, epsMode); ngraph::ResultVector results{std::make_shared(normalize)}; - function = std::make_shared(results, param, "NormalizeL2"); + function = std::make_shared(results, params, "NormalizeL2"); } }; diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/pooling.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/pooling.cpp index 95e0ba2da5f..8721875569d 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/pooling.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/pooling.cpp @@ -78,8 +78,10 @@ protected: init_input_shapes({inputShapes}); - auto params = ngraph::builder::makeDynamicParams(inPrc, inputDynamicShapes); - + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inPrc, shape)); + } std::shared_ptr poolInput = params[0]; std::shared_ptr pooling = ngraph::builder::makePooling(poolInput, diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/prior_box.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/prior_box.cpp index 6ca8e576dc8..d1839c7438f 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/prior_box.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/prior_box.cpp @@ -94,7 +94,10 @@ protected: auto endInput = ngraph::opset1::Constant::create(ngraph::element::i32, ngraph::Shape{1}, {4}); auto strideInput = ngraph::opset1::Constant::create(ngraph::element::i32, ngraph::Shape{1}, {1}); - auto functionParams = builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector functionParams; + for (auto&& shape : inputDynamicShapes) { + functionParams.push_back(std::make_shared(inType, shape)); + } auto paramOuts = helpers::convert2OutputVector(helpers::castOps2Nodes(functionParams)); auto shapeOfOp1 = std::make_shared(paramOuts[0], element::i32); diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/random_uniform.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/random_uniform.cpp index de0a2321658..5344e3ebb1f 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/random_uniform.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/random_uniform.cpp @@ -125,13 +125,14 @@ protected: std::map additionalConfig; std::pair seeds; - ov::ParameterVector params; std::tie(shapes, min_max_values, seeds, netType, targetDevice, additionalConfig) = basicParamsSet; init_input_shapes(shapes); - params = builder::makeDynamicParams(netType, inputDynamicShapes); - + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netType, shape)); + } const auto shape_of = std::make_shared(params[0]); const auto random_uniform = std::make_shared(shape_of, params[1], params[2], netType, seeds.first, seeds.second); diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/range.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/range.cpp index 40619a064d1..ba5e2d3c515 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/range.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/range.cpp @@ -129,7 +129,7 @@ protected: std::vector inputValues; ElementType netType; std::map additionalConfig; - ngraph::ParameterVector params; + ov::ParameterVector params; std::tie(inputShapes, inputValues, netType, targetDevice, additionalConfig) = basicParamsSet; input_values = inputValues; @@ -139,10 +139,15 @@ protected: if (netType == ElementType::undefined) { std::vector types = { ElementType::f32, ElementType::i32, ElementType::f32 }; - params = builder::makeDynamicParams(types, inputDynamicShapes); + for (size_t i = 0; i < types.size(); i++) { + auto paramNode = std::make_shared(types[i], inputDynamicShapes[i]); + params.push_back(paramNode); + } netType = ElementType::f32; } else { - params = builder::makeDynamicParams(netType, inputDynamicShapes); + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netType, shape)); + } } const auto range = std::make_shared(params[0], params[1], params[2], netType); diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/reduce.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/reduce.cpp index 7ce1d51e32a..d091e0ae049 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/reduce.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/reduce.cpp @@ -77,7 +77,10 @@ protected: init_input_shapes(inputShapes); - auto params = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector( ngraph::helpers::castOps2Nodes(params)); diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/region_yolo.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/region_yolo.cpp index d2ff7d3850d..7996d4b81b7 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/region_yolo.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/region_yolo.cpp @@ -75,7 +75,10 @@ protected: init_input_shapes({ inputShape }); - auto paramRegionYolo = ngraph::builder::makeDynamicParams(inPrc, inputDynamicShapes); + ov::ParameterVector paramRegionYolo; + for (auto&& shape : inputDynamicShapes) { + paramRegionYolo.push_back(std::make_shared(inPrc, shape)); + } const auto region_yolo = std::make_shared(paramRegionYolo[0], attributes.coordinates, attributes.classes, attributes.num_regions, diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/roi_pooling.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/roi_pooling.cpp index 140434325e3..69cd8c973da 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/roi_pooling.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/roi_pooling.cpp @@ -185,7 +185,10 @@ protected: init_input_shapes(inputShapes); auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); - auto params = ngraph::builder::makeDynamicParams(ngPrc, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(ngPrc, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector( ngraph::helpers::castOps2Nodes(params)); diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/scatter_nd_update.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/scatter_nd_update.cpp index f143d73e470..051084a042c 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/scatter_nd_update.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/scatter_nd_update.cpp @@ -104,15 +104,18 @@ protected: init_input_shapes(inputShapes); - auto dataParams = ngraph::builder::makeDynamicParams(inputPrecision, { inputDynamicShapes[0], inputDynamicShapes[2] }); - auto indicesParam = ngraph::builder::makeDynamicParams(idxPrecision, { inputDynamicShapes[1] }); + + ov::ParameterVector dataParams{std::make_shared(inputPrecision, inputDynamicShapes[0]), + std::make_shared(inputPrecision, inputDynamicShapes[2])}; + + auto indicesParam = std::make_shared(idxPrecision, inputDynamicShapes[1]); dataParams[0]->set_friendly_name("Param_1"); - indicesParam[0]->set_friendly_name("Param_2"); + indicesParam->set_friendly_name("Param_2"); dataParams[1]->set_friendly_name("Param_3"); - auto scatter = std::make_shared(dataParams[0], indicesParam[0], dataParams[1]); + auto scatter = std::make_shared(dataParams[0], indicesParam, dataParams[1]); - ngraph::ParameterVector allParams{ dataParams[0], indicesParam[0], dataParams[1] }; + ngraph::ParameterVector allParams{ dataParams[0], indicesParam, dataParams[1] }; auto makeFunction = [](ParameterVector ¶ms, const std::shared_ptr &lastNode) { ResultVector results; diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/shapeof.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/shapeof.cpp index dbb2df1525f..7f4f6d6689e 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/shapeof.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/shapeof.cpp @@ -51,10 +51,12 @@ protected: init_input_shapes({inputShape}); - inType = ov::element::Type(netPrecision); outType = ElementType::i32; - auto functionParams = builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector functionParams; + for (auto&& shape : inputDynamicShapes) { + functionParams.push_back(std::make_shared(netPrecision, shape)); + } auto paramOuts = helpers::convert2OutputVector(helpers::castOps2Nodes(functionParams)); auto shapeOfOp = std::make_shared(paramOuts[0], element::i32); diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/softmax.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/softmax.cpp index 6c0ee7a65fc..76edfe4d339 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/softmax.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/softmax.cpp @@ -52,7 +52,10 @@ protected: } init_input_shapes({inShape}); - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } const auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/space_to_batch.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/space_to_batch.cpp index 4a5ac5191e4..15d13e67bb4 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/space_to_batch.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/space_to_batch.cpp @@ -120,7 +120,7 @@ protected: init_input_shapes(inputShapes); - auto params = ngraph::builder::makeDynamicParams(inType, {inputDynamicShapes.front()}); + ov::ParameterVector params{std::make_shared(inType, inputDynamicShapes.front())}; std::shared_ptr blockInput, beginInput, endInput; if (restInputType == ngraph::helpers::InputLayerType::PARAMETER) { auto blockNode = std::make_shared(ngraph::element::Type_t::i64, ov::Shape{block.size()}); diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/split.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/split.cpp index 2e6274503c2..c652a9770aa 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/split.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/split.cpp @@ -65,7 +65,7 @@ protected: } } init_input_shapes({inputShape}); - auto dyn_params = ngraph::builder::makeDynamicParams(netPrecision, {inputDynamicShapes[0]}); + ov::ParameterVector dyn_params{std::make_shared(netPrecision, inputDynamicShapes[0])}; auto paramOuts = ngraph::helpers::convert2OutputVector(helpers::castOps2Nodes(dyn_params)); auto split = std::dynamic_pointer_cast( @@ -204,7 +204,7 @@ protected: } init_input_shapes(inputShapes); - auto dyn_params = ngraph::builder::makeDynamicParams(netPrecision, {inputDynamicShapes[0]}); + ov::ParameterVector dyn_params{std::make_shared(netPrecision, inputDynamicShapes[0])}; auto paramOuts = ngraph::helpers::convert2OutputVector(helpers::castOps2Nodes(dyn_params)); auto splitAxisOp = std::make_shared(ngraph::element::i64, ngraph::Shape{}, std::vector{static_cast(axis)}); diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/strided_slice.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/strided_slice.cpp index a6405f3509e..fa33755caa0 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/strided_slice.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/strided_slice.cpp @@ -130,7 +130,7 @@ protected: init_input_shapes(inputShapes); - auto params = ngraph::builder::makeDynamicParams(inType, {inputDynamicShapes.front()}); + ov::ParameterVector params{std::make_shared(inType, inputDynamicShapes.front())}; // auto paramNode = std::make_shared(type, ngraph::Shape(shape)); std::shared_ptr beginInput, endInput, strideInput; if (restInputType == ngraph::helpers::InputLayerType::PARAMETER) { diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/top_k.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/top_k.cpp index ddcc087bcf1..8e21b463961 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/top_k.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/top_k.cpp @@ -85,7 +85,7 @@ protected: } } - auto params = ngraph::builder::makeDynamicParams(netPrecision, {inputDynamicShapes[0]}); + ov::ParameterVector params{std::make_shared(netPrecision, inputDynamicShapes[0])}; std::shared_ptr topk; if (inputType == ngraph::helpers::InputLayerType::CONSTANT) { diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/unique.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/unique.cpp index f65b3ef1282..0110b049fcb 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/unique.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/unique.cpp @@ -69,7 +69,10 @@ protected: init_input_shapes(inputShapes); flattened = std::get<0>(flatOrAxis); - auto params = ngraph::builder::makeDynamicParams(dataPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(dataPrecision, shape)); + } params[0]->set_friendly_name("data"); auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); diff --git a/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/broadcast_eltwise.cpp b/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/broadcast_eltwise.cpp index 50e041227af..fa581718c99 100644 --- a/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/broadcast_eltwise.cpp +++ b/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/broadcast_eltwise.cpp @@ -50,7 +50,11 @@ protected: init_input_shapes(input_shapes); ov::element::TypeVector input_precisions{input_precision, ov::element::i64}; - const auto params = ngraph::builder::makeDynamicParams(input_precisions, inputDynamicShapes); + ov::ParameterVector params; + for (size_t i = 0; i < input_precisions.size(); i++) { + auto param_node = std::make_shared(input_precisions[i], inputDynamicShapes[i]); + params.push_back(param_node); + } const auto bcast_data = ov::opset10::Constant::create(input_precision, {}, {1.f}); const auto bcast = std::make_shared(bcast_data, params[1]); const auto add = std::make_shared(params[0], bcast); diff --git a/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_model_static_split_layer.cpp b/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_model_static_split_layer.cpp index d8ca671e02a..5e7393fffce 100644 --- a/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_model_static_split_layer.cpp +++ b/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_model_static_split_layer.cpp @@ -78,7 +78,10 @@ protected: init_input_shapes(inputShapes); const auto inShapSplit = inputDynamicShapes[0]; const auto inShapeElt = inputDynamicShapes[1]; - auto params = builder::makeDynamicParams(netType, {inShapSplit, inShapeElt}); + ov::ParameterVector params; + for (auto&& shape : {inShapSplit, inShapeElt}) { + params.push_back(std::make_shared(netType, shape)); + } auto paramOuts = helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); auto axis = ngraph::opset1::Constant::create(ngraph::element::i64, ngraph::Shape{}, {0}); diff --git a/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_smoke_test_gen_impl_key.cpp b/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_smoke_test_gen_impl_key.cpp index df4a53eebb6..77ce615cdc7 100644 --- a/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_smoke_test_gen_impl_key.cpp +++ b/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_smoke_test_gen_impl_key.cpp @@ -83,7 +83,10 @@ protected: init_input_shapes(inputShapes); const auto inShapeShapeOf = inputDynamicShapes[0]; const auto inShapeElt = inputDynamicShapes[1]; - auto params = builder::makeDynamicParams(netType, {inShapeShapeOf, inShapeElt}); + ov::ParameterVector params; + for (auto&& shape : {inShapeShapeOf, inShapeElt}) { + params.push_back(std::make_shared(netType, shape)); + } auto paramOuts = helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); auto addOp1 = ngraph::builder::makeEltwise(paramOuts[1], paramOuts[1], ngraph::helpers::EltwiseTypes::ADD); diff --git a/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_smoke_test_shape_of_reduce_reshape.cpp b/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_smoke_test_shape_of_reduce_reshape.cpp index c5d79da2313..dd6d1f26656 100644 --- a/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_smoke_test_shape_of_reduce_reshape.cpp +++ b/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_smoke_test_shape_of_reduce_reshape.cpp @@ -83,7 +83,10 @@ protected: init_input_shapes(inputShapes); const auto inShapeShapeOf = inputDynamicShapes[0]; const auto inShapeElt = inputDynamicShapes[1]; - auto params = builder::makeDynamicParams(netType, {inShapeShapeOf, inShapeElt}); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netType, shape)); + } auto paramOuts = helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); auto addOp = ngraph::builder::makeEltwise(paramOuts[1], paramOuts[1], ngraph::helpers::EltwiseTypes::ADD); diff --git a/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_smoke_test_with_empty_tensor.cpp b/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_smoke_test_with_empty_tensor.cpp index c2c662165a4..bdb6a20b59b 100644 --- a/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_smoke_test_with_empty_tensor.cpp +++ b/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_smoke_test_with_empty_tensor.cpp @@ -90,7 +90,10 @@ protected: init_input_shapes(inputShapes); const auto AllZeroData = inputDynamicShapes[0]; const auto ConcatInputData = inputDynamicShapes[1]; - auto params = builder::makeDynamicParams(netType, {AllZeroData, ConcatInputData}); + ov::ParameterVector params; + for (auto&& shape : {AllZeroData, ConcatInputData}) { + params.push_back(std::make_shared(netType, shape)); + } auto paramOuts = helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); const ElementType intInputsPrecision = ElementType::i32; diff --git a/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/read_value_assign.cpp b/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/read_value_assign.cpp index cfa9ed6b7af..07bc8ed7c07 100644 --- a/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/read_value_assign.cpp +++ b/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/read_value_assign.cpp @@ -47,7 +47,10 @@ protected: init_input_shapes({input_shapes}); - auto params = ngraph::builder::makeDynamicParams(input_precision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(input_precision, shape)); + } const VariableInfo variable_info { inputDynamicShapes[0], input_precision, "v0" }; auto variable = std::make_shared(variable_info); auto read_value = std::make_shared(params.at(0), variable); diff --git a/src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/src/op_impl_check/single_op_graph.cpp b/src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/src/op_impl_check/single_op_graph.cpp index cc54500a1f0..02036fdb934 100644 --- a/src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/src/op_impl_check/single_op_graph.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/src/op_impl_check/single_op_graph.cpp @@ -173,14 +173,17 @@ std::shared_ptr generate(const std::shared_ptr & } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 3, 4}, {2, 7, 4}, {2, 2, 4}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 3, 4}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 7, 4}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 2, 4}})}; + const auto concatNode = std::make_shared(ov::NodeVector{params[0], params[1], params[2]}, 1); ov::ResultVector results{std::make_shared(concatNode)}; return std::make_shared(results, params, "ConcatGraph"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 2}})}; const auto constantNode = std::make_shared(ov::element::f32, ov::Shape{2, 2}, 2.0); ov::ResultVector results{std::make_shared(constantNode)}; return std::make_shared(results, params, "ConstantGraph"); @@ -264,14 +267,15 @@ std::shared_ptr generate(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{3}, {3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{3}), + std::make_shared(ov::element::f32, ov::Shape{3})}; const auto einsumNode = std::make_shared(ov::OutputVector{params.front(), params.back()}, "i,i->"); ov::ResultVector results{std::make_shared(einsumNode)}; return std::make_shared(results, params, "EinsumGraph"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{5, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{5, 2}})}; const auto indices = ngraph::builder::makeConstant(ov::element::i32, {4}, {0, 2, 3, 4}); const auto segment_ids = ngraph::builder::makeConstant(ov::element::i32, {4}, {0, 0, 2, 2}); const auto num_segments = ngraph::builder::makeConstant(ov::element::i32, {}, {3}); @@ -289,8 +293,10 @@ std::shared_ptr generate(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = - ngraph::builder::makeDynamicParams(ov::element::f32, {{16, 4}, {16, 8}, {16, 2}, {1, 3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{16, 4}}), + std::make_shared(ov::element::f32, ov::Shape{{16, 8}}), + std::make_shared(ov::element::f32, ov::Shape{{16, 2}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 3}})}; const auto attrs = ov::op::v6::ExperimentalDetectronDetectionOutput::Attributes{0.01000000074505806f, 0.2f, 2.0f, @@ -307,8 +313,11 @@ std::shared_ptr generate(const std::shared_ptr generate( const std::shared_ptr &node) { - const auto params = - ngraph::builder::makeDynamicParams(ov::element::f32, {{3}, {36, 4}, {12, 2, 6}, {3, 2, 6}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{3}), + std::make_shared(ov::element::f32, ov::Shape{{36, 4}}), + std::make_shared(ov::element::f32, ov::Shape{{12, 2, 6}}), + std::make_shared(ov::element::f32, ov::Shape{{3, 2, 6}})}; + const auto attrs = ov::op::v6::ExperimentalDetectronGenerateProposalsSingleImage::Attributes{0, 0.699999988079071, 6, 1000}; const auto exp_gen_prop_sing_img = @@ -323,8 +332,10 @@ std::shared_ptr generate( std::shared_ptr generate( const std::shared_ptr &node) { - const auto params = - ngraph::builder::makeDynamicParams(ov::element::f32, {{3, 4}, {1, 16, 4, 5}, {1, 3, 100, 200}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{3, 4}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 16, 4, 5}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 3, 100, 200}})}; + const auto attrs = ov::op::v6::ExperimentalDetectronPriorGridGenerator::Attributes{true, 0, 0, 4.0f, 4.0f}; const auto exp_prior_grid_gen = std::make_shared(params[0], params[1], @@ -336,7 +347,9 @@ std::shared_ptr generate( std::shared_ptr generate( const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 4}, {1, 2, 2, 3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 4}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 2, 2, 3}})}; + const auto attrs = ov::op::v6::ExperimentalDetectronROIFeatureExtractor::Attributes{3, 2, {4}, false}; const auto exp_roi_feature_ext = std::make_shared(NodeVector{params[0], params[1]}, @@ -346,14 +359,16 @@ std::shared_ptr generate( } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 4}, {2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 4}}), + std::make_shared(ov::element::f32, ov::Shape{2})}; + const auto exp_topk_rois = std::make_shared(params[0], params[1], 1); ov::ResultVector results{std::make_shared(exp_topk_rois)}; return std::make_shared(results, params, "ExperimentalDetectronTopKROIs"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 1, 10, 10}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 1, 10, 10}})}; const auto ext_img_patch = std::make_shared(params[0], ov::Shape{3, 3}, ov::Strides{5, 5}, @@ -379,7 +394,7 @@ std::shared_ptr generate(const std::shared_ptr &node } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 2, 3, 4}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 2, 3, 4}})}; const auto input_low = ngraph::builder::makeConstant(ov::element::f32, {}, {0.f}); const auto input_high = ngraph::builder::makeConstant(ov::element::f32, {}, {23.f}); const auto output_low = ngraph::builder::makeConstant(ov::element::f32, {}, {2.f}); @@ -390,9 +405,10 @@ std::shared_ptr generate(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = - ngraph::builder::makeDynamicParams({ov::element::f32, ov::element::f32, ov::element::i64}, - {{5, 10, 10}, {5, 1, 10}, {5}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{5, 10, 10}}), + std::make_shared(ov::element::f32, ov::Shape{{5, 1, 10}}), + std::make_shared(ov::element::i64, ov::Shape{5})}; + const auto W = ngraph::builder::makeConstant(ov::element::f32, {1, 30, 10}, {}, true); const auto R = ngraph::builder::makeConstant(ov::element::f32, {1, 30, 10}, {}, true); const auto B = ngraph::builder::makeConstant(ov::element::f32, {1, 30}, {}, true); @@ -411,21 +427,26 @@ std::shared_ptr generate(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams({ov::element::f32, ov::element::i32}, {{3}, {7}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{3}), + std::make_shared(ov::element::i32, ov::Shape{7})}; const auto gather_elements = std::make_shared(params[0], params[1], 0); ov::ResultVector results{std::make_shared(gather_elements)}; return std::make_shared(results, params, "GatherElements"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 1, 10}, {1, 1, 10}, {1}, {}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{1, 1, 10}), + std::make_shared(ov::element::f32, ov::Shape{1, 1, 10}), + std::make_shared(ov::element::f32, ov::Shape{1}), + std::make_shared(ov::element::f32, ov::Shape{})}; const auto gather_tree = std::make_shared(params[0], params[1], params[2], params[3]); ov::ResultVector results{std::make_shared(gather_tree)}; return std::make_shared(results, params, "GatherTree"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 1, 6}, {1, 1, 1, 3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 1, 6}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 1, 1, 3}})}; const auto group_convolution = std::make_shared(params[0], params[1], ov::Strides{1}, @@ -437,7 +458,9 @@ std::shared_ptr generate(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 1, 4}, {1, 1, 1, 3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 1, 4}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 1, 1, 3}})}; + const auto group_convolution = std::make_shared(params[0], params[1], ov::Strides{1}, @@ -450,7 +473,7 @@ std::shared_ptr generate(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{3})}; const auto alpha = ngraph::builder::makeConstant(ov::element::f32, {}, {std::vector{0.5}}); const auto beta = ngraph::builder::makeConstant(ov::element::f32, {}, {std::vector{0.6}}); const auto hard_sigmoid = std::make_shared(params[0], alpha, beta); @@ -459,7 +482,7 @@ std::shared_ptr generate(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 1, 2, 4}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 1, 2, 4}})}; const auto out_shape_in = ngraph::builder::makeConstant(ov::element::i64, {4}, {1, 1, 1, 2}); ov::op::v0::Interpolate::Attributes attrs; attrs.axes = ov::AxisSet{0, 1, 2, 3}; @@ -479,7 +502,8 @@ std::shared_ptr generate(const std::shared_ptr(ov::element::f32, ov::Shape{{2, 2, 30, 60}}), + std::make_shared(ov::element::i32, ov::Shape{{15, 30}})}; const auto scales = ngraph::builder::makeConstant(ov::element::f32, {2}, {0.5f, 0.5f}); const auto axes = ngraph::builder::makeConstant(ov::element::i64, {2}, {2, 3}); const InterpolateAttrs attrs{InterpolateMode::NEAREST, @@ -518,7 +542,7 @@ std::shared_ptr generate(const std::shared_ptr generate(const std::shared_ptr &node) { - auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{1})}; auto read_value = std::make_shared(params[0], "v0"); auto add = std::make_shared(read_value, params[0]); auto assign = std::make_shared(add, "v0"); @@ -527,7 +551,7 @@ std::shared_ptr generate(const std::shared_ptr &n } std::shared_ptr generate(const std::shared_ptr &node) { - auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{1})}; auto variable = std::make_shared( ov::op::util::VariableInfo{ov::PartialShape::dynamic(), ov::element::dynamic, "v0"}); auto read_value = std::make_shared(params[0], variable); @@ -538,7 +562,7 @@ std::shared_ptr generate(const std::shared_ptr &n } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 3, 2, 1}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 3, 2, 1}})}; const auto axes = ngraph::builder::makeConstant(ov::element::i64, {1}, std::vector{1}); const auto lrn = std::make_shared(params[0], axes, 3, 0.5, 1, 3); ov::ResultVector results{std::make_shared(lrn)}; @@ -547,28 +571,28 @@ std::shared_ptr generate(const std::shared_ptr &node std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{1})}; const auto lsm = std::make_shared(params[0], 0); ov::ResultVector results{std::make_shared(lsm)}; return std::make_shared(results, params, "LogSoftmax"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::boolean, {{1, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::boolean, ov::Shape{{1, 2}})}; const auto logical_not = std::make_shared(params[0]); ov::ResultVector results{std::make_shared(logical_not)}; return std::make_shared(results, params, "LogicalNot"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 3, 3, 3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 3, 3, 3}})}; const auto mvn = std::make_shared(params[0], false, false, 1e-9); ov::ResultVector results{std::make_shared(mvn)}; return std::make_shared(results, params, "MVN-2"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 3, 3, 3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 3, 3, 3}})}; const auto axes = ngraph::builder::makeConstant(ov::element::i64, {2}, std::vector{2, 3}); const auto mvn = std::make_shared(params[0], axes, false, 1e-9, ov::op::MVNEpsMode::OUTSIDE_SQRT); ov::ResultVector results{std::make_shared(mvn)}; @@ -576,16 +600,20 @@ std::shared_ptr generate(const std::shared_ptr &node } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 2}, {2, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 2}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 2}})}; const auto matmul = std::make_shared(params[0], params[1], false, false); ov::ResultVector results{std::make_shared(matmul)}; return std::make_shared(results, params, "MatMul-1"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams( - {ov::element::f32, ov::element::f32, ov::element::i32, ov::element::f32, ov::element::f32}, - {{1, 6, 4}, {1, 1, 6}, {}, {}, {}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 6, 4}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 1, 6}}), + std::make_shared(ov::element::i32, ov::Shape{}), + std::make_shared(ov::element::f32, ov::Shape{}), + std::make_shared(ov::element::f32, ov::Shape{})}; + auto nms = std::make_shared(params[0], params[1], params[2], @@ -598,9 +626,12 @@ std::shared_ptr generate(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams( - {ov::element::f32, ov::element::f32, ov::element::i32, ov::element::f32, ov::element::f32}, - {{1, 6, 4}, {1, 1, 6}, {}, {}, {}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 6, 4}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 1, 6}}), + std::make_shared(ov::element::i32, ov::Shape{}), + std::make_shared(ov::element::f32, ov::Shape{}), + std::make_shared(ov::element::f32, ov::Shape{})}; + auto nms = std::make_shared(params[0], params[1], params[2], @@ -613,9 +644,12 @@ std::shared_ptr generate(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams( - {ov::element::f32, ov::element::f32, ov::element::i32, ov::element::f32, ov::element::f32}, - {{1, 6, 4}, {1, 1, 6}, {}, {}, {}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 6, 4}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 1, 6}}), + std::make_shared(ov::element::i32, ov::Shape{}), + std::make_shared(ov::element::f32, ov::Shape{}), + std::make_shared(ov::element::f32, ov::Shape{})}; + auto nms = std::make_shared(params[0], params[1], params[2], @@ -628,9 +662,12 @@ std::shared_ptr generate(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams( - {ov::element::f32, ov::element::f32, ov::element::i32, ov::element::f32, ov::element::f32}, - {{1, 6, 4}, {1, 1, 6}, {}, {}, {}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 6, 4}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 1, 6}}), + std::make_shared(ov::element::i32, ov::Shape{}), + std::make_shared(ov::element::f32, ov::Shape{}), + std::make_shared(ov::element::f32, ov::Shape{})}; + auto nms = std::make_shared(params[0], params[1], params[2], @@ -643,9 +680,12 @@ std::shared_ptr generate(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams( - {ov::element::f32, ov::element::f32, ov::element::i32, ov::element::f32, ov::element::f32}, - {{1, 6, 4}, {1, 1, 6}, {}, {}, {}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 6, 4}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 1, 6}}), + std::make_shared(ov::element::i32, ov::Shape{}), + std::make_shared(ov::element::f32, ov::Shape{}), + std::make_shared(ov::element::f32, ov::Shape{})}; + auto nms = std::make_shared(params[0], params[1], params[2], @@ -658,14 +698,14 @@ std::shared_ptr generate(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{3, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{3, 2}})}; auto nonzero = std::make_shared(params[0], ov::element::i32); ov::ResultVector results{std::make_shared(nonzero)}; return std::make_shared(results, params, "NonZero-3"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{4}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{4})}; const auto axes = ngraph::builder::makeConstant(ov::element::i64, {0}, std::vector{}); auto normalize = std::make_shared(params[0], axes, 1e-7, ov::op::EpsMode::ADD); ov::ResultVector results{std::make_shared(normalize)}; @@ -673,7 +713,7 @@ std::shared_ptr generate(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::i32, {{}}); + ov::ParameterVector params{std::make_shared(ov::element::i32, ov::Shape{})}; const auto depth = ngraph::builder::makeConstant(ov::element::i32, {}, std::vector{3}); const auto onvalue = ngraph::builder::makeConstant(ov::element::i32, {}, std::vector{1}); const auto offvalue = ngraph::builder::makeConstant(ov::element::i32, {}, std::vector{0}); @@ -684,7 +724,7 @@ std::shared_ptr generate(const std::shared_ptr &n } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{6}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{6})}; const auto slope = ngraph::builder::makeConstant(ov::element::f32, {1}, {2}); const auto prelu = std::make_shared(params[0], slope); ov::ResultVector results{std::make_shared(prelu)}; @@ -700,7 +740,7 @@ std::shared_ptr generate(const std::shared_ptr(ov::element::f32, ov::Shape{{2, n_channel, 20, 20}})}; const auto coordi = ngraph::builder::makeConstant(ov::element::f32, {n_boxes, 5}, {0, 1, 2, 4, 6, 1, 0, 3, 10, 4, 0, 10, 7, 11, 13}); @@ -717,7 +757,7 @@ std::shared_ptr generate(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{6}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{6})}; const auto pad_begin = ngraph::builder::makeConstant(ov::element::i64, {1}, {4}); const auto pad_end = ngraph::builder::makeConstant(ov::element::i64, {1}, {5}); const auto pad = std::make_shared(params[0], pad_begin, pad_end, ov::op::PadMode::CONSTANT); @@ -726,7 +766,7 @@ std::shared_ptr generate(const std::shared_ptr &node } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{6, 10, 11, 12}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{6, 10, 11, 12}})}; const auto pad_begin = ngraph::builder::makeConstant(ov::element::i64, {4}, {4, -2, 3, -1}); const auto pad_end = ngraph::builder::makeConstant(ov::element::i64, {4}, {5, -1, -4, 4}); const auto pad = std::make_shared(params[0], pad_begin, pad_end, ov::op::PadMode::CONSTANT); @@ -744,7 +784,9 @@ std::shared_ptr generate(const std::shared_ptr attrs.min_size = {2.0f}; attrs.aspect_ratio = {1.5f}; attrs.scale_all_sizes = false; - const auto params = ngraph::builder::makeDynamicParams(ov::element::u16, {{300, 300}, {32, 32}}); + ov::ParameterVector params{std::make_shared(ov::element::u16, ov::Shape{{300, 300}}), + std::make_shared(ov::element::u16, ov::Shape{{32, 32}})}; + auto shape_of_1 = std::make_shared(params.at(0)); auto shape_of_2 = std::make_shared(params.at(1)); auto Node = std::make_shared(shape_of_1, shape_of_2, attrs); @@ -759,7 +801,8 @@ std::shared_ptr generate(const std::shared_ptr attrs.aspect_ratio = {1.5f}; attrs.scale_all_sizes = true; attrs.min_max_aspect_ratios_order = false; - const auto params = ngraph::builder::makeDynamicParams(ov::element::u16, {{300, 300}, {32, 32}}); + ov::ParameterVector params{std::make_shared(ov::element::u16, ov::Shape{{300, 300}}), + std::make_shared(ov::element::u16, ov::Shape{{32, 32}})}; auto shape_of_1 = std::make_shared(params.at(0)); auto shape_of_2 = std::make_shared(params.at(1)); auto Node = std::make_shared(shape_of_1, shape_of_2, attrs); @@ -772,7 +815,8 @@ std::shared_ptr generate(const std::shared_ptr(ov::element::f32, ov::Shape{{4, 4}}), + std::make_shared(ov::element::f32, ov::Shape{{50, 50}})}; auto shape_of_1 = std::make_shared(params.at(0)); auto shape_of_2 = std::make_shared(params.at(1)); auto Node = std::make_shared(shape_of_1, shape_of_2, attrs); @@ -798,9 +842,9 @@ std::shared_ptr generate(const std::shared_ptr attrs.box_coordinate_scale = 1.0f; attrs.framework = ""; attrs.infer_probs = false; - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 2, 10, 10}, - {1, 4, 10, 10}, - {3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 2, 10, 10}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 4, 10, 10}}), + std::make_shared(ov::element::f32, ov::Shape{3})}; auto Node = std::make_shared(params.at(0), params.at(1), params.at(2), attrs); ov::ResultVector results{std::make_shared(Node)}; return std::make_shared(results, params, "ProposalGraph"); @@ -824,16 +868,16 @@ std::shared_ptr generate(const std::shared_ptr attrs.box_coordinate_scale = 1.0f; attrs.framework = ""; attrs.infer_probs = true; - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 2, 10, 10}, - {1, 4, 10, 10}, - {3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 2, 10, 10}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 4, 10, 10}}), + std::make_shared(ov::element::f32, ov::Shape{3})}; auto Node = std::make_shared(params.at(0), params.at(1), params.at(2), attrs); ov::ResultVector results{std::make_shared(Node)}; return std::make_shared(results, params, "ProposalGraph"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 1, 16, 16}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 1, 16, 16}})}; const auto coords = ngraph::builder::makeConstant(ov::element::f32, {2, 4}, {2, 2, 8, 8, 2, 2, 8, 8}); const auto roisIdx = ngraph::builder::makeConstant(ov::element::i32, {2}, {0, 1}); auto Node = std::make_shared(params.at(0), coords, roisIdx, 2, 2, 2, 1, "avg"); @@ -842,7 +886,7 @@ std::shared_ptr generate(const std::shared_ptr } std::shared_ptr generate(const std::shared_ptr& node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 1, 16, 16}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 1, 16, 16}})}; const auto coords = ngraph::builder::makeConstant(ov::element::f32, {2, 4}, {2, 2, 8, 8, 2, 2, 8, 8}); const auto roisIdx = ngraph::builder::makeConstant(ov::element::i32, {2}, {0, 1}); const auto pooling_mode = EnumNames::as_enum("avg"); @@ -854,15 +898,15 @@ std::shared_ptr generate(const std::shared_ptr& } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 3, 8, 8}, - {1, 5}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 3, 8, 8}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 5}})}; auto Node = std::make_shared(params.at(0), params.at(1), Shape{1, 1}, 1); ov::ResultVector results{std::make_shared(Node)}; return std::make_shared(results, params, "ROIPoolingGraph"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::i32, {{3}}); + ov::ParameterVector params{std::make_shared(ov::element::i32, ov::Shape{3})}; const auto min_value = ngraph::builder::makeConstant(ov::element::f32, {}, {0.f}); const auto max_value = ngraph::builder::makeConstant(ov::element::f32, {}, {1.f}); auto Node = std::make_shared(params.at(0), min_value, max_value, ov::element::f32, 10, 10); @@ -889,21 +933,21 @@ std::shared_ptr generate(const std::shared_ptr &no } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 8, 2, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 8, 2, 2}})}; auto Node = std::make_shared(params.at(0), 4, 1, 1, true, std::vector{0}, 1, 3); ov::ResultVector results{std::make_shared(Node)}; return std::make_shared(results, params, "RegionYoloGraph"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 8, 4, 4}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 8, 4, 4}})}; auto Node = std::make_shared(params.at(0), ov::Strides{2}); ov::ResultVector results{std::make_shared(Node)}; return std::make_shared(results, params, "ReorgYoloGraph"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 2, 3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 2, 3}})}; const auto shape = ngraph::builder::makeConstant(ov::element::i64, {1}, {12}); auto Node = std::make_shared(params.at(0), shape, false); ov::ResultVector results{std::make_shared(Node)}; @@ -917,7 +961,7 @@ std::shared_ptr generate(const std::shared_ptr &n } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 4, 3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 4, 3}})}; const auto axis = ngraph::builder::makeConstant(ov::element::i64, {3}, {0, 1, 2}); auto Node = std::make_shared(params.at(0), axis, op::v1::Reverse::Mode::INDEX); ov::ResultVector results{std::make_shared(Node)}; @@ -925,15 +969,16 @@ std::shared_ptr generate(const std::shared_ptr & } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams({ov::element::f32, ov::element::i32}, - {{3, 10}, {3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{3, 10}}), + std::make_shared(ov::element::i32, ov::Shape{3})}; + auto Node = std::make_shared(params.at(0), params.at(1), 0, 1); ov::ResultVector results{std::make_shared(Node)}; return std::make_shared(results, params, "ReverseSequenceGraph"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{4, 2, 3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{4, 2, 3}})}; const auto shift = ngraph::builder::makeConstant(ov::element::i64, {3}, {2, 1, 3}); const auto axes = ngraph::builder::makeConstant(ov::element::i64, {3}, {0, 1, 2}); auto Node = std::make_shared(params.at(0), shift, axes); @@ -942,7 +987,8 @@ std::shared_ptr generate(const std::shared_ptr &nod } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 2}, {2, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 2}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 2}})}; const auto indices = ngraph::builder::makeConstant(ov::element::i64, {2, 2}, {1, 1, 0, 0}); const auto axis = ngraph::builder::makeConstant(ov::element::i64, {1}, {0}); auto Node = std::make_shared(params.at(0), indices, params.at(1), axis); @@ -951,7 +997,8 @@ std::shared_ptr generate(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 2}, {2, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 2}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 2}})}; const auto indices = ngraph::builder::makeConstant(ov::element::i64, {2, 2}, {1, 1, 0, 0}); const auto axis = ngraph::builder::makeConstant(ov::element::i64, {1}, {0}); auto Node = std::make_shared( @@ -961,15 +1008,17 @@ std::shared_ptr generate(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams({ov::element::boolean, ov::element::f32, ov::element::f32}, - {{2, 2, 2}, {2, 2, 2}, {2, 2, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::boolean, ov::Shape{{2, 2, 2}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 2, 2}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 2, 2}})}; + auto Node = std::make_shared(params.at(0), params.at(1), params.at(2), op::AutoBroadcastType::NONE); ov::ResultVector results{std::make_shared(Node)}; return std::make_shared(results, params, "SelectGraph"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{3})}; const auto alpha = ngraph::builder::makeConstant(ov::element::f32, {1}, {1.67326324}); const auto lambda = ngraph::builder::makeConstant(ov::element::f32, {1}, {1.05070098}); auto Node = std::make_shared(params.at(0), alpha, lambda); @@ -978,28 +1027,28 @@ std::shared_ptr generate(const std::shared_ptr &nod } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 4, 8, 16, 64}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 4, 8, 16, 64}})}; auto Node = std::make_shared(params.at(0)); ov::ResultVector results{std::make_shared(Node)}; return std::make_shared(results, params, "ShapeOfGraph"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 4, 8, 16, 64}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 4, 8, 16, 64}})}; auto Node = std::make_shared(params.at(0)); ov::ResultVector results{std::make_shared(Node)}; return std::make_shared(results, params, "ShapeOfGraph"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 15, 2, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 15, 2, 2}})}; auto Node = std::make_shared(params.at(0), 1, 5); ov::ResultVector results{std::make_shared(Node)}; return std::make_shared(results, params, "ShuffleChannelsGraph"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 4, 3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 4, 3}})}; const auto start = ngraph::builder::makeConstant(ov::element::i64, {3}, {0, 0, 4}); const auto stop = ngraph::builder::makeConstant(ov::element::i64, {3}, {2, 4, -5}); const auto step = ngraph::builder::makeConstant(ov::element::i64, {3}, {3, 2, -2}); @@ -1010,21 +1059,21 @@ std::shared_ptr generate(const std::shared_ptr &no } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 2, 3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 2, 3}})}; auto Node = std::make_shared(params.at(0), 0); ov::ResultVector results{std::make_shared(Node)}; return std::make_shared(results, params, "SoftmaxGraph"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 2, 3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 2, 3}})}; auto Node = std::make_shared(params.at(0), 0); ov::ResultVector results{std::make_shared(Node)}; return std::make_shared(results, params, "SoftmaxGraph"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 1, 3, 2, 1}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 1, 3, 2, 1}})}; const auto blockShape = ngraph::builder::makeConstant(ov::element::i64, {5}, {1, 1, 3, 2, 2}); const auto padsBegin = ngraph::builder::makeConstant(ov::element::i64, {5}, {0, 0, 1, 0, 3}); const auto padsEnd = ngraph::builder::makeConstant(ov::element::i64, {5}, {0, 0, 2, 0, 0}); @@ -1034,14 +1083,14 @@ std::shared_ptr generate(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 2, 4, 4}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 2, 4, 4}})}; auto Node = std::make_shared(params.at(0), "BLOCKS_FIRST", 2); ov::ResultVector results{std::make_shared(Node)}; return std::make_shared(results, params, "SpaceToDepthGraph"); } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 8, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 8, 2}})}; const auto axis = ngraph::builder::makeConstant(ov::element::i64, {}, {1}); auto Node = std::make_shared(params.at(0), axis, 4); ov::ResultVector results{std::make_shared(Node)}; @@ -1049,7 +1098,7 @@ std::shared_ptr generate(const std::shared_ptr &no } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 4, 1, 1, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 4, 1, 1, 2}})}; const auto axes = ngraph::builder::makeConstant(ov::element::i64, {2}, {0, 2}); auto Node = std::make_shared(params.at(0), axes); ov::ResultVector results{std::make_shared(Node)}; @@ -1057,7 +1106,7 @@ std::shared_ptr generate(const std::shared_ptr & } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{128, 1}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{128, 1}})}; const auto begin = ngraph::builder::makeConstant(ov::element::i64, {3}, {0, 0, 0}); const auto end = ngraph::builder::makeConstant(ov::element::i64, {3}, {0, 0, 0}); const auto stride = ngraph::builder::makeConstant(ov::element::i64, {3}, {1, 1, 1}); @@ -1072,7 +1121,7 @@ std::shared_ptr generate(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 4}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 4}})}; const auto beta = ngraph::builder::makeConstant(ov::element::f32, {}, {0.6f}); auto Node = std::make_shared(params.at(0), beta); ov::ResultVector results{std::make_shared(Node)}; @@ -1080,7 +1129,7 @@ std::shared_ptr generate(const std::shared_ptr &no } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 1, 3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 1, 3}})}; const auto repeats = ngraph::builder::makeConstant(ov::element::i64, {2}, {2, 1}); auto Node = std::make_shared(params.at(0), repeats); ov::ResultVector results{std::make_shared(Node)}; @@ -1088,7 +1137,7 @@ std::shared_ptr generate(const std::shared_ptr &nod } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 3, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 3, 2}})}; const auto k = ngraph::builder::makeConstant(ov::element::i64, {}, {3}); auto Node = std::make_shared(params.at(0), k, @@ -1101,7 +1150,7 @@ std::shared_ptr generate(const std::shared_ptr &nod } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 3, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 3, 2}})}; const auto k = ngraph::builder::makeConstant(ov::element::i64, {}, {3}); auto Node = std::make_shared(params.at(0), k, @@ -1114,7 +1163,7 @@ std::shared_ptr generate(const std::shared_ptr &nod } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 3, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 3, 2}})}; const auto k = ngraph::builder::makeConstant(ov::element::i64, {}, {3}); auto Node = std::make_shared(params.at(0), k, @@ -1129,7 +1178,7 @@ std::shared_ptr generate(const std::shared_ptr &no } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 2, 3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 2, 3}})}; const auto inputOrder = ngraph::builder::makeConstant(ov::element::i64, {3}, {2, 1, 0}); auto Node = std::make_shared(params.at(0), inputOrder); ov::ResultVector results{std::make_shared(Node)}; @@ -1137,7 +1186,7 @@ std::shared_ptr generate(const std::shared_ptr } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{4, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{4, 2}})}; const auto axes = ngraph::builder::makeConstant(ov::element::i64, {2}, {1, -1}); auto Node = std::make_shared(params.at(0), axes); ov::ResultVector results{std::make_shared(Node)}; @@ -1145,7 +1194,7 @@ std::shared_ptr generate(const std::shared_ptr } std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 8, 2, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 8, 2, 2}})}; const auto axis = ngraph::builder::makeConstant(ov::element::i64, {1}, {1}); const auto splitLengths = ngraph::builder::makeConstant(ov::element::i64, {4}, {1, 3, 2, 2}); auto Node = std::make_shared(params.at(0), axis, splitLengths); @@ -1369,7 +1418,8 @@ std::shared_ptr generateUnaryEltwise(const std::shared_ptr generateBinaryEltwise(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 2}, {1, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 2}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 2}})}; std::shared_ptr eltwiseNode; if (ov::is_type(node)) { eltwiseNode = std::make_shared(params.front(), params.back()); @@ -1400,7 +1450,8 @@ std::shared_ptr generateBinaryEltwise(const std::shared_ptr generateBinaryEltwiseComp(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2}, {2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{2}), + std::make_shared(ov::element::f32, ov::Shape{2})}; std::shared_ptr eltwise; if (ov::is_type(node)) { eltwise = std::make_shared(params[0], params[1]); @@ -1423,7 +1474,9 @@ std::shared_ptr generateBinaryEltwiseComp(const std::shared_ptr generateBinaryEltwiseLogical(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::boolean, {{1}, {1}}); + ov::ParameterVector params{std::make_shared(ov::element::boolean, ov::Shape{1}), + std::make_shared(ov::element::boolean, ov::Shape{1})}; + std::shared_ptr eltwise; if (ov::is_type(node)) { eltwise = std::make_shared(params[0], params[1]); @@ -1443,7 +1496,7 @@ std::shared_ptr generateBinaryEltwiseLogical(const std::shared_ptr generateBroadcast(const std::shared_ptr &node) { const ov::Shape input_shape{}; - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {input_shape}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{input_shape})}; const auto shape_const = ngraph::builder::makeConstant(ov::element::u64, {4}, {5, 4, 3, 2}); std::shared_ptr broadcast; @@ -1497,7 +1550,9 @@ std::shared_ptr generateMultiSubGraph(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 2, 4}, {1, 2, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 2, 4}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 2, 2}})}; + const auto outputs = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); const auto nms = @@ -1507,7 +1562,8 @@ std::shared_ptr generate(const std::shared_ptr } std::shared_ptr generateMulticlassNmsBase(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 2, 4}, {1, 2, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 2, 4}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 2, 2}})}; const auto outputs = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); if (ov::is_type(node)) { @@ -1524,7 +1580,7 @@ std::shared_ptr generateMulticlassNmsBase(const std::shared_ptr generateReadValueBase(const std::shared_ptr &node) { - auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{1})}; if (ov::is_type(node)) { auto read_value = std::make_shared(params[0], "v0"); auto add = std::make_shared(read_value, params[0]); @@ -1545,9 +1601,9 @@ std::shared_ptr generateReadValueBase(const std::shared_ptr generateDeformableConvolutionBase(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 2, 4, 4}, - {1, 18, 2, 2}, - {1, 2, 3, 3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 2, 4, 4}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 18, 2, 2}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 2, 3, 3}})}; std::shared_ptr deformableConvolutionNode; if (ov::is_type(node)) { deformableConvolutionNode = std::make_shared(params.at(0), params.at(1), params.at(2), @@ -1570,9 +1626,9 @@ std::shared_ptr generateDeformableConvolutionBase(const std::shared_p } std::shared_ptr generateDetectionOutputBase(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 8}, - {2, 6}, - {2, 1, 8}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 8}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 6}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 1, 8}})}; ov::op::v0::DetectionOutput::Attributes attrs; ov::op::v8::DetectionOutput::Attributes attrs_v8; attrs.num_classes = 3; @@ -1606,7 +1662,7 @@ std::shared_ptr generateDetectionOutputBase(const std::shared_ptr generateEmbeddingBagOffsetsBase(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{5, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{5, 2}})}; const auto indices = ngraph::builder::makeConstant(ov::element::i32, {4}, {}, true); const auto offsets = ngraph::builder::makeConstant(ov::element::i32, {3}, {}, true); const auto default_index = ngraph::builder::makeConstant(ov::element::i32, ov::Shape(), std::vector{0}); @@ -1623,7 +1679,7 @@ std::shared_ptr generateEmbeddingBagOffsetsBase(const std::shared_ptr } std::shared_ptr generateEmbeddingBagPackedBase(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{5, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{5, 2}})}; const auto indices = ngraph::builder::makeConstant(ov::element::i32, {2, 3}, {}, true); std::shared_ptr EmbeddingBagPackedSumNode; @@ -1638,7 +1694,7 @@ std::shared_ptr generateEmbeddingBagPackedBase(const std::shared_ptr< } std::shared_ptr generateFFTBase(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 10, 10, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 10, 10, 2}})}; const auto axes = ngraph::builder::makeConstant(ov::element::i32, {1}, {2}); std::shared_ptr FFTBaseNode; @@ -1659,7 +1715,8 @@ std::shared_ptr generateFFTBase(const std::shared_ptr &no } std::shared_ptr generateGatherBase(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::i32, {{2, 2, 3, 3}, {2}}); + ov::ParameterVector params{std::make_shared(ov::element::i32, ov::Shape{{2, 2, 3, 3}}), + std::make_shared(ov::element::i32, ov::Shape{2})}; const auto axis = ngraph::builder::makeConstant(ov::element::i64, ov::Shape(), std::vector{2}); std::shared_ptr GatherBaseNode; @@ -1678,7 +1735,8 @@ std::shared_ptr generateGatherBase(const std::shared_ptr } std::shared_ptr generateGatherNDBase(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::i32, {{2, 3, 4, 2}, {2, 3, 3, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::i32, ov::Shape{{2, 3, 4, 2}}), + std::make_shared(ov::element::i32, ov::Shape{{2, 3, 3, 2}})}; std::shared_ptr GatherNDBaseNode; if (ov::is_type(node)) { @@ -1694,7 +1752,10 @@ std::shared_ptr generateGatherNDBase(const std::shared_ptr generate(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{1, 3}, {2, 2, 3, 4}, {1, 12, 2, 2}, {1, 3, 2, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{1, 3}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 2, 3, 4}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 12, 2, 2}}), + std::make_shared(ov::element::f32, ov::Shape{{1, 3, 2, 2}})}; const auto outputs = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); ov::op::v9::GenerateProposals::Attributes attrs; @@ -1715,7 +1776,8 @@ std::shared_ptr generate(const std::shared_ptr generateRNNCellBase(const std::shared_ptr &node) { std::shared_ptr RNNCellBaseNode; if (ov::is_type(node)) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 3}, {2, 3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 3}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 3}})}; const auto W = ngraph::builder::makeConstant(ov::element::f32, {9, 3}, {}, true); const auto R = ngraph::builder::makeConstant(ov::element::f32, {9, 3}, {}, true); const auto B = ngraph::builder::makeConstant(ov::element::f32, {9}, {}, true); @@ -1724,7 +1786,9 @@ std::shared_ptr generateRNNCellBase(const std::shared_ptr ov::ResultVector results{std::make_shared(RNNCellBaseNode)}; return std::make_shared(results, params, "GRUCell3BaseGraph"); } else if (ov::is_type(node)) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 3}, {2, 3}, {2, 3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 3}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 3}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 3}})}; const auto W = ngraph::builder::makeConstant(ov::element::f32, {12, 3}, {}, true); const auto R = ngraph::builder::makeConstant(ov::element::f32, {12, 3}, {}, true); const auto B = ngraph::builder::makeConstant(ov::element::f32, {12}, {}, true); @@ -1735,7 +1799,9 @@ std::shared_ptr generateRNNCellBase(const std::shared_ptr std::make_shared(RNNCellBaseNode->output(1))}; return std::make_shared(results, params, "LSTMCell1BaseGraph"); } else if (ov::is_type(node)) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 3}, {2, 3}, {2, 3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 3}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 3}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 3}})}; const auto W = ngraph::builder::makeConstant(ov::element::f32, {12, 3}, {}, true); const auto R = ngraph::builder::makeConstant(ov::element::f32, {12, 3}, {}, true); const auto B = ngraph::builder::makeConstant(ov::element::f32, {12}, {}, true); @@ -1745,9 +1811,10 @@ std::shared_ptr generateRNNCellBase(const std::shared_ptr std::make_shared(RNNCellBaseNode->output(1))};; return std::make_shared(results, params, "LSTMCell4BaseGraph"); } else if (ov::is_type(node)) { - const auto params = - ngraph::builder::makeDynamicParams({ov::element::f32, ov::element::f32, ov::element::i64}, - {{5, 10, 10}, {5, 1, 10}, {5}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{5, 10, 10}}), + std::make_shared(ov::element::f32, ov::Shape{{5, 1, 10}}), + std::make_shared(ov::element::i64, ov::Shape{5})}; + const auto W = ngraph::builder::makeConstant(ov::element::f32, {1, 30, 10}, {}, true); const auto R = ngraph::builder::makeConstant(ov::element::f32, {1, 30, 10}, {}, true); const auto B = ngraph::builder::makeConstant(ov::element::f32, {1, 30}, {}, true); @@ -1764,8 +1831,11 @@ std::shared_ptr generateRNNCellBase(const std::shared_ptr ov::ResultVector results{std::make_shared(gru_sequence)}; return std::make_shared(results, params, "GRUSequence"); } else if (ov::is_type(node)) { - const auto params = ngraph::builder::makeDynamicParams({ov::element::f32, ov::element::f32, ov::element::f32, ov::element::i64}, - {{5, 10, 10}, {5, 1, 10}, {5, 1, 10}, {5}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{5, 10, 10}}), + std::make_shared(ov::element::f32, ov::Shape{{5, 1, 10}}), + std::make_shared(ov::element::f32, ov::Shape{{5, 1, 10}}), + std::make_shared(ov::element::i64, ov::Shape{5})}; + const auto W = ngraph::builder::makeConstant(ov::element::f32, {1, 40, 10}, {}, true); const auto R = ngraph::builder::makeConstant(ov::element::f32, {1, 40, 10}, {}, true); const auto B = ngraph::builder::makeConstant(ov::element::f32, {1, 40}, {}, true); @@ -1777,8 +1847,10 @@ std::shared_ptr generateRNNCellBase(const std::shared_ptr std::make_shared(RNNCellBaseNode->output(2))}; return std::make_shared(results, params, "LSTMSeq1BaseGraph"); } else if (ov::is_type(node)) { - const auto params = ngraph::builder::makeDynamicParams({ov::element::f32, ov::element::f32, ov::element::f32, ov::element::i64}, - {{5, 10, 10}, {5, 1, 10}, {5, 1, 10}, {5}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{5, 10, 10}}), + std::make_shared(ov::element::f32, ov::Shape{{5, 1, 10}}), + std::make_shared(ov::element::f32, ov::Shape{{5, 1, 10}}), + std::make_shared(ov::element::i64, ov::Shape{5})}; const auto W = ngraph::builder::makeConstant(ov::element::f32, {1, 40, 10}, {}, true); const auto R = ngraph::builder::makeConstant(ov::element::f32, {1, 40, 10}, {}, true); const auto B = ngraph::builder::makeConstant(ov::element::f32, {1, 40}, {}, true); @@ -1789,7 +1861,8 @@ std::shared_ptr generateRNNCellBase(const std::shared_ptr std::make_shared(RNNCellBaseNode->output(2))}; return std::make_shared(results, params, "LSTMSeq5BaseGraph"); } else if (ov::is_type(node)) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 3}, {2, 3}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 3}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 3}})}; const auto W = ngraph::builder::makeConstant(ov::element::f32, {3, 3}, {}, true); const auto R = ngraph::builder::makeConstant(ov::element::f32, {3, 3}, {}, true); const auto B = ngraph::builder::makeConstant(ov::element::f32, {3}, {}, true); @@ -1798,8 +1871,9 @@ std::shared_ptr generateRNNCellBase(const std::shared_ptr ov::ResultVector results{std::make_shared(RNNCellBaseNode)}; return std::make_shared(results, params, "RNNCellBaseGraph"); } else if (ov::is_type(node)) { - const auto params = ngraph::builder::makeDynamicParams({ov::element::f32, ov::element::f32, ov::element::i64}, - {{2, 5, 3}, {2, 1, 3}, {2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 5, 3}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 1, 3}}), + std::make_shared(ov::element::i64, ov::Shape{2})}; const auto W = ngraph::builder::makeConstant(ov::element::f32, {1, 3, 3}, {}, true); const auto R = ngraph::builder::makeConstant(ov::element::f32, {1, 3, 3}, {}, true); const auto B = ngraph::builder::makeConstant(ov::element::f32, {1, 3}, {}, true); @@ -1814,8 +1888,14 @@ std::shared_ptr generateRNNCellBase(const std::shared_ptr } std::shared_ptr generateSubGraphOp(const std::shared_ptr &node) { - const auto params = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 2}, {2, 2}, {2, 2}}); - const auto params_body = ngraph::builder::makeDynamicParams(ov::element::f32, {{2, 2}, {2, 2}, {2, 2}}); + ov::ParameterVector params{std::make_shared(ov::element::f32, ov::Shape{{2, 2}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 2}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 2}})}; + + ov::ParameterVector params_body{std::make_shared(ov::element::f32, ov::Shape{{2, 2}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 2}}), + std::make_shared(ov::element::f32, ov::Shape{{2, 2}})}; + const auto body_condition = ngraph::builder::makeConstant(ov::element::boolean, ov::Shape{1}, {true}); const auto trip_count = ngraph::builder::makeConstant(ngraph::element::i64, ov::Shape{1}, {3}); const auto exec_condition = ngraph::builder::makeConstant(ov::element::boolean, ov::Shape{1}, {true}); diff --git a/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/inference_chaining.cpp b/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/inference_chaining.cpp index 2cd7f5d66af..6c75adfdff6 100644 --- a/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/inference_chaining.cpp +++ b/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/inference_chaining.cpp @@ -34,7 +34,10 @@ std::string OVInferenceChaining::getTestCaseName(const testing::TestParamInfo OVInferenceChaining::getFirstStaticFunction(const ov::PartialShape &shape) { - auto params = ngraph::builder::makeDynamicParams(element::Type_t::f32, {shape, shape, shape}); + ov::ParameterVector params; + for (auto&& sp : {shape, shape, shape}) { + params.push_back(std::make_shared(element::Type_t::f32, sp)); + } params[0]->get_output_tensor(0).set_names({"input_tensor_0"}); params[0]->set_friendly_name("param_0"); params[1]->get_output_tensor(0).set_names({"input_tensor_1"}); @@ -50,7 +53,10 @@ std::shared_ptr OVInferenceChaining::getFirstStaticFunction(const ov: } std::shared_ptr OVInferenceChaining::getSecondStaticFunction(const ov::PartialShape &shape) { - auto params = ngraph::builder::makeDynamicParams(element::Type_t::f32, {shape, shape}); + ov::ParameterVector params; + for (auto&& sp : {shape, shape}) { + params.push_back(std::make_shared(element::Type_t::f32, sp)); + } params[0]->get_output_tensor(0).set_names({"input_tensor_0"}); params[0]->set_friendly_name("param_0"); params[1]->get_output_tensor(0).set_names({"input_tensor_1"}); @@ -63,7 +69,10 @@ std::shared_ptr OVInferenceChaining::getSecondStaticFunction(const ov } std::shared_ptr OVInferenceChaining::getThirdStaticFunction(const ov::PartialShape &shape) { - auto params = ngraph::builder::makeDynamicParams(element::Type_t::f32, {shape, shape, shape, shape}); + ov::ParameterVector params; + for (auto&& sp : {shape, shape, shape, shape}) { + params.push_back(std::make_shared(element::Type_t::f32, sp)); + } params[0]->get_output_tensor(0).set_names({"input_tensor_0"}); params[0]->set_friendly_name("param_0"); params[1]->get_output_tensor(0).set_names({"input_tensor_1"}); diff --git a/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/iteration_chaining.cpp b/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/iteration_chaining.cpp index 20da2ace443..1bd310debe0 100644 --- a/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/iteration_chaining.cpp +++ b/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/iteration_chaining.cpp @@ -34,11 +34,11 @@ std::string OVIterationChaining::getTestCaseName(const testing::TestParamInfo OVIterationChaining::getIterativeFunction() { const ov::PartialShape pshape{-1, 16}; - auto params = ngraph::builder::makeDynamicParams(element::Type_t::f32, {pshape}); - params[0]->get_output_tensor(0).set_names({"input_tensor_0"}); - params[0]->set_friendly_name("param_0"); + auto params = std::make_shared(element::Type_t::f32, pshape); + params->get_output_tensor(0).set_names({"input_tensor_0"}); + params->set_friendly_name("param_0"); auto concat_const = ngraph::builder::makeConstant(element::Type_t::f32, {1, 16}, std::vector{}, true); - auto concat = ngraph::builder::makeConcat({params[0], concat_const}, 0 /*axis*/); + auto concat = ngraph::builder::makeConcat({params, concat_const}, 0 /*axis*/); auto eltwise_const = ngraph::builder::makeConstant(element::Type_t::f32, {1, 16}, std::vector{}, true); auto eltwise = ngraph::builder::makeEltwise(concat, eltwise_const, ngraph::helpers::EltwiseTypes::ADD); concat->get_output_tensor(0).set_names({"result_tensor_0"}); @@ -46,7 +46,7 @@ std::shared_ptr OVIterationChaining::getIterativeFunction() { eltwise->get_output_tensor(0).set_names({"result_tensor_1"}); eltwise->set_friendly_name("result_1"); - return std::make_shared(ov::NodeVector{concat, eltwise}, ov::ParameterVector(params)); + return std::make_shared(ov::NodeVector{concat, eltwise}, ov::ParameterVector{params}); } void OVIterationChaining::SetUp() { diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/softmax.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/softmax.hpp index d8aec224bac..f47f93b0964 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/softmax.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/softmax.hpp @@ -62,7 +62,10 @@ protected: std::tie(ngPrc, inType, outType, shapes, axis, targetDevice, configuration) = this->GetParam(); init_input_shapes({shapes}); - const auto params = ngraph::builder::makeDynamicParams(ngPrc, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(ngPrc, shape)); + } const auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); diff --git a/src/tests/functional/shared_test_classes/src/single_layer/eltwise.cpp b/src/tests/functional/shared_test_classes/src/single_layer/eltwise.cpp index e9fd1b4df65..685aa4517c4 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/eltwise.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/eltwise.cpp @@ -79,7 +79,7 @@ void EltwiseLayerTest::SetUp() { init_input_shapes(shapes); - auto parameters = ngraph::builder::makeDynamicParams(netType, {inputDynamicShapes.front()}); + ov::ParameterVector parameters{std::make_shared(netType, inputDynamicShapes.front())}; ov::PartialShape shape_input_secondary; switch (opType) { @@ -100,8 +100,9 @@ void EltwiseLayerTest::SetUp() { std::shared_ptr secondaryInput; if (secondaryInputType == ngraph::helpers::InputLayerType::PARAMETER) { - secondaryInput = ngraph::builder::makeDynamicParams(netType, {shape_input_secondary}).front(); - parameters.push_back(std::dynamic_pointer_cast(secondaryInput)); + auto param = std::make_shared(netType, shape_input_secondary); + secondaryInput = param; + parameters.push_back(param); } else { ov::Shape shape = inputDynamicShapes.back().get_max_shape(); switch (eltwiseType) { diff --git a/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_detection_output.cpp b/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_detection_output.cpp index dccbdb9adb1..a3e4c6979f4 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_detection_output.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_detection_output.cpp @@ -86,7 +86,10 @@ void ExperimentalDetectronDetectionOutputLayerTest::SetUp() { init_input_shapes(inputShapes); - auto params = ngraph::builder::makeDynamicParams(netPrecision, {inputDynamicShapes}); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } auto paramsOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); auto experimentalDetectron = std::make_shared( params[0], // input_rois diff --git a/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_generate_proposals_single_image.cpp b/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_generate_proposals_single_image.cpp index e499f12c384..9bab10c8d59 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_generate_proposals_single_image.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_generate_proposals_single_image.cpp @@ -75,7 +75,10 @@ void ExperimentalDetectronGenerateProposalsSingleImageLayerTest::SetUp() { init_input_shapes(inputShapes); - auto params = ngraph::builder::makeDynamicParams(netPrecision, {inputDynamicShapes}); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } auto paramsOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); auto experimentalDetectron = std::make_shared( params[0], // im_info diff --git a/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_prior_grid_generator.cpp b/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_prior_grid_generator.cpp index 091bb5940d3..80ab095e219 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_prior_grid_generator.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_prior_grid_generator.cpp @@ -58,7 +58,10 @@ void ExperimentalDetectronPriorGridGeneratorLayerTest::SetUp() { init_input_shapes(param.inputShapes); - auto params = ngraph::builder::makeDynamicParams(netPrecision, {inputDynamicShapes}); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } auto paramsOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); auto experimentalDetectron = std::make_shared( params[0], // priors diff --git a/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_roifeatureextractor.cpp b/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_roifeatureextractor.cpp index 459b11c17bd..5d2a944cb86 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_roifeatureextractor.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_roifeatureextractor.cpp @@ -66,7 +66,10 @@ void ExperimentalDetectronROIFeatureExtractorLayerTest::SetUp() { attrs.sampling_ratio = samplingRatio; attrs.pyramid_scales = pyramidScales; - auto params = ngraph::builder::makeDynamicParams(netPrecision, {inputDynamicShapes}); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } auto paramsOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); auto experimentalDetectronROIFeatureExtractor = std::make_shared(paramsOuts, attrs); function = std::make_shared(ov::OutputVector{experimentalDetectronROIFeatureExtractor->output(0), diff --git a/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_topkrois.cpp b/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_topkrois.cpp index 9712a966325..cfdb4f7d9fc 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_topkrois.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_topkrois.cpp @@ -50,7 +50,10 @@ void ExperimentalDetectronTopKROIsLayerTest::SetUp() { init_input_shapes(inputShapes); - auto params = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); auto experimentalDetectronTopKROIs = std::make_shared(paramOuts[0], paramOuts[1], maxRois); function = std::make_shared(ov::OutputVector {experimentalDetectronTopKROIs->output(0)}, "ExperimentalDetectronTopKROIs"); diff --git a/src/tests/functional/shared_test_classes/src/single_layer/generate_proposals.cpp b/src/tests/functional/shared_test_classes/src/single_layer/generate_proposals.cpp index a4bfc342910..384806c1746 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/generate_proposals.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/generate_proposals.cpp @@ -92,7 +92,10 @@ void GenerateProposalsLayerTest::SetUp() { init_input_shapes(inputShapes); - auto params = ngraph::builder::makeDynamicParams(netPrecision, {inputDynamicShapes}); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } auto paramsOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); auto generateProposals = std::make_shared( params[0], // im_info diff --git a/src/tests/functional/shared_test_classes/src/single_layer/is_inf.cpp b/src/tests/functional/shared_test_classes/src/single_layer/is_inf.cpp index c071bca16f3..4419b1ca0a6 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/is_inf.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/is_inf.cpp @@ -57,7 +57,10 @@ void IsInfLayerTest::SetUp() { init_input_shapes(shapes); configuration.insert(additionalConfig.begin(), additionalConfig.end()); - auto parameters = ngraph::builder::makeDynamicParams(dataPrc, inputDynamicShapes); + ov::ParameterVector parameters; + for (auto&& shape : inputDynamicShapes) { + parameters.push_back(std::make_shared(dataPrc, shape)); + } parameters[0]->set_friendly_name("Data"); auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(parameters)); diff --git a/src/tests/functional/shared_test_classes/src/single_layer/matrix_nms.cpp b/src/tests/functional/shared_test_classes/src/single_layer/matrix_nms.cpp index 90bb502aa94..d2bb754754c 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/matrix_nms.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/matrix_nms.cpp @@ -315,7 +315,10 @@ void MatrixNmsLayerTest::SetUp() { ElementType paramsPrec, maxBoxPrec, thrPrec; std::tie(paramsPrec, maxBoxPrec, thrPrec) = inPrecisions; - const auto params = ngraph::builder::makeDynamicParams(paramsPrec, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(paramsPrec, shape)); + } const auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); auto nms = std::make_shared(paramOuts[0], paramOuts[1], m_attrs); diff --git a/src/tests/functional/shared_test_classes/src/single_layer/multiclass_nms.cpp b/src/tests/functional/shared_test_classes/src/single_layer/multiclass_nms.cpp index d3477a29737..21b0406f1b7 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/multiclass_nms.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/multiclass_nms.cpp @@ -367,9 +367,16 @@ void MulticlassNmsLayerTest::SetUp() { ParameterVector params; if (inputDynamicShapes.size() > 2) { - params = ngraph::builder::makeDynamicParams({paramsPrec, paramsPrec, roisnumPrec}, inputDynamicShapes); + std::vector types {paramsPrec, paramsPrec, roisnumPrec}; + OPENVINO_ASSERT(types.size() == inputDynamicShapes.size()); + for (size_t i = 0; i < types.size(); i++) { + auto param_node = std::make_shared(types[i], inputDynamicShapes[i]); + params.push_back(param_node); + } } else { - params = ngraph::builder::makeDynamicParams(paramsPrec, inputDynamicShapes); + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(paramsPrec, shape)); + } } const auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); diff --git a/src/tests/functional/shared_test_classes/src/single_layer/slice.cpp b/src/tests/functional/shared_test_classes/src/single_layer/slice.cpp index c327cc72f0f..176d154038e 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/slice.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/slice.cpp @@ -48,7 +48,10 @@ void Slice8LayerTest::SetUp() { configuration.insert(additionalConfig.begin(), additionalConfig.end()); init_input_shapes(sliceParams.shapes); - auto params = ngraph::builder::makeDynamicParams(netPrecision, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(netPrecision, shape)); + } auto sliceOp = ngraph::builder::makeSlice(params[0], sliceParams.start, sliceParams.stop, sliceParams.step, sliceParams.axes, netPrecision); ov::ResultVector results; diff --git a/src/tests/functional/shared_test_classes/src/subgraph/simple_if.cpp b/src/tests/functional/shared_test_classes/src/subgraph/simple_if.cpp index cd95e1d4616..84a70f263ff 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/simple_if.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/simple_if.cpp @@ -49,7 +49,10 @@ void SimpleIfTest::SetUp() { std::tie(shapes, inType, condition, targetDevice) = this->GetParam(); init_input_shapes(shapes); - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } auto p1 = std::make_shared(inType, inputDynamicShapes[0]); auto p2 = std::make_shared(inType, inputDynamicShapes[1]); @@ -81,7 +84,10 @@ void SimpleIf2OutTest::SetUp() { std::tie(shapes, inType, condition, targetDevice) = this->GetParam(); init_input_shapes(shapes); - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } auto p1 = std::make_shared(inType, inputDynamicShapes[0]); auto p2 = std::make_shared(inType, inputDynamicShapes[1]); @@ -118,7 +124,10 @@ void SimpleIfNotConstConditionTest::SetUp() { init_input_shapes(shapes); for (auto &target : targetStaticShapes) target.emplace_back(ov::Shape{}); - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } params.emplace_back(std::make_shared(ov::element::Type_t::boolean, ov::Shape{})); auto p1 = std::make_shared(inType, inputDynamicShapes[0]); @@ -174,7 +183,10 @@ void SimpleIfNotConstConditionAndInternalDynamismTest::SetUp() { init_input_shapes(shapes); for (auto &target : targetStaticShapes) target.emplace_back(ov::Shape{}); - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } params.emplace_back(std::make_shared(ov::element::Type_t::boolean, ov::Shape{})); auto p1 = std::make_shared(inType, inputDynamicShapes[0]); @@ -215,7 +227,10 @@ void SimpleIfNotConstConditionAndDimsIncreaseTest::SetUp() { init_input_shapes(shapes); for (auto &target : targetStaticShapes) target.emplace_back(ov::Shape{}); - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } params.emplace_back(std::make_shared(ov::element::Type_t::boolean, ov::Shape{})); auto p1 = std::make_shared(inType, inputDynamicShapes[0]); @@ -258,7 +273,10 @@ void SimpleIfNotConstConditionUnusedOutputPortsTest::SetUp() { init_input_shapes(shapes); for (auto &target : targetStaticShapes) target.emplace_back(ov::Shape{}); - auto params = ngraph::builder::makeDynamicParams(inType, inputDynamicShapes); + ov::ParameterVector params; + for (auto&& shape : inputDynamicShapes) { + params.push_back(std::make_shared(inType, shape)); + } params.emplace_back(std::make_shared(ov::element::Type_t::boolean, ov::Shape{})); auto p1 = std::make_shared(inType, inputDynamicShapes[0]); diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/markup_bias_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/markup_bias_function.cpp index e2a0f1798cc..ca9aecc2424 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/markup_bias_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/markup_bias_function.cpp @@ -15,7 +15,7 @@ std::shared_ptr MarkupBiasFunction::get(const ov::element::Type& prec const ov::PartialShape& add_shape, const std::string& layer_type, const bool extra_multipy) { - auto input_params = builder::makeDynamicParams(precision, {input_shape}); + ov::ParameterVector input_params{std::make_shared(precision, input_shape)}; auto il = opset1::Constant::create(precision, {}, {0.f}); auto ih = opset1::Constant::create(precision, {}, {12.5f}); auto ol = opset1::Constant::create(precision, {}, {0.f}); diff --git a/src/tests/ngraph_helpers/ngraph_functions/include/ngraph_functions/builders.hpp b/src/tests/ngraph_helpers/ngraph_functions/include/ngraph_functions/builders.hpp index 727367c2f93..d3f4b516589 100644 --- a/src/tests/ngraph_helpers/ngraph_functions/include/ngraph_functions/builders.hpp +++ b/src/tests/ngraph_helpers/ngraph_functions/include/ngraph_functions/builders.hpp @@ -25,10 +25,6 @@ namespace ngraph { namespace builder { -ngraph::ParameterVector makeDynamicParams(const element::Type &type, const std::vector &shapes); - -ngraph::ParameterVector makeDynamicParams(const std::vector& types, const std::vector& shapes); - template std::shared_ptr makeConstant(const element::Type &type, const std::vector &shape, const std::vector &data, bool random = false, diff --git a/src/tests/ngraph_helpers/ngraph_functions/src/input_layer.cpp b/src/tests/ngraph_helpers/ngraph_functions/src/input_layer.cpp index 350368c0bf6..016e613659e 100644 --- a/src/tests/ngraph_helpers/ngraph_functions/src/input_layer.cpp +++ b/src/tests/ngraph_helpers/ngraph_functions/src/input_layer.cpp @@ -36,7 +36,7 @@ std::shared_ptr makeDynamicInputLayer(const element::Type &type, n } if (inputType == ngraph::helpers::InputLayerType::PARAMETER) { - return ngraph::builder::makeDynamicParams(type, {shape}).front(); + return std::make_shared(type, shape); } throw std::runtime_error("Could not make input layer. Unsupported inputType for dynamic shape"); diff --git a/src/tests/ngraph_helpers/ngraph_functions/src/params_vector.cpp b/src/tests/ngraph_helpers/ngraph_functions/src/params_vector.cpp deleted file mode 100644 index 5a60bac6c03..00000000000 --- a/src/tests/ngraph_helpers/ngraph_functions/src/params_vector.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#include -#include - -#include "ngraph_functions/builders.hpp" -#include "openvino/core/partial_shape.hpp" - -namespace ngraph { -namespace builder { - -ngraph::ParameterVector makeDynamicParams(const element::Type &type, const std::vector &shapes) { - ngraph::ParameterVector outs; - for (const auto &shape : shapes) { - auto paramNode = std::make_shared(type, shape); - outs.push_back(paramNode); - } - - return outs; -} - -ngraph::ParameterVector makeDynamicParams(const std::vector& types, const std::vector& shapes) { - ngraph::ParameterVector outs; - NGRAPH_CHECK(types.size() == shapes.size()); - for (size_t i = 0; i < types.size(); i++) { - auto paramNode = std::make_shared(types[i], shapes[i]); - outs.push_back(paramNode); - } - return outs; -} - -} // namespace builder -} // namespace ngraph