Eliminate makeParameter and makeDynamicParameter usage

openvinotoolkit · Aug 9, 2023 · 0193980 · 0193980
1 parent c4e1339
commit 0193980
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 12 deletions.
diff --git a/.../tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp b/.../tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp
@@ -149,7 +149,8 @@ class ConvolutionBackpropDataExtendedLayerTest
         std::tie(kernel, stride, padBegin, padEnd, dilation, convOutChannels, padType, outputPad) =
             convBackpropDataParams;
         auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision);
-        auto params = ngraph::builder::makeParams(ngPrc, {inputShape});
+        ov::ParameterVector params {std::make_shared<ov::op::v0::Parameter>(ngPrc, ov::Shape(inputShape)))};
+
         auto outputShapeNode =
             ngraph::builder::makeConstant(ov::element::Type_t::i64, {outputShapeData.size()}, outputShapeData);
         auto paramOuts =

diff --git a/...ts/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data_add.cpp b/...ts/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data_add.cpp
@@ -147,7 +147,8 @@ class ConvolutionBackpropDataAddExtendedLayerTest
         std::tie(kernel, stride, padBegin, padEnd, dilation, convOutChannels, padType, outputPad) =
             convBackpropDataParams;
         auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision);
-        auto params = ngraph::builder::makeParams(ngPrc, {inputShape});
+        ov::ParameterVector params {std::make_shared<ov::op::v0::Parameter>(ngPrc, ov::Shape(inputShape)))};
+
         auto outputShapeNode =
             ngraph::builder::makeConstant(ov::element::Type_t::i64, {outputShapeData.size()}, outputShapeData);
         auto paramOuts =

diff --git a/...s/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp b/...s/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp
@@ -163,7 +163,8 @@ class BasicConvolutionBiasAddActivationLayerTest
         }
 
         auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision);
-        auto params = ngraph::builder::makeParams(ngPrc, {inputShape});
+        ov::ParameterVector params {std::make_shared<ov::op::v0::Parameter>(ngPrc, ov::Shape(inputShape)))};
+
         auto paramOuts =
             ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes<ov::op::v0::Parameter>(params));
         std::vector<float> filter_weights;

diff --git a/...nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/cuda_eltwise.cpp b/...nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/cuda_eltwise.cpp
@@ -208,7 +208,7 @@ void CudaEltwiseLayerTest::SetUp() {
 
     init_input_shapes(shapes);
 
-    auto parameters = ngraph::builder::makeDynamicParams(netType, {inputDynamicShapes.front()});
+    ov::ParameterVector parameters {std::make_shared<ov::op::v0::Parameter>(netType, inputDynamicShapes.front)};
 
     ov::PartialShape shape_input_secondary;
     switch (opType) {
@@ -229,8 +229,9 @@ void CudaEltwiseLayerTest::SetUp() {
 
     std::shared_ptr<ngraph::Node> secondaryInput;
     if (secondaryInputType == ngraph::helpers::InputLayerType::PARAMETER) {
-        secondaryInput = ngraph::builder::makeDynamicParams(netType, {shape_input_secondary}).front();
-        parameters.push_back(std::dynamic_pointer_cast<ngraph::opset3::Parameter>(secondaryInput));
+        auto input = std::make_shared<ov::op::v0::Parameter>(netType, shape_input_secondary);
+        secondaryInput = input;
+        parameters.push_back(input);
     } else {
         constexpr bool is_random = true;
         ov::Shape shape = inputDynamicShapes.back().get_max_shape();

diff --git a/...dia_plugin/tests/functional/shared_tests_instances/single_layer_tests/fully_connected.cpp b/...dia_plugin/tests/functional/shared_tests_instances/single_layer_tests/fully_connected.cpp
@@ -83,7 +83,7 @@ class FullyConnectedLayerTest : public testing::WithParamInterface<FullyConnecte
         configuration.insert(additionalConfig.begin(), additionalConfig.end());
 
         auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision);
-        auto params = ngraph::builder::makeParams(ngPrc, {shapeRelatedParams.input1.first});
+        ov::ParameterVector params {std::make_shared<ov::op::v0::Parameter>(ngPrc, ov::Shape{shapeRelatedParams.input1.first})};
 
         std::shared_ptr<ov::Node> secondaryInput;
         if (secondaryInputType == ngraph::helpers::InputLayerType::PARAMETER) {
@@ -190,8 +190,9 @@ class FullyConnectedLayer2MatMulTest : public testing::WithParamInterface<FullyC
         configuration.insert(additionalConfig.begin(), additionalConfig.end());
 
         auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision);
-        auto params = ngraph::builder::makeParams(
-            ngPrc, {shapeRelatedParams.matmul1_input1.first, shapeRelatedParams.matmul2_input1.first});
+        ov::ParameterVector params;
+        params.push_back(std::make_shared<ov::op::v0::Parameter>(ngPrc, ov::Shape(shapeRelatedParams.matmul1_input1.first)));
+        params.push_back(std::make_shared<ov::op::v0::Parameter>(ngPrc, ov::Shape(shapeRelatedParams.matmul2_input1.first)));
 
         std::shared_ptr<ov::Node> matmul0SecondaryInput;
         if (secondaryInputType == ngraph::helpers::InputLayerType::PARAMETER) {

diff --git a/...nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp b/...nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp
@@ -100,7 +100,9 @@ class LPCNetCUDNNGRUSequenceTest : public UnsymmetricalComparer<GRUSequenceTest>
         };
         m_max_seq_len_ = seq_lengths;
         auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision);
-        auto params = ngraph::builder::makeParams(ngPrc, {inputShapes[0], inputShapes[1]});
+        ov::ParameterVector params;
+        params.push_back(std::make_shared<ov::op::v0::Parameter>(ngPrc, ov::Shape(inputShapes[0])));
+        params.push_back(std::make_shared<ov::op::v0::Parameter>(ngPrc, ov::Shape(inputShapes[1])));
 
         ASSERT_EQ(InputLayerType::CONSTANT, WRBType);
         std::vector<ov::Shape> WRB = {inputShapes[3], inputShapes[4], inputShapes[5], inputShapes[2]};

diff --git a/modules/nvidia_plugin/tests/unit/test_networks.hpp b/modules/nvidia_plugin/tests/unit/test_networks.hpp
@@ -13,7 +13,7 @@ inline std::shared_ptr<ngraph::Function> CreateMatMulTestNetwork() {
     std::map<std::string, std::string> additionalConfig;
 
     auto ngPrc = InferenceEngine::details::convertPrecision(netPrecision);
-    auto params = ngraph::builder::makeParams(ngPrc, {{3, 2, 10, 10}});
+    ov::ParameterVector params {std::make_shared<ov::op::v0::Parameter>(ngPrc, ov::Shape{3, 2, 10, 10})};
 
     auto secondaryInput = std::make_shared<ov::op::v0::Constant>(ngPrc, ov::Shape{3, 2, 10, 20});
     auto paramOuts =
@@ -66,7 +66,7 @@ inline std::shared_ptr<ngraph::Function> CreateSuperOperationTestNetwork() {
     std::map<std::string, std::string> additionalConfig;
 
     auto ngPrc = InferenceEngine::details::convertPrecision(netPrecision);
-    auto params = ngraph::builder::makeParams(ngPrc, {{3, 2, 10, 10}});
+    ov::ParameterVector params {std::make_shared<ov::op::v0::Parameter>(ngPrc, ov::Shape{3, 2, 10, 10})};
 
     auto secondaryInput = std::make_shared<ov::op::v0::Constant>(ngPrc, ov::Shape{3, 2, 10, 20});
     auto paramOuts =