From e4e04c81ef71f1e7fad9236b2238c040fa32aa5f Mon Sep 17 00:00:00 2001 From: luopengting Date: Fri, 5 Mar 2021 11:40:50 +0800 Subject: [PATCH] reduce unnecessary blank lines, add destructor for recorders --- mindspore/ccsrc/debug/rdr/graph_exec_order_recorder.h | 1 + mindspore/ccsrc/debug/rdr/graph_recorder.cc | 1 - mindspore/ccsrc/debug/rdr/mem_address_recorder.h | 1 + mindspore/ccsrc/debug/rdr/recorder_manager.cc | 1 - mindspore/ccsrc/debug/rdr/running_data_recorder.cc | 1 - mindspore/ccsrc/debug/rdr/stream_exec_order_recorder.h | 2 ++ mindspore/ccsrc/debug/rdr/task_debug_info_recorder.h | 1 + 7 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mindspore/ccsrc/debug/rdr/graph_exec_order_recorder.h b/mindspore/ccsrc/debug/rdr/graph_exec_order_recorder.h index 1b5b44f8ad..f01693fa7b 100644 --- a/mindspore/ccsrc/debug/rdr/graph_exec_order_recorder.h +++ b/mindspore/ccsrc/debug/rdr/graph_exec_order_recorder.h @@ -30,6 +30,7 @@ class GraphExecOrderRecorder : public BaseRecorder { GraphExecOrderRecorder(const std::string &module, const std::string &tag, const std::vector &final_exec_order, int graph_id) : BaseRecorder(module, tag), exec_order_(final_exec_order), graph_id_(graph_id) {} + ~GraphExecOrderRecorder() {} void SetExecOrder(const std::vector &final_exec_order) { exec_order_ = final_exec_order; } virtual void Export(); diff --git a/mindspore/ccsrc/debug/rdr/graph_recorder.cc b/mindspore/ccsrc/debug/rdr/graph_recorder.cc index a66ac61d7b..1e81834901 100644 --- a/mindspore/ccsrc/debug/rdr/graph_recorder.cc +++ b/mindspore/ccsrc/debug/rdr/graph_recorder.cc @@ -65,7 +65,6 @@ void GraphRecorder::Export() { } std::string suffix = graph_id >= 0 ? std::to_string(graph_id) : ""; auto tmp_realpath = GetFileRealPath(suffix); - if (!tmp_realpath.has_value()) { return; } diff --git a/mindspore/ccsrc/debug/rdr/mem_address_recorder.h b/mindspore/ccsrc/debug/rdr/mem_address_recorder.h index f301d4edc3..60e70e4205 100644 --- a/mindspore/ccsrc/debug/rdr/mem_address_recorder.h +++ b/mindspore/ccsrc/debug/rdr/mem_address_recorder.h @@ -43,6 +43,7 @@ class MemAddressRecorder : public BaseRecorder { private: MemAddressRecorder() {} MemAddressRecorder(const MemAddressRecorder &recorder); + ~MemAddressRecorder() {} MemAddressRecorder &operator=(const MemAddressRecorder &recorder); mutable std::mutex mtx_; diff --git a/mindspore/ccsrc/debug/rdr/recorder_manager.cc b/mindspore/ccsrc/debug/rdr/recorder_manager.cc index 42e5c3a48c..3f04fcf1aa 100644 --- a/mindspore/ccsrc/debug/rdr/recorder_manager.cc +++ b/mindspore/ccsrc/debug/rdr/recorder_manager.cc @@ -19,7 +19,6 @@ #include "debug/env_config_parser.h" namespace mindspore { - void RecorderManager::UpdateRdrEnable() { static bool updated = false; if (updated) { diff --git a/mindspore/ccsrc/debug/rdr/running_data_recorder.cc b/mindspore/ccsrc/debug/rdr/running_data_recorder.cc index 4a14a2303c..9b9436cbdc 100644 --- a/mindspore/ccsrc/debug/rdr/running_data_recorder.cc +++ b/mindspore/ccsrc/debug/rdr/running_data_recorder.cc @@ -142,6 +142,5 @@ void TriggerAll() { } void ClearAll() { mindspore::RecorderManager::Instance().ClearAll(); } - } // namespace RDR } // namespace mindspore diff --git a/mindspore/ccsrc/debug/rdr/stream_exec_order_recorder.h b/mindspore/ccsrc/debug/rdr/stream_exec_order_recorder.h index e16014c35f..5a48ebf345 100644 --- a/mindspore/ccsrc/debug/rdr/stream_exec_order_recorder.h +++ b/mindspore/ccsrc/debug/rdr/stream_exec_order_recorder.h @@ -38,6 +38,7 @@ class ExecNode { ExecNode(const size_t index, const std::string &node_name, const uint32_t &logic_id, const uint32_t &stream_id, const std::string &node_info) : index_(index), node_name_(node_name), logic_id_(logic_id), stream_id_(stream_id), node_info_(node_info) {} + ~ExecNode() {} void SetEventId(const uint32_t &event_id) { event_id_ = event_id; } void SetLabelId(const uint32_t &label_id) { label_ids_.push_back(label_id); } void SetActiveStreamId(const uint32_t &active_stream_id) { active_stream_ids_.push_back(active_stream_id); } @@ -98,6 +99,7 @@ class StreamExecOrderRecorder : public BaseRecorder { exec_order_.push_back(std::move(exec_node_ptr)); } } + ~StreamExecOrderRecorder() {} virtual void Export(); private: diff --git a/mindspore/ccsrc/debug/rdr/task_debug_info_recorder.h b/mindspore/ccsrc/debug/rdr/task_debug_info_recorder.h index 8abe482565..cdc1cf37fa 100644 --- a/mindspore/ccsrc/debug/rdr/task_debug_info_recorder.h +++ b/mindspore/ccsrc/debug/rdr/task_debug_info_recorder.h @@ -37,6 +37,7 @@ class TaskDebugInfoRecorder : public BaseRecorder { TaskDebugInfoRecorder(const std::string &module, const std::string &tag, const std::vector &task_debug_info, int graph_id) : BaseRecorder(module, tag), graph_id_(graph_id), task_debug_info_(task_debug_info) {} + ~TaskDebugInfoRecorder() {} virtual void Export(); private: