From 12ccc669205a12d2eefddfcfcfc2e26a65a2020b Mon Sep 17 00:00:00 2001 From: Svetlana Dolinina Date: Thu, 9 Dec 2021 00:58:33 +0300 Subject: [PATCH] move creation of InferRequests back to Infer; fixed tests for QueryState (#8962) * move creaton of InferRequests back to Infer; fixed tets for QueryState * fix indentation * fix indentation * fixed MemoryLSTMCell test --- .../shared/include/subgraph_tests/basic_lstm.hpp | 10 ++++++++++ .../src/blob_tests/detect_network_batch_test.cpp | 1 - .../plugin/shared/src/blob_tests/dynamic_batch.cpp | 2 +- .../shared_test_classes/base/layer_test_utils.hpp | 2 ++ .../shared_test_classes/subgraph/basic_lstm.hpp | 3 +++ ...ncat_quantization_during_memory_requantization.hpp | 2 ++ .../subgraph/delayed_copy_layer.hpp | 2 ++ .../shared_test_classes/subgraph/memory_LSTMCell.hpp | 2 ++ .../subgraph/memory_eltwise_reshape_concat.hpp | 2 ++ .../subgraph/negative_memory_layer_offset.hpp | 2 ++ .../shared_test_classes/src/base/layer_test_utils.cpp | 10 ++++++++-- .../shared_test_classes/src/single_layer/memory.cpp | 1 - ...ncat_quantization_during_memory_requantization.cpp | 10 ++++++++++ .../src/subgraph/delayed_copy_layer.cpp | 11 +++++++++++ .../src/subgraph/memory_LSTMCell.cpp | 10 ++++++++++ .../src/subgraph/memory_eltwise_reshape_concat.cpp | 10 ++++++++++ .../src/subgraph/negative_memory_layer_offset.cpp | 10 ++++++++++ 17 files changed, 85 insertions(+), 5 deletions(-) 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 a31e73f37b6..f98f470f34c 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 @@ -8,6 +8,16 @@ #include "shared_test_classes/subgraph/basic_lstm.hpp" namespace SubgraphTestsDefinitions { +void Basic_LSTM_S::LoadNetwork() { + LayerTestsUtils::LayerTestsCommon::LoadNetwork(); + inferRequest = executableNetwork.CreateInferRequest(); +} + +void Basic_LSTM_S::Infer() { + ConfigureInferRequest(); + inferRequest.Infer(); +} + TEST_P(Basic_LSTM_S, CompareWithRefImpl) { Run(); }; diff --git a/inference-engine/tests/functional/plugin/shared/src/blob_tests/detect_network_batch_test.cpp b/inference-engine/tests/functional/plugin/shared/src/blob_tests/detect_network_batch_test.cpp index 097d1e6fb53..f598a027922 100644 --- a/inference-engine/tests/functional/plugin/shared/src/blob_tests/detect_network_batch_test.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/blob_tests/detect_network_batch_test.cpp @@ -57,7 +57,6 @@ void DetectNetworkBatch::LoadNetwork() { functionRefs = ngraph::clone_function(*cnnNetwork.getFunction()); ConfigureNetwork(); executableNetwork = core->LoadNetwork(cnnNetwork, targetDevice, configuration); - inferRequest = executableNetwork.CreateInferRequest(); } TEST_P(DetectNetworkBatch, InferWithOneInput) { diff --git a/inference-engine/tests/functional/plugin/shared/src/blob_tests/dynamic_batch.cpp b/inference-engine/tests/functional/plugin/shared/src/blob_tests/dynamic_batch.cpp index 17ff2e25060..4eee1d3b6b2 100644 --- a/inference-engine/tests/functional/plugin/shared/src/blob_tests/dynamic_batch.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/blob_tests/dynamic_batch.cpp @@ -54,10 +54,10 @@ namespace ConfigurationTestsDefinitions { ConfigureNetwork(); cnnNetwork.setBatchSize(max_batch_size); executableNetwork = core->LoadNetwork(cnnNetwork, targetDevice, configuration); - inferRequest = executableNetwork.CreateInferRequest(); } void DynamicBatchTest::Infer() { + inferRequest = executableNetwork.CreateInferRequest(); inputs.clear(); for (int i = 0; i < batch_sizes.size(); i++) { 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 b7c4ad3ff07..92d12e3a8a6 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 @@ -139,6 +139,8 @@ protected: virtual void GenerateInputs(); + virtual void ConfigureInferRequest(); + virtual void Infer(); TargetDevice targetDevice; diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/basic_lstm.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/basic_lstm.hpp index 0ef85499622..127459925c2 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/basic_lstm.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/basic_lstm.hpp @@ -36,6 +36,9 @@ public: std::vector* cell_memory_init_out = nullptr); void GenerateInputs() override; protected: + void LoadNetwork() override; + void Infer() override; + size_t hidden_size; size_t third_dim; std::vector hidden_memory_init; diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/concat_quantization_during_memory_requantization.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/concat_quantization_during_memory_requantization.hpp index 413ddf59290..2a89b1cf31b 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/concat_quantization_during_memory_requantization.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/concat_quantization_during_memory_requantization.hpp @@ -35,5 +35,7 @@ public: protected: void SetUp() override; void Run() override; + void LoadNetwork() override; + void Infer() override; }; } // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/delayed_copy_layer.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/delayed_copy_layer.hpp index a7df8edb5f0..c715e64b764 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/delayed_copy_layer.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/delayed_copy_layer.hpp @@ -30,6 +30,8 @@ private: virtual void switchToNgraphFriendlyModel() = 0; protected: void Run() override; + void LoadNetwork() override; + void Infer() override; std::vector memory_init; public: static std::string getTestCaseName(const testing::TestParamInfo &obj); diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/memory_LSTMCell.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/memory_LSTMCell.hpp index e641da6edd9..28ce81fbcfe 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/memory_LSTMCell.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/memory_LSTMCell.hpp @@ -39,6 +39,8 @@ private: protected: void SetUp() override; void Run() override; + void LoadNetwork() override; + void Infer() override; public: static std::string getTestCaseName(const testing::TestParamInfo &obj); }; diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/memory_eltwise_reshape_concat.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/memory_eltwise_reshape_concat.hpp index 19c3f3ff5fc..37e0fab5ddf 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/memory_eltwise_reshape_concat.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/memory_eltwise_reshape_concat.hpp @@ -33,6 +33,8 @@ private: protected: void SetUp() override; void Run() override; + void LoadNetwork() override; + void Infer() override; public: static std::string getTestCaseName(const testing::TestParamInfo &obj); }; diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/negative_memory_layer_offset.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/negative_memory_layer_offset.hpp index b7b52b1cd72..c841cf4fd6f 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/negative_memory_layer_offset.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/negative_memory_layer_offset.hpp @@ -34,5 +34,7 @@ public: protected: void SetUp() override; void Run() override; + void LoadNetwork() override; + void Infer() override; }; } // namespace SubgraphTestsDefinitions 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 5b0af47276b..de9ecc7dece 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 @@ -345,7 +345,6 @@ void LayerTestsCommon::LoadNetwork() { CoreConfiguration(this); ConfigureNetwork(); executableNetwork = core->LoadNetwork(cnnNetwork, targetDevice, configuration); - inferRequest = executableNetwork.CreateInferRequest(); } void LayerTestsCommon::GenerateInputs() { @@ -362,7 +361,7 @@ void LayerTestsCommon::GenerateInputs() { } } -void LayerTestsCommon::Infer() { +void LayerTestsCommon::ConfigureInferRequest() { const auto& inputsInfo = executableNetwork.GetInputsInfo(); const auto& functionParams = function->get_parameters(); for (int i = 0; i < functionParams.size(); ++i) { @@ -379,6 +378,13 @@ void LayerTestsCommon::Infer() { auto batchSize = executableNetwork.GetInputsInfo().begin()->second->getTensorDesc().getDims()[0] / 2; inferRequest.SetBatch(batchSize); } +} + +void LayerTestsCommon::Infer() { + inferRequest = executableNetwork.CreateInferRequest(); + + ConfigureInferRequest(); + inferRequest.Infer(); } diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/memory.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/memory.cpp index 5b08a7327b8..fb755efaedc 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/memory.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/memory.cpp @@ -81,7 +81,6 @@ namespace LayerTestsDefinitions { CoreConfiguration(this); ConfigureNetwork(); executableNetwork = core->LoadNetwork(cnnNetwork, targetDevice, configuration); - inferRequest = executableNetwork.CreateInferRequest(); } GenerateInputs(); for (int64_t i = 0; i < iteration_count; ++i) { 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 c17b5267471..4615660e67f 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 @@ -99,6 +99,16 @@ namespace SubgraphTestsDefinitions { function = std::make_shared(sigm, input, "concat_quant_during_memory_requant_nomemory"); } + void ConcatQuantDuringMemoryRequantTest::LoadNetwork() { + LayerTestsUtils::LayerTestsCommon::LoadNetwork(); + inferRequest = executableNetwork.CreateInferRequest(); + } + + void ConcatQuantDuringMemoryRequantTest::Infer() { + ConfigureInferRequest(); + inferRequest.Infer(); + } + void ConcatQuantDuringMemoryRequantTest::Run() { SKIP_IF_CURRENT_TEST_IS_DISABLED() 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 885d24b6f2b..7d6c181a836 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 @@ -19,6 +19,17 @@ namespace SubgraphTestsDefinitions { } } + void DelayedCopyTestBase::LoadNetwork() { + LayerTestsUtils::LayerTestsCommon::LoadNetwork(); + inferRequest = executableNetwork.CreateInferRequest(); + } + + void DelayedCopyTestBase::Infer() { + ConfigureInferRequest(); + inferRequest.Infer(); + } + + void DelayedCopyTestBase::Run() { SKIP_IF_CURRENT_TEST_IS_DISABLED() 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 755478c3d7c..0b8fb586189 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 @@ -254,6 +254,16 @@ namespace SubgraphTestsDefinitions { function = std::make_shared(final_reshape, input_parameter, "PureTI"); } + void MemoryLSTMCellTest::LoadNetwork() { + LayerTestsUtils::LayerTestsCommon::LoadNetwork(); + inferRequest = executableNetwork.CreateInferRequest(); + } + + void MemoryLSTMCellTest::Infer() { + ConfigureInferRequest(); + inferRequest.Infer(); + } + void MemoryLSTMCellTest::Run() { SKIP_IF_CURRENT_TEST_IS_DISABLED() if (transformation != ngraph::helpers::MemoryTransformation::NONE) { 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 56e82d8dbb5..07af3f5b13e 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 @@ -112,6 +112,16 @@ void MemoryEltwiseReshapeConcatTest::initNgraphFriendlyModel() { function = std::make_shared(concat, input_parameter, "memory_multiply_reshape_concat"); } +void MemoryEltwiseReshapeConcatTest::LoadNetwork() { + LayerTestsUtils::LayerTestsCommon::LoadNetwork(); + inferRequest = executableNetwork.CreateInferRequest(); +} + +void MemoryEltwiseReshapeConcatTest::Infer() { + ConfigureInferRequest(); + inferRequest.Infer(); +} + void MemoryEltwiseReshapeConcatTest::Run() { SKIP_IF_CURRENT_TEST_IS_DISABLED() initTestModel(); 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 c09567dff9d..da332ef6217 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 @@ -68,6 +68,16 @@ namespace SubgraphTestsDefinitions { function = std::make_shared(sigm, input, "negative_memory_layer_offset_nonmemory"); } + void NegativeMemoryOffsetTest::LoadNetwork() { + LayerTestsUtils::LayerTestsCommon::LoadNetwork(); + inferRequest = executableNetwork.CreateInferRequest(); + } + + void NegativeMemoryOffsetTest::Infer() { + ConfigureInferRequest(); + inferRequest.Infer(); + } + void NegativeMemoryOffsetTest::Run() { SKIP_IF_CURRENT_TEST_IS_DISABLED()