From e932a2eda5ffec2450ba0cd361368993d887b95d Mon Sep 17 00:00:00 2001 From: Mikhail Kozlov Date: Tue, 28 Sep 2021 17:20:04 +0300 Subject: [PATCH] Add virtual inheritance to shared tests (#7649) --- .../include/base/import_export_base/import_export_base.hpp | 2 +- .../plugin/shared/include/behavior/caching_tests.hpp | 2 +- .../plugin/shared/include/behavior/preprocessing.hpp | 2 +- .../shared/include/configuration_tests/dynamic_batch.hpp | 2 +- .../include/shared_test_classes/single_layer/batch_norm.hpp | 2 +- .../shared_test_classes/single_layer/variadic_split.hpp | 2 +- .../include/shared_test_classes/subgraph/basic_lstm.hpp | 2 +- .../concat_quantization_during_memory_requantization.hpp | 2 +- .../subgraph/const_strided_slice_concat.hpp | 2 +- .../shared_test_classes/subgraph/delayed_copy_layer.hpp | 2 +- .../include/shared_test_classes/subgraph/fc_conv_fc.hpp | 6 +++--- .../subgraph/memory_eltwise_reshape_concat.hpp | 2 +- .../shared_test_classes/subgraph/multiple_LSTMCell.hpp | 2 +- .../include/shared_test_classes/subgraph/multiply_add.hpp | 2 +- .../subgraph/negative_memory_layer_offset.hpp | 2 +- .../shared_test_classes/subgraph/stridedslice_conv.hpp | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/inference-engine/tests/functional/plugin/shared/include/base/import_export_base/import_export_base.hpp b/inference-engine/tests/functional/plugin/shared/include/base/import_export_base/import_export_base.hpp index da62acf4bb5..8795dced06f 100644 --- a/inference-engine/tests/functional/plugin/shared/include/base/import_export_base/import_export_base.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/base/import_export_base/import_export_base.hpp @@ -19,7 +19,7 @@ typedef std::tuple< namespace FuncTestUtils { class ImportNetworkTestBase : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { + virtual public LayerTestsUtils::LayerTestsCommon { public: static std::string getTestCaseName(testing::TestParamInfo obj); void Run() override; diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/caching_tests.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/caching_tests.hpp index c5c4d3178d5..324053d1ee2 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/caching_tests.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/caching_tests.hpp @@ -26,7 +26,7 @@ using loadNetworkCacheParams = std::tuple< namespace LayerTestsDefinitions { class LoadNetworkCacheTestBase : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { + virtual public LayerTestsUtils::LayerTestsCommon { std::string m_cacheFolderName; std::string m_functionName; ngraph::element::Type m_precision; diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/preprocessing.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/preprocessing.hpp index 1733398a7cd..7e8912f9b9b 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/preprocessing.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/preprocessing.hpp @@ -25,7 +25,7 @@ using PreprocessingPrecisionConvertParams = std::tuple< struct PreprocessingPrecisionConvertTest : public testing::WithParamInterface, - LayerTestsUtils::LayerTestsCommon { + virtual public LayerTestsUtils::LayerTestsCommon { public: static std::string getTestCaseName(testing::TestParamInfo obj) { InferenceEngine::Precision inPrc; diff --git a/inference-engine/tests/functional/plugin/shared/include/configuration_tests/dynamic_batch.hpp b/inference-engine/tests/functional/plugin/shared/include/configuration_tests/dynamic_batch.hpp index 0153d6486eb..dd7c8dad640 100644 --- a/inference-engine/tests/functional/plugin/shared/include/configuration_tests/dynamic_batch.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/configuration_tests/dynamic_batch.hpp @@ -20,7 +20,7 @@ typedef std::tuple< std::map // Additional configuration > dynamicBatchTestParams; -class DynamicBatchTest : public LayerTestsUtils::LayerTestsCommon, +class DynamicBatchTest : virtual public LayerTestsUtils::LayerTestsCommon, public testing::WithParamInterface { private: bool run_async = false; diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/batch_norm.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/batch_norm.hpp index a2479e746e4..717db5d01f5 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/batch_norm.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/batch_norm.hpp @@ -20,7 +20,7 @@ typedef std::tuple< > BatchNormLayerTestParams; class BatchNormLayerTest : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { + virtual public LayerTestsUtils::LayerTestsCommon { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/variadic_split.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/variadic_split.hpp index 02f40f99077..5c43557904b 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/variadic_split.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/variadic_split.hpp @@ -27,7 +27,7 @@ typedef std::tuple< > VariadicSplitParams; class VariadicSplitLayerTest : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { + virtual public LayerTestsUtils::LayerTestsCommon { public: static std::string getTestCaseName(testing::TestParamInfo obj); 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 39c7ac71f35..e1c2052ac5e 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 @@ -24,7 +24,7 @@ typedef std::tuple< > basicLstmParams; class Basic_LSTM_S : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { + virtual public LayerTestsUtils::LayerTestsCommon { public: static std::string getTestCaseName(testing::TestParamInfo obj); 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 c9ae8ef7bed..aac9e3f6c60 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 @@ -25,7 +25,7 @@ typedef std::tuple< class ConcatQuantDuringMemoryRequantTest : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { + virtual public LayerTestsUtils::LayerTestsCommon { private: void switchToNgraphFriendlyModel(); std::vector memory_1_init; diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/const_strided_slice_concat.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/const_strided_slice_concat.hpp index cc24702e1cf..711c4944035 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/const_strided_slice_concat.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/const_strided_slice_concat.hpp @@ -27,7 +27,7 @@ typedef std::tuple< > ConstStridedSliceConcatParams; class ConstStridedSliceConcatTest : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { + virtual public LayerTestsUtils::LayerTestsCommon { public: static std::string getTestCaseName(testing::TestParamInfo obj); InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; 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 b590ecc4dc1..6cb8c1d0100 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 @@ -23,7 +23,7 @@ typedef std::tuple< class DelayedCopyTest : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { + virtual public LayerTestsUtils::LayerTestsCommon { private: void switchToNgraphFriendlyModel(); public: diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/fc_conv_fc.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/fc_conv_fc.hpp index b3c99dac2ad..1950dd8a543 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/fc_conv_fc.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/fc_conv_fc.hpp @@ -31,7 +31,7 @@ typedef std::tuple< > FcConvFcParams; class FcAfterConvTest : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { + virtual public LayerTestsUtils::LayerTestsCommon { public: static std::string getTestCaseName(testing::TestParamInfo obj); InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; @@ -41,7 +41,7 @@ protected: }; class FcBeforeConvTest : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { + virtual public LayerTestsUtils::LayerTestsCommon { public: static std::string getTestCaseName(testing::TestParamInfo obj); InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; @@ -51,7 +51,7 @@ protected: }; class FcBetweenConvsTest : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { + virtual public LayerTestsUtils::LayerTestsCommon { public: static std::string getTestCaseName(testing::TestParamInfo obj); InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; 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 2c8d9cc389b..19c3f3ff5fc 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 @@ -17,7 +17,7 @@ typedef std::tuple< std::map // Configuration > memoryEltwiseReshapeConcatParams; -class MemoryEltwiseReshapeConcatTest : public LayerTestsUtils::LayerTestsCommon, +class MemoryEltwiseReshapeConcatTest : virtual public LayerTestsUtils::LayerTestsCommon, public testing::WithParamInterface { private: void initTestModel(); diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiple_LSTMCell.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiple_LSTMCell.hpp index 7932ba39a07..c0d92891780 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiple_LSTMCell.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiple_LSTMCell.hpp @@ -18,7 +18,7 @@ typedef std::tuple< std::map // Configuration > multipleLSTMCellParams; -class MultipleLSTMCellTest : public LayerTestsUtils::LayerTestsCommon, +class MultipleLSTMCellTest : virtual public LayerTestsUtils::LayerTestsCommon, public testing::WithParamInterface { private: // you have to Unroll TI manually and remove memory untill ngraph supports it diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiply_add.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiply_add.hpp index 3644d7e2678..a8f2930dbc5 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiply_add.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiply_add.hpp @@ -22,7 +22,7 @@ using MultiplyAddParamsTuple = typename std::tuple< class MultiplyAddLayerTest: public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon{ + virtual public LayerTestsUtils::LayerTestsCommon{ public: std::shared_ptr fn; 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 affa94180e2..0bb41184f77 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 @@ -25,7 +25,7 @@ typedef std::tuple< class NegativeMemoryOffsetTest : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { + virtual public LayerTestsUtils::LayerTestsCommon { private: void switchToNgraphFriendlyModel(); std::vector memory_init; diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/stridedslice_conv.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/stridedslice_conv.hpp index c4212667ea7..1ec99862f96 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/stridedslice_conv.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/stridedslice_conv.hpp @@ -30,7 +30,7 @@ typedef std::tuple< > SliceConvParams; class SliceConvTest : public testing::WithParamInterface, - public LayerTestsUtils::LayerTestsCommon { + virtual public LayerTestsUtils::LayerTestsCommon { public: static std::string getTestCaseName(testing::TestParamInfo obj); InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override;