[tfldump] rename DumpOp (#2565)

* [tfldump] rename DumpOp

This will rename DumpOp to OrPrinter for class and variables.
- Each inherited classes are also renamed as XxxxPrinter

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

diff --git a/contrib/tfldump/src/Dump.cpp b/contrib/tfldump/src/Dump.cpp
index 0079125..3146417 100644 (file)
--- a/contrib/tfldump/src/Dump.cpp
+++ b/contrib/tfldump/src/Dump.cpp
@@ -185,9 +185,9 @@ void dump_model(std::ostream &os, const tflite::Model *model)
     os << "O(" << i << ") " << op_name << " ";
     os << std::endl;
 
-    if (auto dumpop = OpPrinterRegistry::get().lookup(builtincode))
+    if (auto op_prn = OpPrinterRegistry::get().lookup(builtincode))
     {
-      dumpop->options(op, os);
+      op_prn->options(op, os);
     }
 
     for (auto input : inputs)

diff --git a/contrib/tfldump/src/DumpOp.cpp b/contrib/tfldump/src/DumpOp.cpp
index 0e13f7e..57b3015 100644 (file)
--- a/contrib/tfldump/src/DumpOp.cpp
+++ b/contrib/tfldump/src/DumpOp.cpp
@@ -27,7 +27,7 @@ namespace tfldump
 // TODO move to some header
 std::ostream &operator<<(std::ostream &os, const std::vector<int32_t> &vect);
 
-class DumpOpConv2D : public DumpOp
+class Conv2DPrinter : public OpPrinter
 {
 public:
   void options(const tflite::Operator *op, std::ostream &os) const override
@@ -44,7 +44,7 @@ public:
   }
 };
 
-class DumpOpPool2D : public DumpOp
+class Pool2DPrinter : public OpPrinter
 {
 public:
   void options(const tflite::Operator *op, std::ostream &os) const override
@@ -63,7 +63,7 @@ public:
   }
 };
 
-class DumpOpConcatenation : public DumpOp
+class ConcatenationPrinter : public OpPrinter
 {
 public:
   void options(const tflite::Operator *op, std::ostream &os) const override
@@ -78,7 +78,7 @@ public:
   }
 };
 
-class DumpOpReshape : public DumpOp
+class ReshapePrinter : public OpPrinter
 {
 public:
   void options(const tflite::Operator *op, std::ostream &os) const override
@@ -93,7 +93,7 @@ public:
   }
 };
 
-class DumpOpDepthwiseConv2D : public DumpOp
+class DepthwiseConv2DPrinter : public OpPrinter
 {
 public:
   void options(const tflite::Operator *op, std::ostream &os) const override
@@ -113,7 +113,7 @@ public:
   }
 };
 
-class DumpOpSoftmax : public DumpOp
+class SoftmaxPrinter : public OpPrinter
 {
 public:
   void options(const tflite::Operator *op, std::ostream &os) const override
@@ -129,14 +129,14 @@ public:
 
 OpPrinterRegistry::OpPrinterRegistry()
 {
-  _dumpop_map[tflite::BuiltinOperator_AVERAGE_POOL_2D] = make_unique<DumpOpPool2D>();
-  _dumpop_map[tflite::BuiltinOperator_CONCATENATION] = make_unique<DumpOpConcatenation>();
-  _dumpop_map[tflite::BuiltinOperator_CONV_2D] = make_unique<DumpOpConv2D>();
-  _dumpop_map[tflite::BuiltinOperator_DEPTHWISE_CONV_2D] = make_unique<DumpOpDepthwiseConv2D>();
-  _dumpop_map[tflite::BuiltinOperator_MAX_POOL_2D] = make_unique<DumpOpPool2D>();
+  _op_map[tflite::BuiltinOperator_AVERAGE_POOL_2D] = make_unique<Pool2DPrinter>();
+  _op_map[tflite::BuiltinOperator_CONCATENATION] = make_unique<ConcatenationPrinter>();
+  _op_map[tflite::BuiltinOperator_CONV_2D] = make_unique<Conv2DPrinter>();
+  _op_map[tflite::BuiltinOperator_DEPTHWISE_CONV_2D] = make_unique<DepthwiseConv2DPrinter>();
+  _op_map[tflite::BuiltinOperator_MAX_POOL_2D] = make_unique<Pool2DPrinter>();
   // There is no Option for ReLU and ReLU6
-  _dumpop_map[tflite::BuiltinOperator_RESHAPE] = make_unique<DumpOpReshape>();
-  _dumpop_map[tflite::BuiltinOperator_SOFTMAX] = make_unique<DumpOpSoftmax>();
+  _op_map[tflite::BuiltinOperator_RESHAPE] = make_unique<ReshapePrinter>();
+  _op_map[tflite::BuiltinOperator_SOFTMAX] = make_unique<SoftmaxPrinter>();
 }
 
 } // namespace tfldump

diff --git a/contrib/tfldump/src/DumpOp.h b/contrib/tfldump/src/DumpOp.h
index 79f80b6..bd5f261 100644 (file)
--- a/contrib/tfldump/src/DumpOp.h
+++ b/contrib/tfldump/src/DumpOp.h
@@ -25,7 +25,7 @@
 namespace tfldump
 {
 
-class DumpOp
+class OpPrinter
 {
 public:
   virtual void options(const tflite::Operator *, std::ostream &) const {};
@@ -37,12 +37,12 @@ public:
   OpPrinterRegistry();
 
 public:
-  const DumpOp *lookup(tflite::BuiltinOperator op) const
+  const OpPrinter *lookup(tflite::BuiltinOperator op) const
   {
-    if (_dumpop_map.find(op) == _dumpop_map.end())
+    if (_op_map.find(op) == _op_map.end())
       return nullptr;
 
-    return _dumpop_map.at(op).get();
+    return _op_map.at(op).get();
   }
 
 public:
@@ -53,7 +53,7 @@ public:
   }
 
 private:
-  std::map<tflite::BuiltinOperator, std::unique_ptr<DumpOp>> _dumpop_map;
+  std::map<tflite::BuiltinOperator, std::unique_ptr<OpPrinter>> _op_map;
 };
 
 } // namespace tfldump