fix profiling (PaddlePaddle#330)

* add reset() * add UT * up 1 * up x * del UT
graphcore · Dec 20, 2021 · 6c7d4cc · 6c7d4cc
1 parent a9a1a3d
commit 6c7d4cc
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 4 deletions.
diff --git a/paddle/fluid/framework/ipu/ipu_backend.cc b/paddle/fluid/framework/ipu/ipu_backend.cc
@@ -34,6 +34,11 @@ IpuBackend::IpuBackend() {
   executor_ = std::make_unique<Executor>();
 }
 
+IpuBackend::~IpuBackend() {
+  compiler_.reset();
+  executor_.reset();
+}
+
 void IpuBackend::Compile(ir::Graph* graph,
                          const std::vector<std::string>& feed_list,
                          const std::vector<std::string>& fetch_list) {
@@ -75,6 +80,12 @@ void IpuBackend::Prepare() {
 
 void IpuBackend::Detach() { executor_->Detach(); }
 
+void IpuBackend::Reset() {
+  executor_->Detach();
+  compiler_.reset();
+  executor_.reset();
+}
+
 void IpuBackend::SetScope(const Scope& scope) {
   scope_ = &scope;
   executor_->SetScope(&scope);

diff --git a/paddle/fluid/framework/ipu/ipu_backend.h b/paddle/fluid/framework/ipu/ipu_backend.h
@@ -44,7 +44,7 @@ class IpuBackend {
 
  public:
   IpuBackend();
-  ~IpuBackend() = default;
+  ~IpuBackend();
 
   // what compile does include(call compiler_):
   //   1. map paddle-op -> poart op
@@ -63,6 +63,10 @@ class IpuBackend {
   // detach IPU manually
   void Detach();
 
+  // reset manually
+  // call it before destruct works
+  void Reset();
+
   void SetScope(const Scope &scope);
   const Scope *GetScope() { return scope_; }
   void SetIpuStrategy(const IpuStrategy &strategy);

diff --git a/paddle/fluid/framework/ipu/ipu_compiler.cc b/paddle/fluid/framework/ipu/ipu_compiler.cc
@@ -93,6 +93,11 @@ TO GetCastSigAttrAllowNull(std::string attr, OpDesc* op_desc) {
 
 Compiler::Compiler() { RegisterOpFunc(); }
 
+Compiler::~Compiler() {
+  builder_.reset();
+  one_builder_.reset();
+}
+
 void Compiler::Prepare() {
   builder_ = popart::Builder::create();
   one_builder_ = std::make_unique<OneBuilder>();

diff --git a/paddle/fluid/framework/ipu/ipu_compiler.h b/paddle/fluid/framework/ipu/ipu_compiler.h
@@ -71,7 +71,7 @@ struct OneBuilder {
 class Compiler {
  public:
   Compiler();
-  ~Compiler() = default;
+  ~Compiler();
 
   void RegisterOpFunc();
   void Prepare();

diff --git a/paddle/fluid/framework/ipu/ipu_executor.cc b/paddle/fluid/framework/ipu/ipu_executor.cc
@@ -20,6 +20,12 @@ namespace paddle {
 namespace framework {
 namespace ipu {
 
+Executor::~Executor() {
+  Detach();
+  session_.reset();
+  one_session_.reset();
+}
+
 void Executor::Prepare(const std::string &proto) {
   VLOG(10) << "enter Executor::Prepare";
 

diff --git a/paddle/fluid/framework/ipu/ipu_executor.h b/paddle/fluid/framework/ipu/ipu_executor.h
@@ -43,7 +43,7 @@ struct OneSession {
 class Executor {
  public:
   Executor() = default;
-  ~Executor() = default;
+  ~Executor();
 
   // build popart session
   void Prepare(const std::string &proto);
@@ -89,7 +89,7 @@ class Executor {
   // popart session, where graph running
   std::unique_ptr<popart::Session> session_;
   // one OneSession means a graph
-  std::shared_ptr<OneSession> one_session_;
+  std::unique_ptr<OneSession> one_session_;
 
   int step_ = 0;
 };

diff --git a/paddle/fluid/pybind/pybind.cc b/paddle/fluid/pybind/pybind.cc
@@ -3208,6 +3208,7 @@ All parameter, weight, gradient are variables in Paddle.
            },
            py::return_value_policy::reference)
       .def("detach", &ipu::IpuBackend::Detach)
+      .def("reset", &ipu::IpuBackend::Reset)
       .def("set_scope", &ipu::IpuBackend::SetScope)
       .def("set_ipu_strategy", &ipu::IpuBackend::SetIpuStrategy)
       .def("set_custom_ops", &ipu::IpuBackend::SetCustomOps)

diff --git a/python/paddle/fluid/compiler.py b/python/paddle/fluid/compiler.py
@@ -624,6 +624,9 @@ def compile(self, feed_list, fetch_list, feed_var_name='feed', scope=None):
     def detach(self):
         self._backend.detach()
 
+    def reset(self):
+        self._backend.reset()
+
     def save_onnx_model(self, file_name):
         self._backend.save_molde_proto(file_name)