Resolve shape prop issue (#4080)

* use pre_validate function

* use pre_validate

src/ngraph/frontend/fluid/operators/layout_converter.cpp

@@ -63,15 +63,12 @@ shared_ptr<Node> LayoutConverter::copy_with_new_args(const NodeVector& new_args)
     return make_shared<LayoutConverter>(new_args.at(0), get_mode());
 }
 
-void LayoutConverter::validate_and_infer_types()
+void LayoutConverter::pre_validate_and_infer_types()
 {
     auto shape = get_input_partial_shape(0);
+
     if (shape.is_dynamic())
     {
         set_output_type(0, get_input_element_type(0), PartialShape::dynamic());
     }
-    else
-    {
-        FusedOp::validate_and_infer_types();
-    }
 }

src/ngraph/frontend/fluid/operators/layout_converter.hpp

@@ -42,7 +42,7 @@ namespace ngraph
 
             virtual NodeVector decompose_op() const override;
 
-            virtual void validate_and_infer_types() override;
+            virtual void pre_validate_and_infer_types() override;
 
             virtual std::shared_ptr<Node>
                 copy_with_new_args(const NodeVector& new_args) const override;

src/ngraph/frontend/fluid/operators/pool.cpp

@@ -125,17 +125,14 @@ shared_ptr<Node> Pool::copy_with_new_args(const NodeVector& new_args) const
                              get_pooling_type());
 }
 
-void Pool::validate_and_infer_types()
+void Pool::pre_validate_and_infer_types()
 {
     auto shape = get_input_partial_shape(0);
+
     if (shape.is_dynamic())
     {
         set_output_type(0, get_input_element_type(0), PartialShape::dynamic());
     }
-    else
-    {
-        FusedOp::validate_and_infer_types();
-    }
 }
 
 constexpr NodeTypeInfo PoolGrad::type_info;
@@ -162,18 +159,13 @@ PoolGrad::PoolGrad(const Output<Node>& x,
     constructor_validate_and_infer_types();
 }
 
-void PoolGrad::validate_and_infer_types()
+void PoolGrad::pre_validate_and_infer_types()
 {
-    auto shape = get_input_partial_shape(0);
     if (get_input_partial_shape(0).is_dynamic() || get_input_partial_shape(1).is_dynamic() ||
         get_input_partial_shape(2).is_dynamic())
     {
         set_output_type(0, get_input_element_type(0), PartialShape::dynamic());
     }
-    else
-    {
-        FusedOp::validate_and_infer_types();
-    }
 }
 
 shared_ptr<Node> PoolGrad::copy_with_new_args(const NodeVector& new_args) const

src/ngraph/frontend/fluid/operators/pool.hpp

@@ -49,7 +49,7 @@ namespace ngraph
 
             virtual NodeVector decompose_op() const override;
 
-            virtual void validate_and_infer_types() override;
+            virtual void pre_validate_and_infer_types() override;
 
             virtual std::shared_ptr<Node>
                 copy_with_new_args(const NodeVector& new_args) const override;
@@ -103,7 +103,7 @@ namespace ngraph
 
             virtual NodeVector decompose_op() const override;
 
-            virtual void validate_and_infer_types() override;
+            virtual void pre_validate_and_infer_types() override;
 
             virtual std::shared_ptr<Node>
                 copy_with_new_args(const NodeVector& new_args) const override;

src/ngraph/frontend/fluid/operators/reduce_sum.cpp

@@ -71,16 +71,13 @@ NodeVector ReduceSum::decompose_op() const
     return retval;
 }
 
-void ReduceSum::validate_and_infer_types()
+void ReduceSum::pre_validate_and_infer_types()
 {
     auto shape = get_input_partial_shape(0);
+
     if (shape.is_dynamic())
     {
-        set_output_type(0, get_input_element_type(0), get_input_partial_shape(0));
-    }
-    else
-    {
-        FusedOp::validate_and_infer_types();
+        set_output_type(0, get_input_element_type(0), PartialShape::dynamic());
     }
 }
 
@@ -161,16 +158,13 @@ NodeVector ReduceSumGrad::decompose_op() const
     return retval;
 }
 
-void ReduceSumGrad::validate_and_infer_types()
+void ReduceSumGrad::pre_validate_and_infer_types()
 {
     auto shape = get_input_partial_shape(0);
+
     if (shape.is_dynamic())
     {
-        set_output_type(0, get_input_element_type(0), get_input_partial_shape(0));
-    }
-    else
-    {
-        FusedOp::validate_and_infer_types();
+        set_output_type(0, get_input_element_type(0), PartialShape::dynamic());
     }
 }
 

src/ngraph/frontend/fluid/operators/reduce_sum.hpp

@@ -44,7 +44,7 @@ namespace ngraph
 
             virtual NodeVector decompose_op() const override;
 
-            virtual void validate_and_infer_types() override;
+            virtual void pre_validate_and_infer_types() override;
 
             virtual std::shared_ptr<Node>
                 copy_with_new_args(const NodeVector& new_args) const override;
@@ -75,7 +75,7 @@ namespace ngraph
 
             virtual NodeVector decompose_op() const override;
 
-            virtual void validate_and_infer_types() override;
+            virtual void pre_validate_and_infer_types() override;
 
             virtual std::shared_ptr<Node>
                 copy_with_new_args(const NodeVector& new_args) const override;