Added support for opset7::Gather (opencv#126)

Author: terfendail

modules/arm_plugin/src/arm_converter/arm_converter.cpp

@@ -114,6 +114,7 @@ Converter::Converter(const std::shared_ptr<const ngraph::Function> function, boo
         Register<opset::Concat>();
         Register<opset::Transpose>();
         Register<opset::StridedSlice>();
+        Register<opset::Gather>();
         Register<ngraph::op::v1::Gather>();
         Register<opset::ROIPooling>();
         Register<opset::PSROIPooling>();

modules/arm_plugin/src/arm_converter/arm_converter_gather.cpp

@@ -8,6 +8,25 @@
 #include "arm_converter/arm_converter.hpp"
 
 namespace ArmPlugin {
+template <> Converter::Conversion::Ptr Converter::Convert(const opset::Gather& node) {
+    auto make = [&] (auto refFunction) {
+        return this->MakeConversion(refFunction,
+                                    node.input(0),
+                                    node.input(1),
+                                    node.output(0),
+                                    node.get_input_shape(0),
+                                    node.get_input_shape(1),
+                                    node.get_output_shape(0),
+                                    static_cast<size_t>(node.get_axis()),
+                                    static_cast<size_t>(node.get_batch_dims()));
+    };
+
+    return CallSwitch(
+        AP_WRAP(make, ngraph::runtime::reference::gather),
+        node.input(0), allTypes,
+        node.input(1), indexTypes);
+}
+
 template <> Converter::Conversion::Ptr Converter::Convert(const ngraph::op::v1::Gather& node) {
     auto make = [&] (auto refFunction) {
         return this->MakeConversion(refFunction,

modules/arm_plugin/tests/functional/shared_tests_instances/single_layer_tests/gather.cpp

@@ -118,4 +118,34 @@ const auto params_ref = testing::Combine(
 );
 
 INSTANTIATE_TEST_CASE_P(smoke_Gather_refernce, GatherLayerTest, params_ref, GatherLayerTest::getTestCaseName);
+
+const std::vector<std::vector<size_t>> indicesShapes5 = {
+        std::vector<size_t>{10, 4},
+        std::vector<size_t>{10, 20, 5},
+};
+
+const std::vector< std::tuple<int, int> > axes_batches = {
+        std::tuple<int, int>(0, 0),
+        std::tuple<int, int>(1, 0),
+        std::tuple<int, int>(2, 0),
+        std::tuple<int, int>(3, 0),
+        std::tuple<int, int>(-1, 0),
+        std::tuple<int, int>(-2, 0),
+        std::tuple<int, int>(1, 1),
+        std::tuple<int, int>(-1, 1),
+};
+
+const auto params_g7 = testing::Combine(
+        testing::ValuesIn(inputShapes),
+        testing::ValuesIn(indicesShapes5),
+        testing::ValuesIn(axes_batches),
+        testing::ValuesIn(netPrecisions),
+        testing::Values(InferenceEngine::Precision::UNSPECIFIED),
+        testing::Values(InferenceEngine::Precision::UNSPECIFIED),
+        testing::Values(InferenceEngine::Layout::ANY),
+        testing::Values(InferenceEngine::Layout::ANY),
+        testing::Values(CommonTestUtils::DEVICE_CPU)
+);
+
+INSTANTIATE_TEST_CASE_P(smoke_V7Gather4, Gather7LayerTest, params_g7, Gather7LayerTest::getTestCaseName);
 }  // namespace