[moco-tf] Hide TFNodeSummaryBuilderBase _tbl (#6168)

* [moco-tf] Hide TFNodeSummaryBuilderBase _tbl

This will change TFNodeSummaryBuilderBase member _tbl to be private to prevent unintended problems

Signed-off-by: SaeHie Park <saehie.park@samsung.com>
* add warning message

diff --git a/compiler/moco-tf/src/TFFormattedGraph.cpp b/compiler/moco-tf/src/TFFormattedGraph.cpp
index 251c7d4..0d3476e 100644 (file)
--- a/compiler/moco-tf/src/TFFormattedGraph.cpp
+++ b/compiler/moco-tf/src/TFFormattedGraph.cpp
@@ -57,6 +57,11 @@ protected:
 #undef TENSORFLOW_NODE
 
 protected:
+  const locop::SymbolTable *tbl(void) const { return _tbl; }
+
+  // Please do not use _tbl directly and use tbl().
+  // This will be changed to private in near future.
+protected:
   const locop::SymbolTable *_tbl;
 };
 
@@ -104,8 +109,8 @@ bool TFNodeSummaryBuilderBase::build(const loco::Node *node, locop::NodeSummary
 bool TFNodeSummaryBuilder::summary(const TFAdd *node, locop::NodeSummary &s) const
 {
   s.opname("TF.Add");
-  s.args().append("x", _tbl->lookup(node->x()));
-  s.args().append("y", _tbl->lookup(node->y()));
+  s.args().append("x", tbl()->lookup(node->x()));
+  s.args().append("y", tbl()->lookup(node->y()));
   s.state(locop::NodeSummary::State::Complete);
   return true;
 }
@@ -113,7 +118,7 @@ bool TFNodeSummaryBuilder::summary(const TFAdd *node, locop::NodeSummary &s) con
 bool TFNodeSummaryBuilder::summary(const TFAvgPool *node, locop::NodeSummary &s) const
 {
   s.opname("TF.AvgPool");
-  s.args().append("value", _tbl->lookup(node->value()));
+  s.args().append("value", tbl()->lookup(node->value()));
   s.args().append("ksize", pepper::str(node->ksize()));
   s.args().append("strides", pepper::str(node->strides()));
   s.args().append("padding", node->padding());
@@ -126,8 +131,8 @@ bool TFNodeSummaryBuilder::summary(const TFAvgPool *node, locop::NodeSummary &s)
 bool TFNodeSummaryBuilder::summary(const TFBiasAdd *node, locop::NodeSummary &s) const
 {
   s.opname("TF.BiasAdd");
-  s.args().append("value", _tbl->lookup(node->value()));
-  s.args().append("bias", _tbl->lookup(node->bias()));
+  s.args().append("value", tbl()->lookup(node->value()));
+  s.args().append("bias", tbl()->lookup(node->bias()));
   s.args().append("data_layout", node->data_layout());
   s.state(locop::NodeSummary::State::Complete);
   return true;
@@ -162,8 +167,8 @@ bool TFNodeSummaryBuilder::summary(const TFConst *node, locop::NodeSummary &s) c
 bool TFNodeSummaryBuilder::summary(const TFConv2D *node, locop::NodeSummary &s) const
 {
   s.opname("TF.Conv2D");
-  s.args().append("ifm", _tbl->lookup(node->ifm()));
-  s.args().append("ker", _tbl->lookup(node->ker()));
+  s.args().append("ifm", tbl()->lookup(node->ifm()));
+  s.args().append("ker", tbl()->lookup(node->ker()));
   s.args().append("padding", node->padding());
   s.args().append("data_layout", node->data_layout());
   s.args().append("strides", pepper::str(node->strides()));
@@ -174,8 +179,8 @@ bool TFNodeSummaryBuilder::summary(const TFConv2D *node, locop::NodeSummary &s)
 bool TFNodeSummaryBuilder::summary(const TFDepthwiseConv2dNative *node, locop::NodeSummary &s) const
 {
   s.opname("TF.DepthwiseConv2dNative");
-  s.args().append("ifm", _tbl->lookup(node->ifm()));
-  s.args().append("ker", _tbl->lookup(node->ker()));
+  s.args().append("ifm", tbl()->lookup(node->ifm()));
+  s.args().append("ker", tbl()->lookup(node->ker()));
   s.args().append("padding", node->padding());
   s.args().append("data_layout", node->data_layout());
   s.args().append("strides", pepper::str(node->strides()));
@@ -186,11 +191,11 @@ bool TFNodeSummaryBuilder::summary(const TFDepthwiseConv2dNative *node, locop::N
 bool TFNodeSummaryBuilder::summary(const TFFusedBatchNorm *node, locop::NodeSummary &s) const
 {
   s.opname("TF.FusedBatchNorm");
-  s.args().append("input", _tbl->lookup(node->input()));
-  s.args().append("gamma", _tbl->lookup(node->gamma()));
-  s.args().append("beta", _tbl->lookup(node->beta()));
-  s.args().append("mean", _tbl->lookup(node->mean()));
-  s.args().append("variance", _tbl->lookup(node->variance()));
+  s.args().append("input", tbl()->lookup(node->input()));
+  s.args().append("gamma", tbl()->lookup(node->gamma()));
+  s.args().append("beta", tbl()->lookup(node->beta()));
+  s.args().append("mean", tbl()->lookup(node->mean()));
+  s.args().append("variance", tbl()->lookup(node->variance()));
   s.args().append("epsilon", pepper::str(node->epsilon()));
   s.state(locop::NodeSummary::State::Complete);
   return true;
@@ -199,7 +204,7 @@ bool TFNodeSummaryBuilder::summary(const TFFusedBatchNorm *node, locop::NodeSumm
 bool TFNodeSummaryBuilder::summary(const TFMaxPool *node, locop::NodeSummary &s) const
 {
   s.opname("TF.MaxPool");
-  s.args().append("value", _tbl->lookup(node->value()));
+  s.args().append("value", tbl()->lookup(node->value()));
   s.args().append("ksize", pepper::str(node->ksize()));
   s.args().append("strides", pepper::str(node->strides()));
   s.args().append("padding", node->padding());
@@ -212,8 +217,8 @@ bool TFNodeSummaryBuilder::summary(const TFMaxPool *node, locop::NodeSummary &s)
 bool TFNodeSummaryBuilder::summary(const TFMul *node, locop::NodeSummary &s) const
 {
   s.opname("TF.Mul");
-  s.args().append("x", _tbl->lookup(node->x()));
-  s.args().append("y", _tbl->lookup(node->y()));
+  s.args().append("x", tbl()->lookup(node->x()));
+  s.args().append("y", tbl()->lookup(node->y()));
   s.state(locop::NodeSummary::State::Complete);
   return true;
 }
@@ -221,8 +226,8 @@ bool TFNodeSummaryBuilder::summary(const TFMul *node, locop::NodeSummary &s) con
 bool TFNodeSummaryBuilder::summary(const TFReshape *node, locop::NodeSummary &s) const
 {
   s.opname("TF.Reshape");
-  s.args().append("tensor", _tbl->lookup(node->tensor()));
-  s.args().append("shape", _tbl->lookup(node->shape()));
+  s.args().append("tensor", tbl()->lookup(node->tensor()));
+  s.args().append("shape", tbl()->lookup(node->shape()));
   s.state(locop::NodeSummary::State::Complete);
   return true;
 }
@@ -230,7 +235,7 @@ bool TFNodeSummaryBuilder::summary(const TFReshape *node, locop::NodeSummary &s)
 bool TFNodeSummaryBuilder::summary(const TFRsqrt *node, locop::NodeSummary &s) const
 {
   s.opname("TF.Rsqrt");
-  s.args().append("x", _tbl->lookup(node->x()));
+  s.args().append("x", tbl()->lookup(node->x()));
   s.state(locop::NodeSummary::State::Complete);
   return true;
 }