From 843f81a1ccd8f4db19a51edb086571f72bc36404 Mon Sep 17 00:00:00 2001 From: Evgeny Talanin Date: Thu, 18 Jun 2020 13:57:21 +0300 Subject: [PATCH] [IE TESTS] disable Some myriad tests on Win (#763) (#988) * [IE TESTS] disable Some myriad tests on Windisable Some myriad tests on Win * Skip test with todo Co-authored-by: Irina Efode --- .../shared_tests_instances/skip_tests_config.cpp | 4 ++++ .../functional/shared_tests/ie_class/ie_class.hpp | 7 +++++++ .../common/layers/myriad_layers_CTCDecoder_test.hpp | 2 ++ .../common/layers/myriad_layers_proposal_test.cpp | 11 ++++++----- .../vpu/myriad_tests/vpu_tests_config.cpp | 13 ++++++++++++- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/skip_tests_config.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/skip_tests_config.cpp index f143f552fa6..339322b2c76 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/skip_tests_config.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/skip_tests_config.cpp @@ -18,5 +18,9 @@ std::vector disabledTestPatterns() { ".*Behavior.*ExecGraphTests.*", // TODO: Issue: 26268 ".*ConcatLayerTest.*axis=0.*", +#if defined(_WIN32) || defined(_WIN64) + //TODO: Issue: 33722 + ".*DynamicTranspose.*NonZero_Transpose.*", +#endif }; } diff --git a/inference-engine/tests_deprecated/functional/shared_tests/ie_class/ie_class.hpp b/inference-engine/tests_deprecated/functional/shared_tests/ie_class/ie_class.hpp index 52fd8e25def..8d227d2d062 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/ie_class/ie_class.hpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/ie_class/ie_class.hpp @@ -178,6 +178,13 @@ TEST_F(IEClassBasicTest, smoke_createMockEngineConfigThrows) { #ifdef ENABLE_UNICODE_PATH_SUPPORT TEST_P(IEClassBasicTestP, smoke_registerPluginsXMLUnicodePath) { +// TODO: Issue: 31197 Remove this code +#if defined(_WIN32) || defined(_WIN64) + if (deviceName == CommonTestUtils::DEVICE_MYRIAD) { + GTEST_SKIP(); + } +#endif + std::string pluginXML = TestDataHelpers::get_data_path() + "/ie_class/mock_engine_valid.xml"; for (std::size_t testIndex = 0; testIndex < CommonTestUtils::test_unicode_postfix_vector.size(); testIndex++) { diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_CTCDecoder_test.hpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_CTCDecoder_test.hpp index 69a4d79d47a..ee7cc3895dd 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_CTCDecoder_test.hpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_CTCDecoder_test.hpp @@ -3,6 +3,7 @@ // #include +#include #include "myriad_layers_tests.hpp" using namespace InferenceEngine; @@ -84,6 +85,7 @@ void refCTCDecoder(const Blob::Ptr src, const Blob::Ptr seq_ind, Blob::Ptr dst) } TEST_P(myriadCTCDecoderLayerTests_smoke, CTCGreedyDecoder) { + SKIP_IF_CURRENT_TEST_IS_DISABLED() const tensor_test_params dims = std::get<0>(GetParam()); const bool hwOptimization = std::get<1>(GetParam()); _irVersion = std::get<2>(GetParam()); diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_proposal_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_proposal_test.cpp index 9844cee0c95..ef75f2dd544 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_proposal_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_proposal_test.cpp @@ -6,6 +6,7 @@ #include #include "myriad_layers_tests.hpp" #include +#include using namespace InferenceEngine; @@ -278,7 +279,7 @@ std::string caffeModel() { } TEST_F(myriadLayersTestsProposal_smoke, Caffe) { - + SKIP_IF_CURRENT_TEST_IS_DISABLED(); // Verify only 20 ranked proposal output with GT values std::vector gt_values = { 0.f, 72.363f, 58.942f, 197.141f, 177.96f, // batch_num, left, top, right, bottom @@ -314,7 +315,7 @@ TEST_F(myriadLayersTestsProposal_smoke, Caffe) { } TEST_F(myriadLayersTestsProposal_smoke, CaffeNoClipBeforeNms) { - + SKIP_IF_CURRENT_TEST_IS_DISABLED(); // Verify only 20 ranked proposal output with GT values - reference get from MKLDNN plugin std::vector gt_values = { 0, 72.408f, 58.925f, 197.062f, 177.856f, @@ -353,7 +354,7 @@ TEST_F(myriadLayersTestsProposal_smoke, CaffeNoClipBeforeNms) { } TEST_F(myriadLayersTestsProposal_smoke, CaffeClipAfterNms) { - + SKIP_IF_CURRENT_TEST_IS_DISABLED(); // Verify only 20 ranked proposal output with GT values std::vector gt_values = { 0, 72.408f, 58.925f, 197.062f, 177.856f, @@ -395,7 +396,7 @@ TEST_F(myriadLayersTestsProposal_smoke, CaffeClipAfterNms) { } TEST_F(myriadLayersTestsProposal_smoke, CaffeNormalizedOutput) { - + SKIP_IF_CURRENT_TEST_IS_DISABLED(); // Verify only 20 ranked proposal output with GT values std::vector gt_values = { 0, 0.323f, 0.263f, 0.879f, 0.794f, @@ -437,7 +438,7 @@ TEST_F(myriadLayersTestsProposal_smoke, CaffeNormalizedOutput) { } TEST_F(myriadLayersTestsProposal_smoke, TensorFlow) { - + SKIP_IF_CURRENT_TEST_IS_DISABLED(); model = R"V0G0N( diff --git a/inference-engine/tests_deprecated/functional/vpu/myriad_tests/vpu_tests_config.cpp b/inference-engine/tests_deprecated/functional/vpu/myriad_tests/vpu_tests_config.cpp index 1d070c68b7a..32b3047fc1b 100644 --- a/inference-engine/tests_deprecated/functional/vpu/myriad_tests/vpu_tests_config.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/myriad_tests/vpu_tests_config.cpp @@ -18,7 +18,18 @@ bool deviceForceReset() { return true; } } // namespace tests } // namespace vpu + std::vector disabledTestPatterns() { return { + #if defined(_WIN32) || defined(_WIN64) + // TODO: Issue 31197 + R"(.*(IEClassBasicTestP).*smoke_registerPluginsXMLUnicodePath.*)", + R"(.*(myriadLayersTestsProposal_smoke).*Caffe.*)", + R"(.*(myriadLayersTestsProposal_smoke).*CaffeNoClipBeforeNms.*)", + R"(.*(myriadLayersTestsProposal_smoke).*CaffeClipAfterNms.*)", + R"(.*(myriadLayersTestsProposal_smoke).*CaffeNormalizedOutput.*)", + R"(.*(myriadLayersTestsProposal_smoke).*TensorFlow.*)", + R"(.*(myriadCTCDecoderLayerTests_smoke).*CTCGreedyDecoder.*)", + #endif }; -} \ No newline at end of file +}