Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[XLA] HloEvaluator - use TF_ASSIGN_OR_RETURN for HandleCall, HandleFusion and HandleConditional #20967

Merged
merged 9 commits into from Mar 9, 2019
Merged

[XLA] HloEvaluator - use TF_ASSIGN_OR_RETURN for HandleCall, HandleFusion and HandleConditional #20967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
435a34c
[XLA] HloEvaluator - use TF_ASSIGN_OR_RETURN for HandleCall
georgepaw Jul 19, 2018
991e749
Update how literals are created
georgepaw Sep 13, 2018
53dc566
Always use TF_ASSIGN_OR_RETURN for getting literals in hlo_evaluator
georgepaw Sep 14, 2018
2a021c2
Change Evaluate to return StatusOr and add new tests
georgepaw Sep 14, 2018
a58b878
Change assert to expect, update comments
georgepaw Sep 17, 2018
86191cb
Merge branch 'master' into hlo_evaluator_handle_call
georgepaw Oct 10, 2018
f2839dc
Wrap new tests from the merge in TF_ASSERT_OK_AND_ASSIGN
georgepaw Oct 10, 2018
79e843f
Fix styling
georgepaw Oct 16, 2018
8d91668
Merge branch 'master' into hlo_evaluator_handle_call
kayzhu Mar 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 5 additions & 8 deletions tensorflow/compiler/xla/service/hlo_evaluator.cc
View file
Open in desktop
Expand Up @@ -1216,8 +1216,7 @@ Status HloEvaluator::HandleCall(HloInstruction* call) {
HloEvaluator embedded_evaluator;
embedded_evaluator.set_dynamic_dimension_inference(
dynamic_dimension_inference_);
Literal result = embedded_evaluator.Evaluate(*computation, arg_literals)
.ConsumeValueOrDie();
TF_ASSIGN_OR_RETURN(Literal result, embedded_evaluator.Evaluate(*computation, arg_literals));

evaluated_[call] = std::move(result);
return Status::OK();
Expand Down Expand Up @@ -1251,9 +1250,8 @@ Status HloEvaluator::HandleFusion(HloInstruction* fusion) {
HloEvaluator embedded_evaluator;
embedded_evaluator.set_dynamic_dimension_inference(
dynamic_dimension_inference_);
Literal result =
embedded_evaluator.Evaluate(*readded_computation, arg_literals)
.ConsumeValueOrDie();
TF_ASSIGN_OR_RETURN(Literal result,
embedded_evaluator.Evaluate(*readded_computation, arg_literals));

evaluated_[fusion] = std::move(result);
return Status::OK();
Expand All @@ -1277,10 +1275,9 @@ Status HloEvaluator::HandleConditional(HloInstruction* conditional) {
HloEvaluator embedded_evaluator;
embedded_evaluator.set_dynamic_dimension_inference(
dynamic_dimension_inference_);
Literal result = embedded_evaluator
TF_ASSIGN_OR_RETURN(Literal result, embedded_evaluator
.Evaluate(*conditional->branch_computation(branch_index),
{&branch_computation_arg})
.ConsumeValueOrDie();
{&branch_computation_arg}));

evaluated_[conditional] = std::move(result);
return Status::OK();
Expand Down