p85620714
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!48521 codeclean 

Merge pull request !48521 from TuDouNi/r1.10
This commit is contained in:
i-robot 2023-02-08 01:36:34 +00:00 committed by Gitee
parent d33c6f1842 3384ada324
commit e6780ed7bc
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_stream_manager.cc
View File

@ -32,7 +32,7 @@ rtEvent_t AscendStreamMng::ApplyRtEvent() {
if (ret != RT_ERROR_NONE) {
MS_LOG(EXCEPTION) << "rtEventCreate failed, ret:" << ret;
}
events_.emplace_back(*rt_resource);
(void)events_.emplace_back(*rt_resource);
return *rt_resource;
}
@ -42,7 +42,7 @@ rtEvent_t AscendStreamMng::ApplyRtEventWithFlag(uint32_t flag) {
if (ret != RT_ERROR_NONE) {
MS_LOG(EXCEPTION) << "Call rtEventCreateWithFlag failed, ret:" << ret;
}
events_.emplace_back(rt_event);
(void)events_.emplace_back(rt_event);
return rt_event;
}

5
mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ext_info_handle.cc
View File

@ -284,7 +284,7 @@ void AicpuExtInfoHandler::GetShapeAndType(const NotNull<const AicpuShapeAndType
*data_type = static_cast<TypeId>(ms_type);
}
bool AicpuExtInfoHandler::UpdateEventId(const uint32_t event_id) {
bool AicpuExtInfoHandler::UpdateEventId(const uint32_t event_id) const {
if (async_wait_ == nullptr) {
MS_LOG(ERROR) << "async_wait_ is nullptr";
return false;
@ -296,7 +296,8 @@ bool AicpuExtInfoHandler::UpdateEventId(const uint32_t event_id) {
bool AicpuExtInfoHandler::UpdateSessionInfoId(const uint64_t session_id) const {
if (session_info_ == nullptr) {
MS_LOG(DEBUG) << "There is no session info in ext_info, no need update.";
MS_LOG(INFO) << "There is no session info in ext_info, no need update.";
return false;
}
session_info_->sessionId = session_id;

2
mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ext_info_handle.h
View File

@ -59,7 +59,7 @@ class AicpuExtInfoHandler {
[[nodiscard]] bool GetOutputShapeAndType(uint32_t output_index, NotNull<std::vector<int64_t> *> shape,
NotNull<TypeId *> data_type);
[[nodiscard]] bool UpdateEventId(const uint32_t event_id);
[[nodiscard]] bool UpdateEventId(const uint32_t event_id) const;
[[nodiscard]] bool UpdateSessionInfoId(const uint64_t session_id) const;
private:

4
mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_mod.cc
View File

@ -498,12 +498,12 @@ std::vector<TaskInfoPtr> AicpuOpKernelMod::GenTask(const std::vector<AddressPtr>
AicpuTaskInfoPtr task_info_ptr = std::make_shared<mindspore::ge::model_runner::AicpuTaskInfo>(
unique_name_, stream_id, node_so_, node_name_, node_def_str_, ext_info_, input_data_addrs, output_data_addrs,
NeedDump(), cust_kernel_, is_blocking, ms_event_id, unknow_type_);
ret_task_info.emplace_back(task_info_ptr);
(void)ret_task_info.emplace_back(task_info_ptr);
if (is_blocking) {
EventWaitTaskInfoPtr wait_task_info_ptr =
std::make_shared<mindspore::ge::model_runner::EventWaitTaskInfo>(unique_name_ + "_wait", stream_id, ms_event_id);
ret_task_info.emplace_back(wait_task_info_ptr);
(void)ret_task_info.emplace_back(wait_task_info_ptr);
}
MS_LOG(INFO) << "AicpuOpKernelMod GenTask end";