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] Include sort in ReplaceComputations check #30083

Merged
merged 2 commits into from
Jul 4, 2019
Merged

[XLA] Include sort in ReplaceComputations check #30083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
570b7e7
Sort has a subcomputation and should be included in a ReplaceComputat…
DavidNorman Jun 24, 2019
d933f19
Add a test for the replace computations on a sort op
DavidNorman Jul 3, 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
3 changes: 2 additions & 1 deletion tensorflow/compiler/xla/service/hlo_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ void HloModule::ReplaceComputations(
case HloOpcode::kMap:
case HloOpcode::kReduce:
case HloOpcode::kReduceWindow:
case HloOpcode::kScatter: {
case HloOpcode::kScatter:
case HloOpcode::kSort: {
HloComputation* new_arg = tensorflow::gtl::FindWithDefault(
replacements, instruction->to_apply(), nullptr);
if (new_arg != nullptr) {
Expand Down
51 changes: 51 additions & 0 deletions tensorflow/compiler/xla/service/hlo_module_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,57 @@ ENTRY ReduceR3ToR2.v3 {
}
}

TEST_F(HloModuleTest, VerifyReplaceComptationsWithSortOp) {
const string text = R"(
HloModule sort

compare {
p.0.lhs = f32[] parameter(0)
p.0.rhs = f32[] parameter(1)
p.1.lhs = s32[] parameter(2)
p.1.rhs = s32[] parameter(3)
ROOT lt = pred[] compare(p.0.lhs, p.0.rhs), direction=LT
}

ENTRY top {
p.0 = f32[32] parameter(0)
p.1 = s32[32] parameter(1)
ROOT %sort.148.1589 = (f32[32], s32[32]) sort(p.0, p.1), dimensions={0}, to_apply=compare
}
)";

TF_ASSERT_OK_AND_ASSIGN(std::unique_ptr<HloModule> module,ParseHloString(text));

// Create a replacement computation
HloComputation* new_comp;
{
auto b = HloComputation::Builder("Fused");
auto p0 = b.AddInstruction(HloInstruction::CreateParameter(0, r0f32_, "p0"));
auto p1 = b.AddInstruction(HloInstruction::CreateParameter(1, r0f32_, "p1"));
auto p2 = b.AddInstruction(HloInstruction::CreateParameter(2, r0f32_, "p2"));
auto p3 = b.AddInstruction(HloInstruction::CreateParameter(3, r0f32_, "p3"));
b.AddInstruction(
HloInstruction::CreateCompare(ShapeUtil::MakeShape(PRED, {}), p0, p1,
ComparisonDirection::kGt));
new_comp = module->AddEmbeddedComputation(b.Build());
}


HloComputation* entry = module->entry_computation();
HloInstruction* root = entry->root_instruction();
EXPECT_EQ(root->to_apply()->root_instruction()->opcode(),
HloOpcode::kCompare);
EXPECT_EQ(root->to_apply()->root_instruction()->comparison_direction(),
ComparisonDirection::kLt);

std::unordered_map<HloComputation*, HloComputation*> replacement;
replacement[root->to_apply()] = new_comp;
module->ReplaceComputations(replacement);

EXPECT_EQ(root->to_apply(), new_comp);
}


} // namespace

} // namespace xla