diff options
author | Avijit <Avijit.Chakraborty@intel.com> | 2018-07-25 01:08:01 -0700 |
---|---|---|
committer | Avijit <Avijit.Chakraborty@intel.com> | 2018-07-25 01:08:01 -0700 |
commit | 1cdacb8b10d0b4687387be5fd8be978d68602a1d (patch) | |
tree | a2bf88798854a426f073325eb85d85b3ab914418 /tensorflow/core/framework/function.cc | |
parent | f88a6f93bee89c610fa8b399d037c7a33c1a0a3e (diff) | |
parent | 3f454e4060d855f43eebe0cdc27d8c24f906d430 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tensorflow/core/framework/function.cc')
-rw-r--r-- | tensorflow/core/framework/function.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tensorflow/core/framework/function.cc b/tensorflow/core/framework/function.cc index 88d9d65f5a..57bcc0f513 100644 --- a/tensorflow/core/framework/function.cc +++ b/tensorflow/core/framework/function.cc @@ -865,12 +865,15 @@ Status FunctionCallFrame::GetRetvals(std::vector<Tensor>* rets) const { return Status::OK(); } -Status FunctionCallFrame::ConsumeRetvals(std::vector<Tensor>* rets) { +Status FunctionCallFrame::ConsumeRetvals(std::vector<Tensor>* rets, + bool allow_dead_tensors) { rets->clear(); rets->reserve(rets_.size()); for (size_t i = 0; i < rets_.size(); ++i) { if (rets_[i].has_val) { rets->emplace_back(std::move(rets_[i].val)); + } else if (allow_dead_tensors) { + rets->emplace_back(); } else { return errors::Internal("Retval[", i, "] does not have value"); } |