experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix build.

Browse Source 
PiperOrigin-RevId: 204071277
This commit is contained in:
Anna R 2018-07-10 22:54:13 -07:00 committed by TensorFlower Gardener
parent f351e5ef6b
commit 249f124c1c
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tensorflow/compiler/xla/service/hlo_computation_test.cc
View File

@ -607,13 +607,14 @@ TEST_F(HloComputationTest, Stringification) {
auto* computation = module->AddEntryComputation(builder.Build()); auto* computation = module->AddEntryComputation(builder.Build());
auto options = HloPrintOptions().set_print_metadata(false); auto options = HloPrintOptions().set_print_metadata(false);
EXPECT_EQ(computation->ToString(options), const string expected_computation =
R"(%TransposeDot (x: f32[5,10], y: f32[20,10]) -> f32[5,20] { R"(%TransposeDot (x: f32[5,10], y: f32[20,10]) -> f32[5,20] {
%x = f32[5,10]{1,0} parameter(0) %x = f32[5,10]{1,0} parameter(0)
%y = f32[20,10]{1,0} parameter(1) %y = f32[20,10]{1,0} parameter(1)
%transpose = f32[10,20]{1,0} transpose(f32[20,10]{1,0} %y), dimensions={1,0} %transpose = f32[10,20]{1,0} transpose(f32[20,10]{1,0} %y), dimensions={1,0}
ROOT %dot = f32[5,20]{1,0} dot(f32[5,10]{1,0} %x, f32[10,20]{1,0} %transpose), lhs_contracting_dims={1}, rhs_contracting_dims={0} ROOT %dot = f32[5,20]{1,0} dot(f32[5,10]{1,0} %x, f32[10,20]{1,0} %transpose), lhs_contracting_dims={1}, rhs_contracting_dims={0}
})"); })";
EXPECT_EQ(computation->ToString(options), expected_computation);
} }
TEST_F(HloComputationTest, StringificationIndent) { TEST_F(HloComputationTest, StringificationIndent) {
@ -639,13 +640,14 @@ TEST_F(HloComputationTest, StringificationIndent) {
auto options = auto options =
HloPrintOptions().set_print_metadata(false).set_indent_amount(2); HloPrintOptions().set_print_metadata(false).set_indent_amount(2);
EXPECT_EQ(computation->ToString(options), const string expected_computation =
R"( %TransposeDot (x: f32[5,10], y: f32[20,10]) -> f32[5,20] { R"( %TransposeDot (x: f32[5,10], y: f32[20,10]) -> f32[5,20] {
%x = f32[5,10]{1,0} parameter(0) %x = f32[5,10]{1,0} parameter(0)
%y = f32[20,10]{1,0} parameter(1) %y = f32[20,10]{1,0} parameter(1)
%transpose = f32[10,20]{1,0} transpose(f32[20,10]{1,0} %y), dimensions={1,0} %transpose = f32[10,20]{1,0} transpose(f32[20,10]{1,0} %y), dimensions={1,0}
ROOT %dot = f32[5,20]{1,0} dot(f32[5,10]{1,0} %x, f32[10,20]{1,0} %transpose), lhs_contracting_dims={1}, rhs_contracting_dims={0} ROOT %dot = f32[5,20]{1,0} dot(f32[5,10]{1,0} %x, f32[10,20]{1,0} %transpose), lhs_contracting_dims={1}, rhs_contracting_dims={0}
})"); })";
EXPECT_EQ(computation->ToString(options), expected_computation);
} }
TEST_F(HloComputationTest, StringificationCanonical) { TEST_F(HloComputationTest, StringificationCanonical) {
@ -670,21 +672,23 @@ TEST_F(HloComputationTest, StringificationCanonical) {
auto* computation = module->AddEntryComputation(builder.Build()); auto* computation = module->AddEntryComputation(builder.Build());
auto options = HloPrintOptions().set_print_metadata(false); auto options = HloPrintOptions().set_print_metadata(false);
EXPECT_EQ(computation->ToString(options), const string expected_computation1 =
R"(%TransposeDot (x: f32[5,10], y: f32[20,10]) -> f32[5,20] { R"(%TransposeDot (x: f32[5,10], y: f32[20,10]) -> f32[5,20] {
%x = f32[5,10]{1,0} parameter(0) %x = f32[5,10]{1,0} parameter(0)
%y = f32[20,10]{1,0} parameter(1) %y = f32[20,10]{1,0} parameter(1)
%transpose = f32[10,20]{1,0} transpose(f32[20,10]{1,0} %y), dimensions={1,0} %transpose = f32[10,20]{1,0} transpose(f32[20,10]{1,0} %y), dimensions={1,0}
ROOT %dot = f32[5,20]{1,0} dot(f32[5,10]{1,0} %x, f32[10,20]{1,0} %transpose), lhs_contracting_dims={1}, rhs_contracting_dims={0} ROOT %dot = f32[5,20]{1,0} dot(f32[5,10]{1,0} %x, f32[10,20]{1,0} %transpose), lhs_contracting_dims={1}, rhs_contracting_dims={0}
})"); })";
EXPECT_EQ(computation->ToString(options), expected_computation1);
options = HloPrintOptions().Canonical(); options = HloPrintOptions().Canonical();
EXPECT_EQ(computation->ToString(options), R"(TransposeDot { const string expected_computation2 = R"(TransposeDot {
tmp_0 = f32[5,10]{1,0} parameter(0) tmp_0 = f32[5,10]{1,0} parameter(0)
tmp_1 = f32[20,10]{1,0} parameter(1) tmp_1 = f32[20,10]{1,0} parameter(1)
tmp_2 = f32[10,20]{1,0} transpose(f32[20,10]{1,0} tmp_1), dimensions={1,0} tmp_2 = f32[10,20]{1,0} transpose(f32[20,10]{1,0} tmp_1), dimensions={1,0}
ROOT tmp_3 = f32[5,20]{1,0} dot(f32[5,10]{1,0} tmp_0, f32[10,20]{1,0} tmp_2), lhs_contracting_dims={1}, rhs_contracting_dims={0} ROOT tmp_3 = f32[5,20]{1,0} dot(f32[5,10]{1,0} tmp_0, f32[10,20]{1,0} tmp_2), lhs_contracting_dims={1}, rhs_contracting_dims={0}
})"); })";
EXPECT_EQ(computation->ToString(options), expected_computation2);
} }
} // namespace } // namespace

17
tensorflow/compiler/xla/service/hlo_instruction_test.cc
View File

@ -1455,15 +1455,15 @@ TEST_F(HloInstructionTest, CanonnicalStringificationFusion) {
HloInstruction* fusion = computation->CreateFusionInstruction( HloInstruction* fusion = computation->CreateFusionInstruction(
{dot, reshape}, HloInstruction::FusionKind::kLoop); {dot, reshape}, HloInstruction::FusionKind::kLoop);
EXPECT_EQ( const string expected_fusion =
fusion->ToString(options),
R"(f32[5,20]{1,0} fusion(f32[5,10]{1,0}, f32[20,10]{1,0}), kind=kLoop, calls= R"(f32[5,20]{1,0} fusion(f32[5,10]{1,0}, f32[20,10]{1,0}), kind=kLoop, calls=
{ {
tmp_0 = f32[5,10]{1,0} parameter(0) tmp_0 = f32[5,10]{1,0} parameter(0)
tmp_1 = f32[20,10]{1,0} parameter(1) tmp_1 = f32[20,10]{1,0} parameter(1)
tmp_2 = f32[10,20]{1,0} transpose(f32[20,10]{1,0} tmp_1), dimensions={1,0} tmp_2 = f32[10,20]{1,0} transpose(f32[20,10]{1,0} tmp_1), dimensions={1,0}
ROOT tmp_3 = f32[5,20]{1,0} dot(f32[5,10]{1,0} tmp_0, f32[10,20]{1,0} tmp_2), lhs_contracting_dims={1}, rhs_contracting_dims={0} ROOT tmp_3 = f32[5,20]{1,0} dot(f32[5,10]{1,0} tmp_0, f32[10,20]{1,0} tmp_2), lhs_contracting_dims={1}, rhs_contracting_dims={0}
})"); })";
EXPECT_EQ(fusion->ToString(options), expected_fusion);
} }
TEST_F(HloInstructionTest, CanonnicalStringificationWhile) { TEST_F(HloInstructionTest, CanonnicalStringificationWhile) {
@ -1495,7 +1495,7 @@ TEST_F(HloInstructionTest, CanonnicalStringificationWhile) {
HloInstruction::CreateWhile(sout, computation, computation, x)); HloInstruction::CreateWhile(sout, computation, computation, x));
auto options = HloPrintOptions().Canonical(); auto options = HloPrintOptions().Canonical();
EXPECT_EQ(loop->ToString(options), const string expected_loop =
R"(f32[5,20]{1,0} while(f32[5,10]{1,0}), condition= R"(f32[5,20]{1,0} while(f32[5,10]{1,0}), condition=
{ {
tmp_0 = f32[5,10]{1,0} parameter(0) tmp_0 = f32[5,10]{1,0} parameter(0)
@ -1518,7 +1518,8 @@ TEST_F(HloInstructionTest, CanonnicalStringificationWhile) {
tmp_2 = f32[10,20]{1,0} transpose(f32[20,10]{1,0} tmp_1), dimensions={1,0} tmp_2 = f32[10,20]{1,0} transpose(f32[20,10]{1,0} tmp_1), dimensions={1,0}
ROOT tmp_3 = f32[5,20]{1,0} dot(f32[5,10]{1,0} tmp_0, f32[10,20]{1,0} tmp_2), lhs_contracting_dims={1}, rhs_contracting_dims={0} ROOT tmp_3 = f32[5,20]{1,0} dot(f32[5,10]{1,0} tmp_0, f32[10,20]{1,0} tmp_2), lhs_contracting_dims={1}, rhs_contracting_dims={0}
} }
})"); })";
EXPECT_EQ(loop->ToString(options), expected_loop);
} }
TEST_F(HloInstructionTest, CanonnicalStringificationConditional) { TEST_F(HloInstructionTest, CanonnicalStringificationConditional) {
@ -1555,8 +1556,7 @@ TEST_F(HloInstructionTest, CanonnicalStringificationConditional) {
builder.AddInstruction(HloInstruction::CreateConditional( builder.AddInstruction(HloInstruction::CreateConditional(
sout, pred, x, computation, x, computation)); sout, pred, x, computation, x, computation));
auto options = HloPrintOptions().Canonical(); auto options = HloPrintOptions().Canonical();
EXPECT_EQ( const string expected_conditional =
conditional->ToString(options),
R"(f32[5,20]{1,0} conditional(pred[], f32[5,10]{1,0}, f32[5,10]{1,0}), true_computation= R"(f32[5,20]{1,0} conditional(pred[], f32[5,10]{1,0}, f32[5,10]{1,0}), true_computation=
{ {
tmp_0 = f32[5,10]{1,0} parameter(0) tmp_0 = f32[5,10]{1,0} parameter(0)
@ -1579,7 +1579,8 @@ TEST_F(HloInstructionTest, CanonnicalStringificationConditional) {
tmp_2 = f32[10,20]{1,0} transpose(f32[20,10]{1,0} tmp_1), dimensions={1,0} tmp_2 = f32[10,20]{1,0} transpose(f32[20,10]{1,0} tmp_1), dimensions={1,0}
ROOT tmp_3 = f32[5,20]{1,0} dot(f32[5,10]{1,0} tmp_0, f32[10,20]{1,0} tmp_2), lhs_contracting_dims={1}, rhs_contracting_dims={0} ROOT tmp_3 = f32[5,20]{1,0} dot(f32[5,10]{1,0} tmp_0, f32[10,20]{1,0} tmp_2), lhs_contracting_dims={1}, rhs_contracting_dims={0}
} }
})"); })";
EXPECT_EQ(conditional->ToString(options), expected_conditional);
} }
TEST_F(HloInstructionTest, CheckDeepClone) { TEST_F(HloInstructionTest, CheckDeepClone) {