review corrections

openvinotoolkit · May 19, 2021 · 6e80629 · 6e80629
1 parent 0069bfe
commit 6e80629
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/inference-engine/src/vpu/graph_transformer/src/stages/interpolate.cpp b/inference-engine/src/vpu/graph_transformer/src/stages/interpolate.cpp
@@ -61,8 +61,10 @@ void FrontEnd::parseInterpolate(const Model& model, const ie::CNNLayerPtr& _laye
                                  interpolateModeIt->second == InterpolateMode::LinearOnnx;
     VPU_THROW_UNLESS(modeIsSupported, "Current Interpolate supports 'nearest' and 'linear' modes only, actual {}", interpolateMode);
 
-    const auto paramIsSupported = ic == oc && isPadZeros(padsBegin) && isPadZeros(padsEnd);
-    VPU_THROW_UNLESS(paramIsSupported, "Current Interpolate does not support paddings, and resize by channels");
+    auto paramIsSupported = ic == oc;
+    VPU_THROW_UNLESS(paramIsSupported, "Current Interpolate does not support resize by channels");
+    paramIsSupported = isPadZeros(padsBegin) && isPadZeros(padsEnd);
+    VPU_THROW_UNLESS(paramIsSupported, "Current Interpolate does not support paddings");
 
     if (interpolateModeIt->second == InterpolateMode::Nearest) {
         // current "Resample" supports the following "Interpolate" modes only:

diff --git a/.../tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/interpolate.cpp b/.../tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/interpolate.cpp
@@ -52,6 +52,15 @@ const std::vector<std::vector<size_t>> targetShapes2x = {
         {5, 19, 37 * 2, 37 * 2},
 };
 
+const std::vector<std::vector<size_t>> inShapesNoBatch = {
+        {1, 8, 38, 38},
+        {1, 8, 36, 36},
+};
+
+const std::vector<std::vector<size_t>> targetShapesNoBatch = {
+        {1, 8, 38 * 2, 38 * 2},
+        {1, 8, 70, 70},  // * 1.94
+};
 
 const std::vector<ngraph::op::v4::Interpolate::InterpolateMode> modesWithoutNearest = {
         ngraph::op::v4::Interpolate::InterpolateMode::linear,
@@ -185,6 +194,32 @@ INSTANTIATE_TEST_CASE_P(smoke_Interpolate_nearest_mode_2x, InterpolateLayerTest,
         ::testing::Values(Config{{InferenceEngine::MYRIAD_DETECT_NETWORK_BATCH, CONFIG_VALUE(NO)}})),
     InterpolateLayerTest::getTestCaseName);
 
+INSTANTIATE_TEST_CASE_P(smoke_Interpolate_nearest_mode_no_batch, InterpolateLayerTest, ::testing::Combine(
+        interpolateCasesNearestMode,
+        ::testing::ValuesIn(netPrecisions),
+        ::testing::Values(InferenceEngine::Precision::UNSPECIFIED),
+        ::testing::Values(InferenceEngine::Precision::UNSPECIFIED),
+        ::testing::Values(InferenceEngine::Layout::ANY),
+        ::testing::Values(InferenceEngine::Layout::ANY),
+        ::testing::ValuesIn(inShapesNoBatch),
+        ::testing::ValuesIn(targetShapesNoBatch),
+        ::testing::Values(CommonTestUtils::DEVICE_MYRIAD),
+        ::testing::Values(Config{{InferenceEngine::MYRIAD_DETECT_NETWORK_BATCH, CONFIG_VALUE(NO)}})),
+    InterpolateLayerTest::getTestCaseName);
+
+INSTANTIATE_TEST_CASE_P(smoke_Interpolate_without_nearest_mode_no_batch, InterpolateLayerTest, ::testing::Combine(
+        interpolateCasesWithoutNearestMode,
+        ::testing::ValuesIn(netPrecisions),
+        ::testing::Values(InferenceEngine::Precision::UNSPECIFIED),
+        ::testing::Values(InferenceEngine::Precision::UNSPECIFIED),
+        ::testing::Values(InferenceEngine::Layout::ANY),
+        ::testing::Values(InferenceEngine::Layout::ANY),
+        ::testing::ValuesIn(inShapesNoBatch),
+        ::testing::ValuesIn(targetShapesNoBatch),
+        ::testing::Values(CommonTestUtils::DEVICE_MYRIAD),
+        ::testing::Values(Config{{InferenceEngine::MYRIAD_DETECT_NETWORK_BATCH, CONFIG_VALUE(NO)}})),
+    InterpolateLayerTest::getTestCaseName);
+
 INSTANTIATE_TEST_CASE_P(smoke_Interpolate_nearest_mode, InterpolateLayerTest, ::testing::Combine(
         interpolateCasesNearestMode,
         ::testing::ValuesIn(netPrecisions),