diff --git a/inference-engine/tests/functional/plugin/gna/Import_export_tests/import_export_memory_layer.cpp b/inference-engine/tests/functional/plugin/gna/Import_export_tests/import_export_memory_layer.cpp index 3208676fe74..e89dadee68a 100644 --- a/inference-engine/tests/functional/plugin/gna/Import_export_tests/import_export_memory_layer.cpp +++ b/inference-engine/tests/functional/plugin/gna/Import_export_tests/import_export_memory_layer.cpp @@ -53,6 +53,7 @@ public: configuration.insert(exportConfiguration.begin(), exportConfiguration.end()); LoadNetwork(); + GenerateInputs(); Infer(); executableNetwork.Export("exported_model.blob"); for (auto const &configItem : importConfiguration) { diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/fake_quantize.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/fake_quantize.hpp index a4fa5e7666b..aabcc8d3263 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/fake_quantize.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/fake_quantize.hpp @@ -20,6 +20,7 @@ TEST_P(FakeQuantizeLayerTest, CompareWithRefs) { size_t nIterations = 1; for (; nIterations != 0; nIterations--) { UpdateSeed(); + GenerateInputs(); Infer(); Validate(); } diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/loop.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/loop.hpp index d6514d66de7..c12dba016c5 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/loop.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/loop.hpp @@ -20,6 +20,7 @@ TEST_P(StaticShapeLoopTest, CompareWithRefs) { TEST_P(StaticShapeLoopTest, CompareWithPredefinedRefs) { SKIP_IF_CURRENT_TEST_IS_DISABLED() LoadNetwork(); + GenerateInputs(); Infer(); auto expectedOutputs = PredefinedRefs(); // use predefined refs instead of CalculateRefs function const auto& actualOutputs = GetOutputs(); diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/basic_lstm.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/basic_lstm.hpp index 438417645cf..5167f53c622 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/basic_lstm.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/basic_lstm.hpp @@ -56,6 +56,7 @@ TEST_P(Basic_LSTM_S, CompareWithRefImpl_LowLatencyTransformation) { } } IE_SUPPRESS_DEPRECATED_END + GenerateInputs(); // Run and compare Infer(); const auto& actualOutputs = GetOutputs(); diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/eltwise_conv_eltwise.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/eltwise_conv_eltwise.hpp index 37c8606cbf9..8b48f07b383 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/eltwise_conv_eltwise.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/eltwise_conv_eltwise.hpp @@ -10,6 +10,7 @@ namespace SubgraphTestsDefinitions { TEST_P(EltwiseAfterConvTest, CompareWithRefImpl) { LoadNetwork(); + GenerateInputs(); Infer(); // Create another copy of function for validation since some data will be changed by GNA plugin SetUp(); @@ -18,6 +19,7 @@ TEST_P(EltwiseAfterConvTest, CompareWithRefImpl) { TEST_P(EltwiseBeforeConvTest, CompareWithRefImpl) { LoadNetwork(); + GenerateInputs(); Infer(); // Create another copy of function for validation since some data will be changed by GNA plugin SetUp(); diff --git a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/scaleshift_conv_scaleshift.hpp b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/scaleshift_conv_scaleshift.hpp index bc1d8ce9ffd..1966eb7a8b2 100644 --- a/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/scaleshift_conv_scaleshift.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/subgraph_tests/scaleshift_conv_scaleshift.hpp @@ -10,6 +10,7 @@ namespace SubgraphTestsDefinitions { TEST_P(ScaleShiftAfterConvTest, CompareWithRefImpl) { LoadNetwork(); + GenerateInputs(); Infer(); // Create another copy of function for validation since some data will be changed by GNA plugin SetUp(); @@ -18,6 +19,7 @@ TEST_P(ScaleShiftAfterConvTest, CompareWithRefImpl) { TEST_P(ScaleShiftBeforeConvTest, CompareWithRefImpl) { LoadNetwork(); + GenerateInputs(); Infer(); // Create another copy of function for validation since some data will be changed by GNA plugin SetUp(); diff --git a/inference-engine/tests/functional/plugin/shared/src/base/import_export_base/import_export_base.cpp b/inference-engine/tests/functional/plugin/shared/src/base/import_export_base/import_export_base.cpp index d807d80eaa3..5bfc79cfac3 100644 --- a/inference-engine/tests/functional/plugin/shared/src/base/import_export_base/import_export_base.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/base/import_export_base/import_export_base.cpp @@ -38,6 +38,7 @@ void ImportNetworkTestBase::Run() { configuration.insert(exportConfiguration.begin(), exportConfiguration.end()); LoadNetwork(); + GenerateInputs(); Infer(); const auto& actualOutputs = GetOutputs(); @@ -52,6 +53,7 @@ void ImportNetworkTestBase::Run() { exportImportNetwork(); const auto importedExecNetwork = executableNetwork; + GenerateInputs(); Infer(); ASSERT_EQ(importedExecNetwork.GetInputsInfo().size(), compiledExecNetwork.GetInputsInfo().size()); diff --git a/inference-engine/tests/functional/plugin/shared/src/behavior/invalid_cases/proposal.cpp b/inference-engine/tests/functional/plugin/shared/src/behavior/invalid_cases/proposal.cpp index 2292a8b6a29..8805b18f2af 100644 --- a/inference-engine/tests/functional/plugin/shared/src/behavior/invalid_cases/proposal.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/behavior/invalid_cases/proposal.cpp @@ -95,6 +95,7 @@ void ProposalBehTest::SetUp() { void ProposalBehTest::Run() { LoadNetwork(); + GenerateInputs(); Infer(); } diff --git a/inference-engine/tests/functional/plugin/shared/src/behavior/set_blob_of_kind.cpp b/inference-engine/tests/functional/plugin/shared/src/behavior/set_blob_of_kind.cpp index 962b1fab7b5..e39ef624d52 100644 --- a/inference-engine/tests/functional/plugin/shared/src/behavior/set_blob_of_kind.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/behavior/set_blob_of_kind.cpp @@ -66,6 +66,7 @@ void SetBlobOfKindTest::Run() { SKIP_IF_CURRENT_TEST_IS_DISABLED() LoadNetwork(); + GenerateInputs(); if (isBlobKindSupported(core, targetDevice, blobKind)) { Infer(); diff --git a/inference-engine/tests/functional/plugin/shared/src/behavior/stress_tests.cpp b/inference-engine/tests/functional/plugin/shared/src/behavior/stress_tests.cpp index f39f6ec63b0..3a3e8c41bc0 100644 --- a/inference-engine/tests/functional/plugin/shared/src/behavior/stress_tests.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/behavior/stress_tests.cpp @@ -43,6 +43,7 @@ TEST_P(MultipleAllocations, InferWorksCorrectAfterAllocations) { std::cout << "Infer(): " << j << std::flush; + GenerateInputs(); Infer(); Validate(); } diff --git a/inference-engine/tests/functional/plugin/shared/src/configuration_tests/dynamic_batch.cpp b/inference-engine/tests/functional/plugin/shared/src/configuration_tests/dynamic_batch.cpp index f1144bab8af..b06589a3a5e 100644 --- a/inference-engine/tests/functional/plugin/shared/src/configuration_tests/dynamic_batch.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/configuration_tests/dynamic_batch.cpp @@ -154,6 +154,7 @@ namespace ConfigurationTestsDefinitions { void DynamicBatchTest::Run() { SKIP_IF_CURRENT_TEST_IS_DISABLED(); LoadNetwork(); + GenerateInputs(); Infer(); Validate(); } diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/layer_test_utils.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/layer_test_utils.hpp index 12381ee2c81..c2798bf9506 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/layer_test_utils.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/layer_test_utils.hpp @@ -189,6 +189,8 @@ protected: void LoadNetwork(); + virtual void GenerateInputs(); + virtual void Infer(); TargetDevice targetDevice; diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/detection_output.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/detection_output.hpp index 82a56f7d5ca..a9fb04922ec 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/detection_output.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/detection_output.hpp @@ -62,7 +62,7 @@ class DetectionOutputLayerTest : public testing::WithParamInterface obj); ngraph::op::DetectionOutputAttrs attrs; std::vector inShapes; - void Infer() override; + void GenerateInputs() override; void Compare(const std::vector &expected, const InferenceEngine::Blob::Ptr &actual) override; protected: void SetUp() override; diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gru_sequence.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gru_sequence.hpp index 38cd2ca4254..feff8cc62d9 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gru_sequence.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/gru_sequence.hpp @@ -36,7 +36,7 @@ public: protected: void SetUp() override; - void Infer() override; + void GenerateInputs() override; private: ngraph::helpers::SequenceTestsMode m_mode; diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/lstm_sequence.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/lstm_sequence.hpp index c141ec070b8..3731cc6ddaf 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/lstm_sequence.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/lstm_sequence.hpp @@ -32,7 +32,7 @@ class LSTMSequenceTest : public testing::WithParamInterface, public: static std::string getTestCaseName(const testing::TestParamInfo &obj); protected: - void Infer() override; + void GenerateInputs() override; void SetUp() override; private: diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/non_max_suppression.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/non_max_suppression.hpp index ca7598ea71f..39b29b71c6d 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/non_max_suppression.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/non_max_suppression.hpp @@ -34,7 +34,7 @@ using NmsParams = std::tuple, virtual public LayerTestsUtils::LayerTestsCommon { public: static std::string getTestCaseName(testing::TestParamInfo obj); - void Infer() override; + void GenerateInputs() override; void Compare(const std::vector> &expectedOutputs, const std::vector &actualOutputs) override; protected: diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/psroi_pooling.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/psroi_pooling.hpp index 00b77b2835f..2f0654e28b0 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/psroi_pooling.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/psroi_pooling.hpp @@ -32,7 +32,7 @@ class PSROIPoolingLayerTest : public testing::WithParamInterface, virtual public LayerTestsUtils::LayerTestsCommon { public: static std::string getTestCaseName(testing::TestParamInfo obj); - void Infer() override; + void GenerateInputs() override; protected: void SetUp() override; diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/rnn_sequence.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/rnn_sequence.hpp index 3d6786c80d4..6ef06b6b366 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/rnn_sequence.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/rnn_sequence.hpp @@ -34,7 +34,7 @@ public: protected: void SetUp() override; - void Infer() override; + void GenerateInputs() override; private: ngraph::helpers::SequenceTestsMode m_mode; diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/roi_align.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/roi_align.hpp index 3077a512502..3af70bcaad8 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/roi_align.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/roi_align.hpp @@ -23,7 +23,6 @@ class ROIAlignLayerTest : public testing::WithParamInterface, virtual public LayerTestsUtils::LayerTestsCommon { public: static std::string getTestCaseName(testing::TestParamInfo obj); - void Infer() override; protected: void SetUp() override; diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/roi_pooling.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/roi_pooling.hpp index 21163526742..b4999486282 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/roi_pooling.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/roi_pooling.hpp @@ -30,7 +30,7 @@ class ROIPoolingLayerTest : public testing::WithParamInterface obj); - void Infer() override; + void GenerateInputs() override; protected: void SetUp() override; diff --git a/inference-engine/tests/functional/shared_test_classes/src/base/layer_test_utils.cpp b/inference-engine/tests/functional/shared_test_classes/src/base/layer_test_utils.cpp index a00ca8d9183..d26b00bf45b 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/base/layer_test_utils.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/base/layer_test_utils.cpp @@ -178,6 +178,7 @@ void LayerTestsCommon::Run() { try { LoadNetwork(); + GenerateInputs(); Infer(); Validate(); reportStatus(PassRate::Statuses::PASSED); @@ -336,20 +337,34 @@ void LayerTestsCommon::LoadNetwork() { executableNetwork = core->LoadNetwork(cnnNetwork, targetDevice, configuration); } -void LayerTestsCommon::Infer() { - inferRequest = executableNetwork.CreateInferRequest(); - inputs.clear(); - +void LayerTestsCommon::GenerateInputs() { const auto& inputsInfo = executableNetwork.GetInputsInfo(); - for (const auto& param : function->get_parameters()) { + const auto& functionParams = function->get_parameters(); + for (int i = 0; i < functionParams.size(); ++i) { + const auto& param = functionParams[i]; const auto infoIt = inputsInfo.find(param->get_friendly_name()); GTEST_ASSERT_NE(infoIt, inputsInfo.cend()); const auto& info = infoIt->second; auto blob = GenerateInput(*info); - inferRequest.SetBlob(info->name(), blob); inputs.push_back(blob); } +} + +void LayerTestsCommon::Infer() { + inferRequest = executableNetwork.CreateInferRequest(); + + const auto& inputsInfo = executableNetwork.GetInputsInfo(); + const auto& functionParams = function->get_parameters(); + for (int i = 0; i < functionParams.size(); ++i) { + const auto& param = functionParams[i]; + const auto infoIt = inputsInfo.find(param->get_friendly_name()); + GTEST_ASSERT_NE(infoIt, inputsInfo.cend()); + + const auto& info = infoIt->second; + auto blob = inputs[i]; + inferRequest.SetBlob(info->name(), blob); + } if (configuration.count(InferenceEngine::PluginConfigParams::KEY_DYN_BATCH_ENABLED) && configuration.count(InferenceEngine::PluginConfigParams::YES)) { auto batchSize = executableNetwork.GetInputsInfo().begin()->second->getTensorDesc().getDims()[0] / 2; diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/activation.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/activation.cpp index a2a320f9f22..5f2b05b8565 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/activation.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/activation.cpp @@ -184,7 +184,7 @@ void ActivationParamLayerTest::generateActivationBlob(std::vector constan void ActivationParamLayerTest::Infer() { inferRequest = executableNetwork.CreateInferRequest(); - inputs.clear(); + auto blobInput = inferRequest.GetBlob("Input"); blobInput = FuncTestUtils::createAndFillBlobFloat(blobInput->getTensorDesc()); diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/detection_output.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/detection_output.cpp index a60c204db55..82d469e3495 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/detection_output.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/detection_output.cpp @@ -64,10 +64,7 @@ std::string DetectionOutputLayerTest::getTestCaseName(testing::TestParamInfogetTensorDesc()); blob->allocate(); CommonTestUtils::fill_data_random_float(blob, range, 0, resolution); - inferRequest.SetBlob(info->name(), blob); inputs.push_back(blob); it++; } - inferRequest.Infer(); } void DetectionOutputLayerTest::Compare(const std::vector &expected, const InferenceEngine::Blob::Ptr &actual) { diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/gru_sequence.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/gru_sequence.cpp index ee8edd16937..960bcb5b3c3 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/gru_sequence.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/gru_sequence.cpp @@ -93,25 +93,14 @@ namespace LayerTestsDefinitions { } } - void GRUSequenceTest::Infer() { - inferRequest = executableNetwork.CreateInferRequest(); - inputs.clear(); - + void GRUSequenceTest::GenerateInputs() { for (const auto &input : executableNetwork.GetInputsInfo()) { const auto &info = input.second; auto blob = GenerateInput(*info); if (input.first == "seq_lengths") { blob = FuncTestUtils::createAndFillBlob(info->getTensorDesc(), m_max_seq_len, 0); } - - inferRequest.SetBlob(info->name(), blob); inputs.push_back(blob); } - if (configuration.count(InferenceEngine::PluginConfigParams::KEY_DYN_BATCH_ENABLED) && - configuration.count(InferenceEngine::PluginConfigParams::YES)) { - auto batchSize = executableNetwork.GetInputsInfo().begin()->second->getTensorDesc().getDims()[0] / 2; - inferRequest.SetBatch(batchSize); - } - inferRequest.Infer(); } } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/lstm_sequence.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/lstm_sequence.cpp index 1756a0616c5..6c7b5b77264 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/lstm_sequence.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/lstm_sequence.cpp @@ -93,10 +93,7 @@ namespace LayerTestsDefinitions { } } - void LSTMSequenceTest::Infer() { - inferRequest = executableNetwork.CreateInferRequest(); - inputs.clear(); - + void LSTMSequenceTest::GenerateInputs() { for (const auto &input : executableNetwork.GetInputsInfo()) { const auto &info = input.second; auto blob = GenerateInput(*info); @@ -104,14 +101,7 @@ namespace LayerTestsDefinitions { blob = FuncTestUtils::createAndFillBlob(info->getTensorDesc(), m_max_seq_len, 0); } - inferRequest.SetBlob(info->name(), blob); inputs.push_back(blob); } - if (configuration.count(InferenceEngine::PluginConfigParams::KEY_DYN_BATCH_ENABLED) && - configuration.count(InferenceEngine::PluginConfigParams::YES)) { - auto batchSize = executableNetwork.GetInputsInfo().begin()->second->getTensorDesc().getDims()[0] / 2; - inferRequest.SetBatch(batchSize); - } - inferRequest.Infer(); } } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/non_max_suppression.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/non_max_suppression.cpp index 5554dcfd029..823003c87f2 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/non_max_suppression.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/non_max_suppression.cpp @@ -37,10 +37,7 @@ std::string NmsLayerTest::getTestCaseName(testing::TestParamInfo obj) return result.str(); } -void NmsLayerTest::Infer() { - inferRequest = executableNetwork.CreateInferRequest(); - inputs.clear(); - +void NmsLayerTest::GenerateInputs() { size_t it = 0; for (const auto &input : cnnNetwork.getInputsInfo()) { const auto &info = input.second; @@ -53,11 +50,9 @@ void NmsLayerTest::Infer() { } else { blob = GenerateInput(*info); } - inferRequest.SetBlob(info->name(), blob); inputs.push_back(blob); it++; } - inferRequest.Infer(); } void NmsLayerTest::Compare(const std::vector> &expectedOutputs, const std::vector &actualOutputs) { diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/psroi_pooling.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/psroi_pooling.cpp index 92619f9fe97..497de165528 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/psroi_pooling.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/psroi_pooling.cpp @@ -77,10 +77,7 @@ static void fillROITensor(float* buffer, int numROIs, int batchSize, } } -void PSROIPoolingLayerTest::Infer() { - inferRequest = executableNetwork.CreateInferRequest(); - inputs.clear(); - +void PSROIPoolingLayerTest::GenerateInputs() { auto inputShape = cnnNetwork.getInputShapes().begin()->second; size_t it = 0; @@ -97,11 +94,9 @@ void PSROIPoolingLayerTest::Infer() { } else { blob = GenerateInput(*info); } - inferRequest.SetBlob(info->name(), blob); inputs.push_back(blob); it++; } - inferRequest.Infer(); } void PSROIPoolingLayerTest::SetUp() { diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/rnn_sequence.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/rnn_sequence.cpp index e0a660203cf..9efb562dc0a 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/rnn_sequence.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/rnn_sequence.cpp @@ -91,10 +91,7 @@ namespace LayerTestsDefinitions { } } - void RNNSequenceTest::Infer() { - inferRequest = executableNetwork.CreateInferRequest(); - inputs.clear(); - + void RNNSequenceTest::GenerateInputs() { for (const auto &input : executableNetwork.GetInputsInfo()) { const auto &info = input.second; auto blob = GenerateInput(*info); @@ -102,14 +99,7 @@ namespace LayerTestsDefinitions { blob = FuncTestUtils::createAndFillBlob(info->getTensorDesc(), m_max_seq_len, 0); } - inferRequest.SetBlob(info->name(), blob); inputs.push_back(blob); } - if (configuration.count(InferenceEngine::PluginConfigParams::KEY_DYN_BATCH_ENABLED) && - configuration.count(InferenceEngine::PluginConfigParams::YES)) { - auto batchSize = executableNetwork.GetInputsInfo().begin()->second->getTensorDesc().getDims()[0] / 2; - inferRequest.SetBatch(batchSize); - } - inferRequest.Infer(); } } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/roi_align.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/roi_align.cpp index ed1c1805339..53dcb7226ed 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/roi_align.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/roi_align.cpp @@ -74,20 +74,6 @@ static void fillIdxTensor(std::vector & idx, int batchSize) { } } -void ROIAlignLayerTest::Infer() { - inferRequest = executableNetwork.CreateInferRequest(); - inputs.clear(); - auto inputShape = cnnNetwork.getInputShapes().begin()->second; - for (const auto &input : cnnNetwork.getInputsInfo()) { - const auto &info = input.second; - Blob::Ptr blob; - blob = GenerateInput(*info); - inferRequest.SetBlob(info->name(), blob); - inputs.push_back(blob); - } - inferRequest.Infer(); -} - void ROIAlignLayerTest::SetUp() { std::vector inputShape; std::vector coordsShape; diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/roi_pooling.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/roi_pooling.cpp index ead8c984812..f2e89788c21 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/roi_pooling.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/roi_pooling.cpp @@ -36,10 +36,7 @@ namespace LayerTestsDefinitions { return result.str(); } - void ROIPoolingLayerTest::Infer() { - inferRequest = executableNetwork.CreateInferRequest(); - inputs.clear(); - + void ROIPoolingLayerTest::GenerateInputs() { auto feat_map_shape = cnnNetwork.getInputShapes().begin()->second; const auto is_roi_max_mode = (pool_method == ngraph::helpers::ROIPoolingTypes::ROI_MAX); @@ -60,11 +57,9 @@ namespace LayerTestsDefinitions { } else { blob = GenerateInput(*info); } - inferRequest.SetBlob(info->name(), blob); inputs.push_back(blob); it++; } - inferRequest.Infer(); } void ROIPoolingLayerTest::SetUp() { diff --git a/inference-engine/tests/functional/shared_test_classes/src/subgraph/basic_lstm.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/basic_lstm.cpp index 529b748ea1b..996fbf01ab6 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/subgraph/basic_lstm.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/basic_lstm.cpp @@ -105,6 +105,7 @@ void Basic_LSTM_S::Run() { SKIP_IF_CURRENT_TEST_IS_DISABLED() LoadNetwork(); + GenerateInputs(); Infer(); const auto& actualOutputs = GetOutputs(); diff --git a/inference-engine/tests/functional/shared_test_classes/src/subgraph/concat_quantization_during_memory_requantization.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/concat_quantization_during_memory_requantization.cpp index 82ed62a6951..55e68048431 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/subgraph/concat_quantization_during_memory_requantization.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/concat_quantization_during_memory_requantization.cpp @@ -115,6 +115,7 @@ namespace SubgraphTestsDefinitions { } } IE_SUPPRESS_DEPRECATED_END + GenerateInputs(); Infer(); switchToNgraphFriendlyModel(); Validate(); diff --git a/inference-engine/tests/functional/shared_test_classes/src/subgraph/delayed_copy_layer.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/delayed_copy_layer.cpp index 43aba42012e..8c2a5da68a1 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/subgraph/delayed_copy_layer.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/delayed_copy_layer.cpp @@ -63,6 +63,7 @@ namespace SubgraphTestsDefinitions { SKIP_IF_CURRENT_TEST_IS_DISABLED() LoadNetwork(); + GenerateInputs(); Infer(); switchToNgraphFriendlyModel(); Validate(); diff --git a/inference-engine/tests/functional/shared_test_classes/src/subgraph/memory_LSTMCell.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/memory_LSTMCell.cpp index 1b84bb53009..f52281cee91 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/subgraph/memory_LSTMCell.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/memory_LSTMCell.cpp @@ -265,6 +265,7 @@ namespace SubgraphTestsDefinitions { } } IE_SUPPRESS_DEPRECATED_END + GenerateInputs(); Infer(); switchToNgraphFriendlyModel(); Validate(); @@ -303,6 +304,7 @@ namespace SubgraphTestsDefinitions { } } IE_SUPPRESS_DEPRECATED_END + GenerateInputs(); Infer(); CreatePureTensorIteratorModel(); diff --git a/inference-engine/tests/functional/shared_test_classes/src/subgraph/memory_eltwise_reshape_concat.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/memory_eltwise_reshape_concat.cpp index 3ff86dcec03..4e3658ac575 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/subgraph/memory_eltwise_reshape_concat.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/memory_eltwise_reshape_concat.cpp @@ -128,6 +128,7 @@ void MemoryEltwiseReshapeConcatTest::Run() { memory_init.data(), memory_init.size()); states[0].SetState(state_values_blob); IE_SUPPRESS_DEPRECATED_END + GenerateInputs(); Infer(); initNgraphFriendlyModel(); Validate(); diff --git a/inference-engine/tests/functional/shared_test_classes/src/subgraph/multiple_LSTMCell.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/multiple_LSTMCell.cpp index ad8439254fe..103df1dd771 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/subgraph/multiple_LSTMCell.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/multiple_LSTMCell.cpp @@ -414,6 +414,7 @@ void MultipleLSTMCellTest::Run() { } } IE_SUPPRESS_DEPRECATED_END + GenerateInputs(); Infer(); switchToNgraphFriendlyModel(); Validate(); @@ -464,6 +465,7 @@ void MultipleLSTMCellTest::RunLowLatency(bool regular_api) { } } IE_SUPPRESS_DEPRECATED_END + GenerateInputs(); Infer(); // Calculate ref values for Unrolled TI diff --git a/inference-engine/tests/functional/shared_test_classes/src/subgraph/negative_memory_layer_offset.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/negative_memory_layer_offset.cpp index ee715e0ce96..c328c1c70d7 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/subgraph/negative_memory_layer_offset.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/negative_memory_layer_offset.cpp @@ -85,6 +85,7 @@ namespace SubgraphTestsDefinitions { } } IE_SUPPRESS_DEPRECATED_END + GenerateInputs(); Infer(); switchToNgraphFriendlyModel(); Validate(); diff --git a/inference-engine/tests/functional/shared_test_classes/src/subgraph/softsign.cpp b/inference-engine/tests/functional/shared_test_classes/src/subgraph/softsign.cpp index 45f69e10852..6e99d88ab33 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/subgraph/softsign.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/subgraph/softsign.cpp @@ -48,6 +48,7 @@ void SoftsignTest::Run() { SKIP_IF_CURRENT_TEST_IS_DISABLED() LoadNetwork(); + GenerateInputs(); Infer(); function = GenerateNgraphFriendlySoftSign();