fix profiler dead lock

7 years ago · 5a6c3cd9e0
parent 3f2aa91970
commit 5a6c3cd9e0
1 changed files with 3 additions and 2 deletions
--- a/paddle/fluid/platform/device_tracer.cc
+++ b/paddle/fluid/platform/device_tracer.cc
@ -318,11 +318,12 @@ class DeviceTracerImpl : public DeviceTracer {
  }

  void Disable() {
-    std::lock_guard<std::mutex> l(trace_mu_);
 #ifdef PADDLE_WITH_CUPTI
    // flush might cause additional calls to DeviceTracker.
    dynload::cuptiActivityFlushAll(CUPTI_ACTIVITY_FLAG_FLUSH_FORCED);
-
+#endif  // PADDLE_WITH_CUPTI
+    std::lock_guard<std::mutex> l(trace_mu_);
+#ifdef PADDLE_WITH_CUPTI
    DisableActivity();
    dynload::cuptiUnsubscribe(subscriber_);
    CUPTI_CALL(dynload::cuptiGetTimestamp(&end_ns_));