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

!16100 avoid call event method when event be set to nullptr 

From: @kisnwang
Reviewed-by: @zhoufeng54,@jjfeing
Signed-off-by: @jjfeing
This commit is contained in:
mindspore-ci-bot 2021-05-10 09:04:32 +08:00 committed by Gitee
parent 05ce361669 fede190fbc
commit 076f03cf32
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mindspore/core/ir/tensor.h
View File

@ -307,17 +307,20 @@ class Tensor : public MetaTensor {
}
void SetNeedWait(bool need_wait) {
if (event_ != nullptr) {
event_->set_need_wait(need_wait);
auto event = event_;
if (event != nullptr) {
event->set_need_wait(need_wait);
} else if (need_wait) {
event_ = std::make_shared<WaitEvent>();
event_->set_need_wait(need_wait);
event = std::make_shared<WaitEvent>();
event->set_need_wait(need_wait);
event_ = event;
}
}
bool NeedWait() const {
if (event_ != nullptr) {
return event_->need_wait();
auto event = event_;
if (event != nullptr) {
return event->need_wait();
}
return false;
}
@ -325,8 +328,8 @@ class Tensor : public MetaTensor {
void Wait() const {
if (event_ != nullptr) {
event_->Wait();
event_ = nullptr;
}
event_ = nullptr;
}
void SetDeviceEvent(const std::shared_ptr<DeviceEvent> &device_event) { device_event_ = device_event; }