[moco-tf] Use shape_inference_done for helpers (#7288)

This will change to use shape_inference_done() for helpers in FixShapeTransform

Signed-off-by: SaeHie Park <saehie.park@samsung.com>

diff --git a/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp b/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp
index 7f90f6e..c7cab16 100644 (file)
--- a/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp
+++ b/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp
@@ -138,8 +138,7 @@ std::unique_ptr<ShapeInferenceData> make_shape_inference_data(const loco::NodeSh
 bool copy_shapedata(const loco::Node *src, loco::Node *dst)
 {
   // if dst already has ShapeInferenceData, skip
-  auto dst_shapedata = dst->annot<ShapeInferenceData>();
-  if (dst_shapedata != nullptr)
+  if (shape_inference_done(dst))
     return false;
 
   // if src has loco::NodeShape, use it
@@ -152,10 +151,10 @@ bool copy_shapedata(const loco::Node *src, loco::Node *dst)
   }
 
   // if src doesn't have ShapeInferenceData, skip
-  auto src_shapedata = src->annot<ShapeInferenceData>();
-  if (src_shapedata == nullptr)
+  if (!shape_inference_done(src))
     return false;
 
+  auto src_shapedata = src->annot<ShapeInferenceData>();
   auto shape_data = make_shape_inference_data(src_shapedata);
   dst->annot(std::move(shape_data));
 
@@ -174,11 +173,10 @@ bool node_shape(const loco::Node *node, loco::NodeShape &nodeshape)
     return true;
   }
 
-  auto shapedata = node->annot<ShapeInferenceData>();
-  if (shapedata == nullptr)
-  {
+  if (!shape_inference_done(node))
     return false;
-  }
+
+  auto shapedata = node->annot<ShapeInferenceData>();
 
   switch (shapedata->domain())
   {