Merge branch 'master' into cpu_layout2

src/ngraph/ops/avg_pool.cpp

@@ -201,6 +201,10 @@ op::AvgPool::AvgPool(const std::shared_ptr<Node>& arg, const Shape& window_shape
 
 bool op::AvgPool::is_functionally_identical(const Node& other) const
 {
+    // TODO: temporary workaround for MKLDNN issue
+    //       remove 'return false' and uncomment below when fixed
+    return false;
+    /*
     bool rc = true;
     if (Node::is_functionally_identical(other))
     {
@@ -215,6 +219,7 @@ bool op::AvgPool::is_functionally_identical(const Node& other) const
         rc = false;
     }
     return rc;
+    */
 }
 
 op::AvgPoolBprop::AvgPoolBprop(const std::shared_ptr<Node>& arg,

src/ngraph/ops/convolution.cpp

@@ -371,6 +371,10 @@ std::shared_ptr<Node>
 
 bool op::Convolution::is_functionally_identical(const Node& other) const
 {
+    // TODO: temporary workaround for MKLDNN issue
+    //       remove 'return false' and uncomment below when fixed
+    return false;
+    /*
     bool rc = true;
     if (Node::test_identical(other))
     {
@@ -386,6 +390,7 @@ bool op::Convolution::is_functionally_identical(const Node& other) const
         rc = false;
     }
     return rc;
+    */
 }
 
 void op::Convolution::generate_adjoints(autodiff::Adjoints& adjoints,

src/ngraph/ops/max_pool.cpp

@@ -159,6 +159,10 @@ op::MaxPool::MaxPool(const std::shared_ptr<Node>& arg, const Shape& window_shape
 
 bool op::MaxPool::is_functionally_identical(const Node& other) const
 {
+    // TODO: temporary workaround for MKLDNN issue
+    //       remove 'return false' and uncomment below when fixed
+    return false;
+    /*
     bool rc = true;
     if (Node::test_identical(other))
     {
@@ -171,6 +175,7 @@ bool op::MaxPool::is_functionally_identical(const Node& other) const
         rc = false;
     }
     return rc;
+    */
 }
 
 void op::MaxPool::generate_adjoints(autodiff::Adjoints& adjoints,