Browse Source

Revert "avoid call event method when event be set to nullptr"

This reverts commit fede190fbc.
tags/v1.3.0
chendongsheng 5 years ago
parent
commit
d92c366135
1 changed files with 7 additions and 10 deletions
  1. +7
    -10
      mindspore/core/ir/tensor.h

+ 7
- 10
mindspore/core/ir/tensor.h View File

@@ -307,20 +307,17 @@ class Tensor : public MetaTensor {
}

void SetNeedWait(bool need_wait) {
auto event = event_;
if (event != nullptr) {
event->set_need_wait(need_wait);
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_ = event;
event_ = std::make_shared<WaitEvent>();
event_->set_need_wait(need_wait);
}
}

bool NeedWait() const {
auto event = event_;
if (event != nullptr) {
return event->need_wait();
if (event_ != nullptr) {
return event_->need_wait();
}
return false;
}
@@ -328,8 +325,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; }


Loading…
Cancel
Save