Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove some builder functions usage #700

Merged
merged 4 commits into from
Aug 14, 2023
Merged

Remove some builder functions usage #700

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c4e1339
Eliminate makeInputLayer usage
olpipi Aug 8, 2023
0193980
Eliminate makeParameter and makeDynamicParameter usage
olpipi Aug 9, 2023
30c1cde
Eliminate builder functions
olpipi Aug 10, 2023
f7eb3b3
Apply comments
olpipi Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...s/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,7 @@ class BasicConvolutionBiasAddActivationLayerTest
for (size_t i = 0; i < biasShape.size(); ++i) {
if (i != channel_dim_index) biasShape[i] = 1;
}
auto biasLayer =
ngraph::builder::makeInputLayer(ngNetPrc, ngraph::helpers::InputLayerType::CONSTANT, biasShape);
auto biasLayer = std::make_shared<ov::op::v0::Constant>(ngNetPrc, biasShape);

auto biasAddLayer = ngraph::builder::makeEltwise(convLayer, biasLayer, ngraph::helpers::EltwiseTypes::ADD);

Expand Down
29 changes: 18 additions & 11 deletions ...dia_plugin/tests/functional/shared_tests_instances/single_layer_tests/fully_connected.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,14 @@ class FullyConnectedLayerTest : public testing::WithParamInterface<FullyConnecte
auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision);
auto params = ngraph::builder::makeParams(ngPrc, {shapeRelatedParams.input1.first});

auto secondaryInput =
ngraph::builder::makeInputLayer(ngPrc, secondaryInputType, shapeRelatedParams.input2.first);
std::shared_ptr<ov::Node> secondaryInput;
if (secondaryInputType == ngraph::helpers::InputLayerType::PARAMETER) {
params.push_back(std::dynamic_pointer_cast<ov::op::v0::Parameter>(secondaryInput));
secondaryInput = std::make_shared<ov::op::v0::Parameter>(ngPrc, ov::Shape(shapeRelatedParams.input2.first));
params.push_back(std::static_pointer_cast<ov::op::v0::Parameter>(secondaryInput));
} else {
secondaryInput = std::make_shared<ov::op::v0::Constant>(ngPrc, shapeRelatedParams.input2.first);
}
auto thirdInput = ngraph::builder::makeInputLayer(
ngPrc, ngraph::helpers::InputLayerType::CONSTANT, shapeRelatedParams.input3);
auto thirdInput = std::make_shared<ov::op::v0::Constant>(ngPrc, shapeRelatedParams.input3);
auto paramOuts =
ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes<ov::op::v0::Parameter>(params));
auto MatMul = std::dynamic_pointer_cast<ov::op::v0::MatMul>(ngraph::builder::makeMatMul(
Expand Down Expand Up @@ -191,15 +192,21 @@ class FullyConnectedLayer2MatMulTest : public testing::WithParamInterface<FullyC
auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision);
auto params = ngraph::builder::makeParams(
ngPrc, {shapeRelatedParams.matmul1_input1.first, shapeRelatedParams.matmul2_input1.first});
auto matmul0SecondaryInput =
ngraph::builder::makeInputLayer(ngPrc, secondaryInputType, shapeRelatedParams.matmul1_input2.first);

std::shared_ptr<ov::Node> matmul0SecondaryInput;
if (secondaryInputType == ngraph::helpers::InputLayerType::PARAMETER) {
params.push_back(std::dynamic_pointer_cast<ov::op::v0::Parameter>(matmul0SecondaryInput));
matmul0SecondaryInput = std::make_shared<ov::op::v0::Parameter>(ngPrc, ov::Shape(shapeRelatedParams.matmul1_input2.first));
params.push_back(std::static_pointer_cast<ov::op::v0::Parameter>(matmul0SecondaryInput));
} else {
matmul0SecondaryInput = std::make_shared<ov::op::v0::Constant>(ngPrc, shapeRelatedParams.matmul1_input2.first);
}
auto matmul1SecondaryInput =
ngraph::builder::makeInputLayer(ngPrc, secondaryInputType, shapeRelatedParams.matmul2_input2.first);

std::shared_ptr<ov::Node> matmul1SecondaryInput;
if (secondaryInputType == ngraph::helpers::InputLayerType::PARAMETER) {
params.push_back(std::dynamic_pointer_cast<ov::op::v0::Parameter>(matmul1SecondaryInput));
matmul1SecondaryInput = std::make_shared<ov::op::v0::Parameter>(ngPrc, ov::Shape(shapeRelatedParams.matmul1_input2.first));
params.push_back(std::static_pointer_cast<ov::op::v0::Parameter>(matmul1SecondaryInput));
} else {
matmul1SecondaryInput = std::make_shared<ov::op::v0::Constant>(ngPrc, shapeRelatedParams.matmul1_input2.first);
}

auto paramOuts =
Expand Down
6 changes: 2 additions & 4 deletions modules/nvidia_plugin/tests/unit/test_networks.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@
#include <ngraph_functions/utils/ngraph_helpers.hpp>

inline std::shared_ptr<ngraph::Function> CreateMatMulTestNetwork() {
ngraph::helpers::InputLayerType secondaryInputType = ngraph::helpers::InputLayerType::CONSTANT;
auto netPrecision = InferenceEngine::Precision::FP32;
std::map<std::string, std::string> additionalConfig;

auto ngPrc = InferenceEngine::details::convertPrecision(netPrecision);
auto params = ngraph::builder::makeParams(ngPrc, {{3, 2, 10, 10}});

auto secondaryInput = ngraph::builder::makeInputLayer(ngPrc, secondaryInputType, {3, 2, 10, 20});
auto secondaryInput = std::make_shared<ov::op::v0::Constant>(ngPrc, ov::Shape{3, 2, 10, 20});
auto paramOuts =
ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes<ov::op::v0::Parameter>(params));
auto MatMul = std::dynamic_pointer_cast<ov::op::v0::MatMul>(
Expand Down Expand Up @@ -63,14 +62,13 @@ class SuperDummyOp : public ov::op::Op {
};

inline std::shared_ptr<ngraph::Function> CreateSuperOperationTestNetwork() {
ngraph::helpers::InputLayerType secondaryInputType = ngraph::helpers::InputLayerType::CONSTANT;
auto netPrecision = InferenceEngine::Precision::FP32;
std::map<std::string, std::string> additionalConfig;

auto ngPrc = InferenceEngine::details::convertPrecision(netPrecision);
auto params = ngraph::builder::makeParams(ngPrc, {{3, 2, 10, 10}});

auto secondaryInput = ngraph::builder::makeInputLayer(ngPrc, secondaryInputType, {3, 2, 10, 20});
auto secondaryInput = std::make_shared<ov::op::v0::Constant>(ngPrc, ov::Shape{3, 2, 10, 20});
auto paramOuts =
ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes<ov::op::v0::Parameter>(params));
auto superOp = std::make_shared<SuperDummyOp>(paramOuts[0], secondaryInput);
Expand Down
Loading