From 1d43809b7de3fed08c175ef84b1ae483b6b2bb00 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Thu, 27 May 2021 10:31:13 +0300 Subject: [PATCH] Fixed MYRIAD tests compilation on Windows --- .../myriad/ngraph/conversions/dynamic_shape_resolver.cpp | 4 ++++ .../myriad/shared_tests_instances/behavior/config.cpp | 8 ++++++++ .../behavior/infer_request_config.cpp | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/conversions/dynamic_shape_resolver.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/conversions/dynamic_shape_resolver.cpp index da03622916badd..5487dcfefbcdd0 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/conversions/dynamic_shape_resolver.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/conversions/dynamic_shape_resolver.cpp @@ -36,9 +36,11 @@ class DynamicShapeResolverTests : public CommonTestUtils::TestsCommon { } protected: + IE_SUPPRESS_DEPRECATED_START InferenceEngine::CNNLayerPtr getDynamicShapeResolverLayer() const { return CommonTestUtils::getLayerByName(cnnNetwork, s_FriendlyName); } + IE_SUPPRESS_DEPRECATED_END InferenceEngine::CNNNetwork cnnNetwork; private: @@ -59,10 +61,12 @@ TEST_F(DynamicShapeResolverTests, smoke_NGraphFunctionCanBeConvertedToCNNNetwork ASSERT_EQ(cnnNetwork.layerCount(), cnnNetwork.getInputsInfo().size() + 1); ASSERT_EQ(cnnNetwork.getOutputsInfo().size(), 1); + IE_SUPPRESS_DEPRECATED_START const auto dynamicShapeResolver = getDynamicShapeResolverLayer(); ASSERT_EQ(dynamicShapeResolver->type, "DynamicShapeResolver"); ASSERT_EQ(dynamicShapeResolver->insData.size(), 2); ASSERT_EQ(dynamicShapeResolver->outData.size(), 1); + IE_SUPPRESS_DEPRECATED_END } } // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/config.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/config.cpp index a5015b4a3210b1..afc40c8e3d47a6 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/config.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/config.cpp @@ -45,6 +45,7 @@ namespace { {{InferenceEngine::MYRIAD_ENABLE_WEIGHTS_ANALYSIS, CONFIG_VALUE(NO)}}, // Deprecated + IE_SUPPRESS_DEPRECATED_START {{VPU_MYRIAD_CONFIG_KEY(FORCE_RESET), CONFIG_VALUE(YES)}}, {{VPU_MYRIAD_CONFIG_KEY(FORCE_RESET), CONFIG_VALUE(NO)}}, @@ -59,6 +60,7 @@ namespace { {{VPU_MYRIAD_CONFIG_KEY(PLATFORM), VPU_MYRIAD_CONFIG_VALUE(2450)}}, {{VPU_MYRIAD_CONFIG_KEY(PLATFORM), VPU_MYRIAD_CONFIG_VALUE(2480)}} + IE_SUPPRESS_DEPRECATED_END }; const std::vector> MultiConfigs = { @@ -68,8 +70,10 @@ namespace { {InferenceEngine::MYRIAD_ENABLE_HW_ACCELERATION, CONFIG_VALUE(YES)}}, // Deprecated + IE_SUPPRESS_DEPRECATED_START {{InferenceEngine::MultiDeviceConfigParams::KEY_MULTI_DEVICE_PRIORITIES, CommonTestUtils::DEVICE_MYRIAD}, {VPU_CONFIG_KEY(HW_STAGES_OPTIMIZATION), CONFIG_VALUE(YES)}} + IE_SUPPRESS_DEPRECATED_END }; INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, CorrectConfigTests, @@ -110,6 +114,7 @@ namespace { {{InferenceEngine::MYRIAD_ENABLE_WEIGHTS_ANALYSIS, "OFF"}}, // Deprecated + IE_SUPPRESS_DEPRECATED_START {{VPU_MYRIAD_CONFIG_KEY(PROTOCOL), "BLUETOOTH"}}, {{VPU_MYRIAD_CONFIG_KEY(PROTOCOL), "LAN"}}, @@ -125,6 +130,7 @@ namespace { {{VPU_MYRIAD_CONFIG_KEY(PLATFORM), "-1"}}, {{VPU_MYRIAD_CONFIG_KEY(PLATFORM), "0"}}, {{VPU_MYRIAD_CONFIG_KEY(PLATFORM), "1"}}, + IE_SUPPRESS_DEPRECATED_END }; const std::vector> multiinconfigs = { @@ -134,6 +140,7 @@ namespace { {CONFIG_KEY(LOG_LEVEL), "VERBOSE"}}, // Deprecated + IE_SUPPRESS_DEPRECATED_START {{InferenceEngine::MultiDeviceConfigParams::KEY_MULTI_DEVICE_PRIORITIES, CommonTestUtils::DEVICE_MYRIAD}, {VPU_CONFIG_KEY(HW_STAGES_OPTIMIZATION), "ON"}}, @@ -143,6 +150,7 @@ namespace { {VPU_MYRIAD_CONFIG_KEY(PLATFORM), "0"}}, {{InferenceEngine::MultiDeviceConfigParams::KEY_MULTI_DEVICE_PRIORITIES, CommonTestUtils::DEVICE_MYRIAD}, {VPU_MYRIAD_CONFIG_KEY(PLATFORM), "1"}}, + IE_SUPPRESS_DEPRECATED_END }; INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, IncorrectConfigTests, diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_config.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_config.cpp index a9085f57e09764..280ec50bff361b 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_config.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_config.cpp @@ -54,6 +54,7 @@ namespace { {{InferenceEngine::MYRIAD_ENABLE_WEIGHTS_ANALYSIS, CONFIG_VALUE(NO)}}, // Deprecated + IE_SUPPRESS_DEPRECATED_START {{VPU_MYRIAD_CONFIG_KEY(FORCE_RESET), CONFIG_VALUE(YES)}}, {{VPU_MYRIAD_CONFIG_KEY(FORCE_RESET), CONFIG_VALUE(NO)}}, @@ -62,6 +63,7 @@ namespace { {{VPU_CONFIG_KEY(PRINT_RECEIVE_TENSOR_TIME), CONFIG_VALUE(YES)}}, {{VPU_CONFIG_KEY(PRINT_RECEIVE_TENSOR_TIME), CONFIG_VALUE(NO)}}, + IE_SUPPRESS_DEPRECATED_END }; const std::vector> inferMultiConfigs = { @@ -71,8 +73,10 @@ namespace { {InferenceEngine::MYRIAD_ENABLE_HW_ACCELERATION, CONFIG_VALUE(YES)}}, // Deprecated + IE_SUPPRESS_DEPRECATED_START {{InferenceEngine::MultiDeviceConfigParams::KEY_MULTI_DEVICE_PRIORITIES, CommonTestUtils::DEVICE_MYRIAD}, {VPU_CONFIG_KEY(HW_STAGES_OPTIMIZATION), CONFIG_VALUE(YES)}}, + IE_SUPPRESS_DEPRECATED_END }; INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferConfigTests,