From 0d288552622774c17bfe0c316710fefd3c495e93 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Tue, 25 May 2021 13:03:11 +0300 Subject: [PATCH 1/5] Corrected tests to match CVS-53713 --- .../tests/functional/CMakeLists.txt | 2 +- .../tests/functional/core_config.cpp | 3 +- .../behavior/caching_tests.cpp | 23 ++- .../behavior/config.cpp | 37 ++-- .../behavior/core_integration.cpp | 122 ++++++++---- .../behavior/cpp_holders.cpp | 32 ++- .../behavior/exec_graph_info.cpp | 19 +- .../behavior/infer_request.cpp | 19 +- .../behavior/infer_request_callback.cpp | 21 +- .../behavior/infer_request_config.cpp | 19 +- .../behavior/infer_request_input.cpp | 19 +- .../behavior/infer_request_output.cpp | 19 +- .../behavior/layout.cpp | 31 ++- .../behavior/preprocessing.cpp | 33 ++-- .../behavior/set_preprocess.cpp | 77 ++++++-- .../behavior/test_plugin.cpp | 27 ++- .../behavior/version.cpp | 10 +- .../hetero/query_network.cpp | 8 +- .../hetero/synthetic.cpp | 13 +- .../single_layer_tests/convolution.cpp | 145 +++++++++----- .../single_layer_tests/reshape.cpp | 43 ++-- .../single_layer_tests/softmax.cpp | 55 ++++-- .../single_layer_tests/split.cpp | 19 +- .../tests/functional/skip_tests_config.cpp | 6 +- .../transformations/preprocessing.cpp | 2 + .../template_transformations_test.cpp | 20 +- .../interface/ie_iinfer_request_internal.cpp | 7 + .../behavior/set_preprocess.cpp | 56 ++++++ .../skip_tests_config.cpp | 1 + .../behavior/set_preprocess.cpp | 14 ++ .../behavior/set_preprocess.cpp | 15 ++ .../include/behavior/set_preprocess.hpp | 185 ++++++++++++++++-- 32 files changed, 812 insertions(+), 290 deletions(-) diff --git a/docs/template_plugin/tests/functional/CMakeLists.txt b/docs/template_plugin/tests/functional/CMakeLists.txt index 96ab3fdcbe41a7..a2962cea0ae2c6 100644 --- a/docs/template_plugin/tests/functional/CMakeLists.txt +++ b/docs/template_plugin/tests/functional/CMakeLists.txt @@ -14,7 +14,7 @@ addIeTargetTest( IE::funcSharedTests INCLUDES "${IE_MAIN_TEMPLATE_PLUGIN_SOURCE_DIR}/include" - ADD_CLANG_FORMAT + ADD_CPPLINT LABELS TEMPLATE ) diff --git a/docs/template_plugin/tests/functional/core_config.cpp b/docs/template_plugin/tests/functional/core_config.cpp index 6c70d61d35a113..e75091f571fa70 100644 --- a/docs/template_plugin/tests/functional/core_config.cpp +++ b/docs/template_plugin/tests/functional/core_config.cpp @@ -4,4 +4,5 @@ #include "functional_test_utils/core_config.hpp" -void CoreConfiguration(LayerTestsUtils::LayerTestsCommon* test) {} +void CoreConfiguration(LayerTestsUtils::LayerTestsCommon* test) { +} diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/caching_tests.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/caching_tests.cpp index 547c073ddbc8c0..f61e4c54d7ec81 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/caching_tests.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/caching_tests.cpp @@ -7,14 +7,19 @@ using namespace LayerTestsDefinitions; namespace { -static const std::vector precisionsTemplate = { - ngraph::element::f32, -}; + static const std::vector precisionsTemplate = { + ngraph::element::f32, + }; -static const std::vector batchSizesTemplate = {1, 2}; + static const std::vector batchSizesTemplate = { + 1, 2 + }; -INSTANTIATE_TEST_CASE_P(smoke_CachingSupportCase_Template, LoadNetworkCacheTestBase, - ::testing::Combine(::testing::ValuesIn(LoadNetworkCacheTestBase::getStandardFunctions()), ::testing::ValuesIn(precisionsTemplate), - ::testing::ValuesIn(batchSizesTemplate), ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE)), - LoadNetworkCacheTestBase::getTestCaseName); -} // namespace + INSTANTIATE_TEST_CASE_P(smoke_CachingSupportCase_Template, LoadNetworkCacheTestBase, + ::testing::Combine( + ::testing::ValuesIn(LoadNetworkCacheTestBase::getStandardFunctions()), + ::testing::ValuesIn(precisionsTemplate), + ::testing::ValuesIn(batchSizesTemplate), + ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE)), + LoadNetworkCacheTestBase::getTestCaseName); +} // namespace diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/config.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/config.cpp index 3a832a5dd040be..e10f8d64c688af 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/config.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/config.cpp @@ -2,17 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "behavior/config.hpp" +#include "multi-device/multi_device_config.hpp" +#include "behavior/config.hpp" #include