Some fixes

Author: nshchego

inference-engine/src/mkldnn_plugin/nodes/mkldnn_def_conv_node.cpp

@@ -895,9 +895,10 @@ struct jit_uni_def_conv_kernel_f32 : public jit_uni_def_conv_kernel, public jit_
 
 bool MKLDNNDeformableConvolutionNode::isSupportedOperation(const std::shared_ptr<const ngraph::Node>& op, std::string& errorMessage) noexcept {
     try {
-        const auto defConvNode = ngraph::as_type_ptr<const ngraph::op::v8::DeformableConvolution>(op);
-        if (!defConvNode) {
-            errorMessage = "Node is not an instance of DeformableConvolution form the operation set v8.";
+        if (!one_of(op->get_type_info(),
+                ngraph::op::v1::DeformableConvolution::type_info,
+                ngraph::op::v8::DeformableConvolution::type_info)) {
+            errorMessage = "Node is not an instance of DeformableConvolution form the operation set v1 or v8.";
             return false;
         }
     } catch (...) {
@@ -913,22 +914,28 @@ MKLDNNDeformableConvolutionNode::MKLDNNDeformableConvolutionNode(const std::shar
     if (!isSupportedOperation(op, errorMessage)) {
         IE_THROW(NotImplemented) << errorMessage;
     }
-    auto defConvNode = ngraph::as_type_ptr<const ngraph::op::v8::DeformableConvolution>(op);
+    auto defConvNodeBase = std::dynamic_pointer_cast<ngraph::op::util::DeformableConvolutionBase>(op);
 
-    group = defConvNode->get_group();
-    deformable_group = defConvNode->get_deformable_group();
-    with_bilinear_pad = defConvNode->get_use_bilinear_interpolation_padding();
-    auto& strides = defConvNode->get_strides();
+    group = defConvNodeBase->get_group();
+    deformable_group = defConvNodeBase->get_deformable_group();
+    auto& strides = defConvNodeBase->get_strides();
     for (int i = 0; i < strides.size(); i++) {
         stride.push_back(strides[i]);
     }
 
-    auto& dilations = defConvNode->get_dilations();
+    auto& dilations = defConvNodeBase->get_dilations();
     for (int i = 1; i <= dilations.size(); i++) {
         dilation.push_back(dilations[dilations.size() - i] - 1);
     }
 
-    paddingL = defConvNode->get_pads_begin();
+    paddingL = defConvNodeBase->get_pads_begin();
+
+    if (op->get_type_info() == ngraph::op::v8::DeformableConvolution::type_info) {
+        auto defConvNode = std::dynamic_pointer_cast<ngraph::op::v8::DeformableConvolution>(op);
+        with_bilinear_pad = defConvNode->get_bilinear_interpolation_pad();
+    } else {
+        with_bilinear_pad = false;
+    }
 }
 
 void MKLDNNDeformableConvolutionNode::getSupportedDescriptors() {
@@ -999,7 +1006,17 @@ void MKLDNNDeformableConvolutionNode::initSupportedPrimitiveDescriptors() {
 
         config.inConfs[0].desc = MKLDNNMemoryDesc(getParentEdgeAt(0)->getDims(), memory::data_type::f32, dataFormat);
         config.inConfs[1].desc = MKLDNNMemoryDesc(getParentEdgeAt(1)->getDims(), memory::data_type::f32, offFormat);
-        config.inConfs[2].desc = MKLDNNMemoryDesc(getParentEdgeAt(2)->getDims(), memory::data_type::f32, weiFormat);
+        auto& wDims = getParentEdgeAt(2)->getDims();
+        if (group > 1 && wDims.ndims() != 5) {
+            auto old_dims = wDims.ToSizeVector();
+            auto new_dims = InferenceEngine::SizeVector({group, div_up(old_dims[0], group)});
+            for (int i = 1; i < old_dims.size(); i++) {
+                new_dims.push_back(old_dims[i]);
+            }
+            config.inConfs[2].desc = MKLDNNMemoryDesc(MKLDNNDims(new_dims), memory::data_type::f32, weiFormat);
+        } else {
+            config.inConfs[2].desc = MKLDNNMemoryDesc(getParentEdgeAt(2)->getDims(), memory::data_type::f32, weiFormat);
+        }
         if (inputsNumber > 3) {
             config.inConfs[3].desc = MKLDNNMemoryDesc(getParentEdgeAt(3)->getDims(), memory::data_type::f32, memory::format_tag::nchw);
         }

inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/deformable_convolution.cpp

@@ -103,13 +103,18 @@ const std::vector<size_t> single_deform_groups = {3};
 
 const auto deformableConv2DParams_SingleTestCase = ::testing::Combine(
     ::testing::ValuesIn(single_deform_vals),
-    ::testing::ValuesIn(single_kernel), ::testing::ValuesIn(strides),
-    ::testing::ValuesIn(padBegins), ::testing::ValuesIn(padEnds),
-    ::testing::ValuesIn(dilations), ::testing::ValuesIn(groups),
-    ::testing::ValuesIn(single_deform_groups), ::testing::ValuesIn(numOutChannels),
+    ::testing::ValuesIn(single_kernel),
+    ::testing::ValuesIn(strides),
+    ::testing::ValuesIn(padBegins),
+    ::testing::ValuesIn(padEnds),
+    ::testing::ValuesIn(dilations),
+    ::testing::ValuesIn(groups),
+    ::testing::ValuesIn(single_deform_groups),
+    ::testing::ValuesIn(numOutChannels),
     ::testing::Values(ngraph::op::PadType::EXPLICIT),
     ::testing::ValuesIn(with_bilinear_interpolation_pad),
-    ::testing::ValuesIn(with_modulated_scalar));
+    ::testing::ValuesIn(with_modulated_scalar)
+);
 
 INSTANTIATE_TEST_SUITE_P(
     smoke_DeformableConvolution2D_SingleTestCase, DeformableConvolutionLayerTest,