Fixed MYRIAD tests compilation on Windows

openvinotoolkit · May 27, 2021 · 1d43809 · 1d43809
1 parent b506e08
commit 1d43809
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/...rence-engine/tests/functional/plugin/myriad/ngraph/conversions/dynamic_shape_resolver.cpp b/...rence-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
@@ -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<std::map<std::string, std::string>> 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<std::map<std::string, std::string>> 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/...e/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_config.cpp b/...e/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<std::map<std::string, std::string>> 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,