[nnc] Use dumpGraph function (#7243)

Use `dumpGraph` function instead of `IrDotDumper` class.

Signed-off-by: Sergei Barannikov <s.barannikov@samsung.com>

diff --git a/compiler/nnc/include/passes/dot_dumper/DumperPass.h b/compiler/nnc/include/passes/dot_dumper/DumperPass.h
index 9998d87..3180370 100644 (file)
--- a/compiler/nnc/include/passes/dot_dumper/DumperPass.h
+++ b/compiler/nnc/include/passes/dot_dumper/DumperPass.h
@@ -18,8 +18,6 @@
 #define NNCC_DUMPERPASS_H
 
 #include "pass/Pass.h"
-#include "pass/PassData.h"
-#include "mir/IrDotDumper.h"
 
 namespace nnc
 {
@@ -31,7 +29,7 @@ namespace nnc
 class DumperPass : public Pass
 {
 public:
-  explicit DumperPass(std::string s) : _file_name(std::move(s)){};
+  explicit DumperPass(std::string s) : _file_name(std::move(s)) {}
 
   PassData run(PassData data) override;
 

diff --git a/compiler/nnc/passes/dot_dumper/DumperPass.cpp b/compiler/nnc/passes/dot_dumper/DumperPass.cpp
index 196490d..5a1f56e 100644 (file)
--- a/compiler/nnc/passes/dot_dumper/DumperPass.cpp
+++ b/compiler/nnc/passes/dot_dumper/DumperPass.cpp
@@ -16,7 +16,7 @@
 
 #include "passes/dot_dumper/DumperPass.h"
 #include "mir/Graph.h"
-#include "pass/PassException.h"
+#include "mir/IrDotDumper.h"
 
 #include <fstream>
 
@@ -28,17 +28,11 @@ int DumperPass::_counter = 0;
 
 PassData DumperPass::run(PassData data)
 {
-  auto g = static_cast<Graph *>(data);
-  assert(g);
-  IrDotDumper dotDumper;
-  g->accept(&dotDumper);
-  std::ofstream f_out;
-  f_out.open(std::to_string(_counter) + "_" + _file_name + ".dot");
-  dotDumper.writeDot(f_out);
-  f_out.close();
-
-  _counter++;
-  return g;
+  auto graph = static_cast<Graph *>(data);
+  assert(graph && "graph object is expected");
+  std::ofstream stream(std::to_string(_counter++) + "_" + _file_name + ".dot");
+  dumpGraph(graph, stream);
+  return graph;
 }
 
 } // namespace nnc

diff --git a/compiler/nnc/utils/caffe2_dot_dumper/model_dump.cpp b/compiler/nnc/utils/caffe2_dot_dumper/model_dump.cpp
index 00d53c2..34753cc 100644 (file)
--- a/compiler/nnc/utils/caffe2_dot_dumper/model_dump.cpp
+++ b/compiler/nnc/utils/caffe2_dot_dumper/model_dump.cpp
@@ -25,7 +25,6 @@
 
 using namespace nnc;
 using namespace mir;
-using namespace nnc::cli;
 
 int main(int argc, const char **argv)
 {
@@ -36,10 +35,8 @@ int main(int argc, const char **argv)
 
   try
   {
-    IrDotDumper dotDumper;
-    auto g = static_cast<Graph *>(importer.importModel());
-    g->accept(&dotDumper);
-    dotDumper.writeDot(std::cout);
+    auto graph = static_cast<Graph *>(importer.importModel());
+    dumpGraph(graph, std::cout);
   }
   catch (PassException &e)
   {

diff --git a/compiler/nnc/utils/caffe_dot_dumper/model_dump.cpp b/compiler/nnc/utils/caffe_dot_dumper/model_dump.cpp
index e4b594d..6896127 100644 (file)
--- a/compiler/nnc/utils/caffe_dot_dumper/model_dump.cpp
+++ b/compiler/nnc/utils/caffe_dot_dumper/model_dump.cpp
@@ -19,13 +19,11 @@
 #include "support/CommandLine.h"
 #include "option/Options.h"
 #include "caffe_importer_pass.h"
-#include "mir/Graph.h"
 #include "mir/IrDotDumper.h"
 #include "pass/PassException.h"
 
 using namespace nnc;
 using namespace mir;
-using namespace nnc::cli;
 
 int main(int argc, const char **argv)
 {
@@ -34,10 +32,8 @@ int main(int argc, const char **argv)
 
   try
   {
-    IrDotDumper dotDumper;
-    auto g = importer.importModel();
-    g->accept(&dotDumper);
-    dotDumper.writeDot(std::cout);
+    auto graph = importer.importModel();
+    dumpGraph(graph, std::cout);
   }
   catch (PassException &e)
   {