Some more fixes

mikhail-treskin · Sep 10, 2020 · 167073f · 167073f
1 parent f647cda
commit 167073f
Show file tree

Hide file tree

Showing 12 changed files with 498 additions and 208 deletions.
diff --git a/...sts/functional/plugin/cpu/shared_tests_instances/single_layer_tests/group_convolution.cpp b/...sts/functional/plugin/cpu/shared_tests_instances/single_layer_tests/group_convolution.cpp
@@ -49,7 +49,7 @@ INSTANTIATE_TEST_CASE_P(GroupConvolution2D_ExplicitPadding, GroupConvolutionLaye
                         ::testing::Combine(
                                 groupConv2DParams_ExplicitPadding,
                                 ::testing::ValuesIn(netPrecisions),
-                                ::testing::Values(std::vector<size_t >({1, 16, 10, 10})),
+                                ::testing::Values(std::vector<size_t >({1, 16, 30, 30})),
                                 ::testing::Values(CommonTestUtils::DEVICE_CPU)),
                         GroupConvolutionLayerTest::getTestCaseName);
 

diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/cum_sum.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/cum_sum.hpp
@@ -12,20 +12,20 @@
 
 namespace LayerTestsDefinitions {
 
-    typedef std::tuple<
-            InferenceEngine::SizeVector, // Input shapes
-            InferenceEngine::Precision,  // Input precision
-            int64_t,                     // Axis
-            bool,                        // Exclusive
-            bool,                        // Reverse
-            std::string> cumSumParams;   // Device name
+typedef std::tuple<
+        InferenceEngine::SizeVector, // Input shapes
+        InferenceEngine::Precision,  // Input precision
+        int64_t,                     // Axis
+        bool,                        // Exclusive
+        bool,                        // Reverse
+        std::string> cumSumParams;   // Device name
 
 class CumSumLayerTest : public testing::WithParamInterface<cumSumParams>, virtual public LayerTestsUtils::LayerTestsCommon {
 public:
     static std::string getTestCaseName(testing::TestParamInfo<cumSumParams> obj);
 
-    protected:
-        void SetUp() override;
-    };
+protected:
+    void SetUp() override;
+};
 
 }  // namespace LayerTestsDefinitions
diff --git a/ngraph/test/backend/not.in.cpp b/ngraph/test/backend/not.in.cpp
@@ -49,7 +49,7 @@ NGRAPH_TEST(${BACKEND_NAME}, not)
 {
     Shape shape{2, 2};
     auto A = make_shared<op::Parameter>(element::boolean, shape);
-    auto f = make_shared<Function>(make_shared<op::Not>(A), ParameterVector{A});
+    auto f = make_shared<Function>(make_shared<op::v1::LogicalNot>(A), ParameterVector{A});
 
     std::vector<char> a{1, 0, 1, 0};
 
@@ -63,7 +63,7 @@ NGRAPH_TEST(${BACKEND_NAME}, not_i32)
 {
     Shape shape{2, 2};
     auto A = make_shared<op::Parameter>(element::i32, shape);
-    auto f = make_shared<Function>(make_shared<op::Not>(A), ParameterVector{A});
+    auto f = make_shared<Function>(make_shared<op::v1::LogicalNot>(A), ParameterVector{A});
 
     std::vector<int32_t> a{1, 0, 2, 0};
 

diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt
@@ -29,6 +29,8 @@ set (SRC
     op/avg_pool.hpp
     op/convolution.cpp
     op/convolution.hpp
+    op/group_conv.cpp
+    op/group_conv.hpp
     pass/dyn_elimination.cpp
     pass/dyn_elimination.hpp
     pass/fused_op_decomposition.cpp
@@ -45,6 +47,8 @@ set (SRC
     pass/opset0_downgrade.hpp
     pass/opset1_downgrade.cpp
     pass/opset1_downgrade.hpp
+    pass/opset1_upgrade.cpp
+    pass/opset1_upgrade.hpp
     )
 
 add_library(ngraph_backend SHARED ${SRC})

diff --git a/ngraph/test/runtime/ie/ie_executable.cpp b/ngraph/test/runtime/ie/ie_executable.cpp
@@ -20,7 +20,7 @@
 #include "ngraph/pass/manager.hpp"
 #include "ngraph/shape.hpp"
 #include "ngraph/type/element_type.hpp"
-//#include "pass/opset1_upgrade.hpp"
+#include "pass/opset1_upgrade.hpp"
 
 using namespace std;
 using namespace ngraph;
@@ -93,7 +93,9 @@ runtime::ie::IE_Executable::IE_Executable(shared_ptr<Function> func, string devi
     : m_device{device}
 {
     static std::set<NodeTypeInfo> ie_ops = get_ie_ops();
-
+    pass::Manager passes;
+    passes.register_pass<pass::Opset1Upgrade>();
+    passes.run_passes(func);
     for (const auto& node : func->get_ops())
     {
         if (ie_ops.find(node->get_type_info()) == ie_ops.end())