diff --git a/ge/common/profiling/ge_profiling.cc b/ge/common/profiling/ge_profiling.cc index fcd01a12..a7aec882 100644 --- a/ge/common/profiling/ge_profiling.cc +++ b/ge/common/profiling/ge_profiling.cc @@ -268,7 +268,7 @@ ge::Status ProfSetStepInfo(uint64_t index_id, uint16_t tag_id, rtStream_t stream return ge::FAILED; } auto &profiling_manager = ge::ProfilingManager::Instance(); - profiling_manager.SetStepInfoIndex(index_id); + profiling_manager.SetCurIterNum(index_id); if (is_first_run && tag_id == kStepStart) { GE_CHK_STATUS_RET_NOLOG(profiling_manager.ProfileStepInfo(index_id, kModelId, tag_id, stream, device_id)); is_first_run = false; diff --git a/ge/common/profiling/profiling_manager.cc b/ge/common/profiling/profiling_manager.cc index 0464491d..0439e1af 100644 --- a/ge/common/profiling/profiling_manager.cc +++ b/ge/common/profiling/profiling_manager.cc @@ -71,7 +71,7 @@ ProfilingManager::ProfilingManager() is_training_trace_(false), subscribe_count_(0), prof_cb_({nullptr, nullptr}), - index_id_(UINT64_MAX), + cur_iter_num_(INT64_MAX), subscribe_info_({false, 0, 0}) { } @@ -608,7 +608,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::ProfFi is_load_profiling_ = false; is_training_trace_ = false; is_execute_profiling_ = false; - index_id_ = UINT64_MAX; + cur_iter_num_ = INT64_MAX; // profiling plugin uninit PluginUnInit(); diff --git a/ge/common/profiling/profiling_manager.h b/ge/common/profiling/profiling_manager.h index e5137562..83475615 100755 --- a/ge/common/profiling/profiling_manager.h +++ b/ge/common/profiling/profiling_manager.h @@ -107,8 +107,8 @@ class FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ProfilingManager { void GetOpInputOutputInfo(const OpDescPtr &op, TaskDescInfo &task_desc_info) const; void ReportData(const int32_t &device_id, const std::string &data, const std::string &tag_name); Status ProfileStepInfo(uint64_t index_id, uint64_t model_id, uint16_t tag_id, rtStream_t stream, int32_t device_id); - void SetStepInfoIndex(uint64_t index_id) { index_id_ = index_id; } - uint64_t GetStepInfoIndex() const { return index_id_; } + uint64_t GetCurIterNum() const { return cur_iter_num_; } + void SetCurIterNum(uint64_t cur_iter_num) { cur_iter_num_ = cur_iter_num; } void SetGraphIdToDeviceMap(uint32_t graph_id, uint32_t device_id) { device_id_map_[graph_id] = device_id; } Status GetDeviceIdFromGraph(uint32_t graph_id, uint32_t &device_id); void SetSubscribeInfo(uint64_t prof_switch, uint32_t model_id, bool is_subscribe); @@ -143,7 +143,7 @@ class FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ProfilingManager { std::string fp_point_; std::string bp_point_; uint32_t reporter_max_len_ = 0; - uint64_t index_id_; + uint64_t cur_iter_num_; std::map device_id_map_; // key: graph_id, value: device_id std::map model_id_map_; // key: graph_id, value: model_id ProfSubscribeInfo subscribe_info_; diff --git a/ge/single_op/single_op.cc b/ge/single_op/single_op.cc index a82c30ba..eddf6478 100755 --- a/ge/single_op/single_op.cc +++ b/ge/single_op/single_op.cc @@ -58,7 +58,7 @@ Status ProfilingTaskInfo(OpTask *op_task, const string &shape_type) { tmp_task_desc_info.op_name.c_str(), tmp_task_desc_info.model_name.c_str()); tmp_task_desc_info.shape_type = shape_type; - tmp_task_desc_info.cur_iter_num = ProfilingManager::Instance().GetStepInfoIndex(); + tmp_task_desc_info.cur_iter_num = ProfilingManager::Instance().GetCurIterNum(); tmp_task_desc_info.task_type = op_task->GetTaskType(); std::vector task_desc_info; diff --git a/inc/framework/common/ge_types.h b/inc/framework/common/ge_types.h index 64231b8c..480a076e 100644 --- a/inc/framework/common/ge_types.h +++ b/inc/framework/common/ge_types.h @@ -41,7 +41,7 @@ enum FrameworkType { }; const std::map kFwkTypeToStr = { - {"0", "Caffe"}, {"1", "MindSpore"}, {"3", "TensorFlow"}, {"4", "Android_NN"}, {"5", "Onnx"}}; + {"0", "Caffe"}, {"1", "MindSpore"}, {"3", "TensorFlow"}, {"4", "Android_NN"}, {"5", "Onnx"}}; enum OpEngineType { ENGINE_SYS = 0, // default engine @@ -260,7 +260,7 @@ struct TaskDescInfo { uint32_t task_id; uint32_t stream_id; std::string shape_type; - int64_t cur_iter_num; + uint64_t cur_iter_num; std::string task_type; std::vector input_format; std::vector> input_shape;