From: 박세희/On-Device Lab(SR)/Principal Engineer/삼성전자 <saehie.park@samsung.com>
Date: Tue, 20 Aug 2019 09:12:28 +0000 (+0900)
Subject: [moco-tf] Update shape inference in Canonicalizers (#6732)
X-Git-Tag: accepted/tizen/unified/20190903.052428~289
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95b43cf47f0d71671db09ec05ba41c89057edd18;p=platform%2Fcore%2Fml%2Fnnfw.git

[moco-tf] Update shape inference in Canonicalizers (#6732)

This will update shape inference to use loco service in Canonicalizers of Add,Mul,Realdiv and Sub nodes

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

diff --git a/compiler/moco-tf/src/Canonicalization/AddCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/AddCanonicalizer.cpp
index 1daeb1a..6fc1fc2 100644
--- a/compiler/moco-tf/src/Canonicalization/AddCanonicalizer.cpp
+++ b/compiler/moco-tf/src/Canonicalization/AddCanonicalizer.cpp
@@ -16,13 +16,14 @@
 
 #include "AddCanonicalizer.h"
 
-#include "Annotations/ShapeInferenceData.h"
-
 #include "Dialect/TFDialect.h"
 #include "Dialect/TFNodes.h"
 #include "Dialect/TFNodeVisitor.h"
 #include "Dialect/TFNodeImpl.h"
 
+#include <loco/IR/NodeShape.h>
+#include <loco/Service/ShapeInference.h>
+
 #include <stdex/Memory.h>
 
 namespace
@@ -56,12 +57,16 @@ bool canonicalize_add(loco::Graph *graph, moco::tf::TFAdd *node)
   auto node_A = node->x();
   auto node_B = node->y();
 
-  auto x_shapedata = node_A->annot<moco::tf::ShapeInferenceData>();
-  assert(x_shapedata != nullptr);
-  auto y_shapedata = node_B->annot<moco::tf::ShapeInferenceData>();
-  assert(y_shapedata != nullptr);
+  if (!loco::shape_known(node_A) || !loco::shape_known(node_B))
+  {
+    // Wait for shape inference
+    return false;
+  }
+
+  const auto &x_shape = loco::shape_get(node_A);
+  const auto &y_shape = loco::shape_get(node_B);
 
-  if (!(*x_shapedata == *y_shapedata))
+  if (!(x_shape == y_shape))
   {
     // TODO support broadcast Add
     return false;
diff --git a/compiler/moco-tf/src/Canonicalization/MulCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/MulCanonicalizer.cpp
index e0448b4..b440209 100644
--- a/compiler/moco-tf/src/Canonicalization/MulCanonicalizer.cpp
+++ b/compiler/moco-tf/src/Canonicalization/MulCanonicalizer.cpp
@@ -16,13 +16,14 @@
 
 #include "MulCanonicalizer.h"
 
-#include "Annotations/ShapeInferenceData.h"
-
 #include "Dialect/TFDialect.h"
 #include "Dialect/TFNodes.h"
 #include "Dialect/TFNodeVisitor.h"
 #include "Dialect/TFNodeImpl.h"
 
+#include <loco/IR/NodeShape.h>
+#include <loco/Service/ShapeInference.h>
+
 #include <stdex/Memory.h>
 
 namespace
@@ -56,12 +57,16 @@ bool canonicalize_mul(loco::Graph *graph, moco::tf::TFMul *node)
   auto node_A = node->x();
   auto node_B = node->y();
 
-  auto x_shapedata = node_A->annot<moco::tf::ShapeInferenceData>();
-  assert(x_shapedata != nullptr);
-  auto y_shapedata = node_B->annot<moco::tf::ShapeInferenceData>();
-  assert(y_shapedata != nullptr);
+  if (!loco::shape_known(node_A) || !loco::shape_known(node_B))
+  {
+    // Wait for shape inference
+    return false;
+  }
+
+  const auto &x_shape = loco::shape_get(node_A);
+  const auto &y_shape = loco::shape_get(node_B);
 
-  if (!(*x_shapedata == *y_shapedata))
+  if (!(x_shape == y_shape))
   {
     // TODO support broadcast Mul
     return false;
diff --git a/compiler/moco-tf/src/Canonicalization/RealDivCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/RealDivCanonicalizer.cpp
index 72b3ce6..e0e4c5e 100644
--- a/compiler/moco-tf/src/Canonicalization/RealDivCanonicalizer.cpp
+++ b/compiler/moco-tf/src/Canonicalization/RealDivCanonicalizer.cpp
@@ -16,13 +16,14 @@
 
 #include "RealDivCanonicalizer.h"
 
-#include "Annotations/ShapeInferenceData.h"
-
 #include "Dialect/TFDialect.h"
 #include "Dialect/TFNodes.h"
 #include "Dialect/TFNodeVisitor.h"
 #include "Dialect/TFNodeImpl.h"
 
+#include <loco/IR/NodeShape.h>
+#include <loco/Service/ShapeInference.h>
+
 #include <stdex/Memory.h>
 
 namespace
@@ -56,12 +57,16 @@ bool canonicalize_div(loco::Graph *graph, moco::tf::TFRealDiv *node)
   auto node_A = node->x();
   auto node_B = node->y();
 
-  auto x_shapedata = node_A->annot<moco::tf::ShapeInferenceData>();
-  assert(x_shapedata != nullptr);
-  auto y_shapedata = node_B->annot<moco::tf::ShapeInferenceData>();
-  assert(y_shapedata != nullptr);
+  if (!loco::shape_known(node_A) || !loco::shape_known(node_B))
+  {
+    // Wait for shape inference
+    return false;
+  }
+
+  const auto &x_shape = loco::shape_get(node_A);
+  const auto &y_shape = loco::shape_get(node_B);
 
-  if (!(*x_shapedata == *y_shapedata))
+  if (!(x_shape == y_shape))
   {
     // TODO support broadcast Div
     return false;
diff --git a/compiler/moco-tf/src/Canonicalization/SubCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/SubCanonicalizer.cpp
index 316d9fb..10bfcf6 100644
--- a/compiler/moco-tf/src/Canonicalization/SubCanonicalizer.cpp
+++ b/compiler/moco-tf/src/Canonicalization/SubCanonicalizer.cpp
@@ -16,13 +16,14 @@
 
 #include "SubCanonicalizer.h"
 
-#include "Annotations/ShapeInferenceData.h"
-
 #include "Dialect/TFDialect.h"
 #include "Dialect/TFNodes.h"
 #include "Dialect/TFNodeVisitor.h"
 #include "Dialect/TFNodeImpl.h"
 
+#include <loco/IR/NodeShape.h>
+#include <loco/Service/ShapeInference.h>
+
 #include <stdex/Memory.h>
 
 namespace
@@ -56,12 +57,16 @@ bool canonicalize_sub(loco::Graph *graph, moco::tf::TFSub *node)
   auto node_A = node->x();
   auto node_B = node->y();
 
-  auto x_shapedata = node_A->annot<moco::tf::ShapeInferenceData>();
-  assert(x_shapedata != nullptr);
-  auto y_shapedata = node_B->annot<moco::tf::ShapeInferenceData>();
-  assert(y_shapedata != nullptr);
+  if (!loco::shape_known(node_A) || !loco::shape_known(node_B))
+  {
+    // Wait for shape inference
+    return false;
+  }
+
+  const auto &x_shape = loco::shape_get(node_A);
+  const auto &y_shape = loco::shape_get(node_B);
 
-  if (!(*x_shapedata == *y_shapedata))
+  if (!(x_shape == y_shape))
   {
     // TODO support broadcast Sub
     return false;