diff options
Diffstat (limited to 'tensorflow/compiler/xla/service/cpu/tests/cpu_fusion_test.cc')
| -rw-r--r-- | tensorflow/compiler/xla/service/cpu/tests/cpu_fusion_test.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tensorflow/compiler/xla/service/cpu/tests/cpu_fusion_test.cc b/tensorflow/compiler/xla/service/cpu/tests/cpu_fusion_test.cc index 783b2820e9..d98856fdbf 100644 --- a/tensorflow/compiler/xla/service/cpu/tests/cpu_fusion_test.cc +++ b/tensorflow/compiler/xla/service/cpu/tests/cpu_fusion_test.cc @@ -17,7 +17,7 @@ limitations under the License. #include <utility> #include <vector> -#include "tensorflow/compiler/xla/literal_util.h" +#include "tensorflow/compiler/xla/literal.h" #include "tensorflow/compiler/xla/ptr_util.h" #include "tensorflow/compiler/xla/service/cpu/cpu_instruction_fusion.h" #include "tensorflow/compiler/xla/service/hlo_computation.h" @@ -43,8 +43,8 @@ class CpuFusionTest : public HloTestBase { TEST_F(CpuFusionTest, FuseTwoElementwiseOps) { auto builder = HloComputation::Builder(TestName()); - auto input_literal1 = Literal::CreateR1<float>({1.0, 2.0, 3.0}); - auto input_literal2 = Literal::CreateR1<float>({-2.0, -42.0, 2.0}); + auto input_literal1 = LiteralUtil::CreateR1<float>({1.0, 2.0, 3.0}); + auto input_literal2 = LiteralUtil::CreateR1<float>({-2.0, -42.0, 2.0}); Shape vshape = input_literal1->shape(); auto input1 = builder.AddInstruction( @@ -83,7 +83,7 @@ TEST_F(CpuFusionTest, FuseTwoElementwiseOps) { TEST_F(CpuFusionTest, FuseElementwiseOpChain) { auto builder = HloComputation::Builder(TestName()); - auto input_literal = Literal::CreateR1<float>({-1.5, -2.5, -3.0}); + auto input_literal = LiteralUtil::CreateR1<float>({-1.5, -2.5, -3.0}); Shape vshape = input_literal->shape(); auto input = builder.AddInstruction( @@ -99,7 +99,7 @@ TEST_F(CpuFusionTest, FuseElementwiseOpChain) { auto two = builder.AddInstruction(HloInstruction::CreateBroadcast( vshape, builder.AddInstruction( - HloInstruction::CreateConstant(Literal::CreateR0<float>(2.0))), + HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(2.0))), {})); builder.AddInstruction( HloInstruction::CreateBinary(vshape, HloOpcode::kMultiply, two, floor)); @@ -134,7 +134,7 @@ TEST_F(CpuFusionTest, ElementwiseOpChainWithNonfusableInstruction) { // middle. auto module = CreateNewModule(); auto builder = HloComputation::Builder(TestName()); - auto input_literal = Literal::CreateR1<float>({-1.5, -2.5, -3.0}); + auto input_literal = LiteralUtil::CreateR1<float>({-1.5, -2.5, -3.0}); Shape vshape = input_literal->shape(); auto input = builder.AddInstruction( @@ -166,7 +166,7 @@ TEST_F(CpuFusionTest, ElementwiseOpChainWithNonfusableInstruction) { ShapeUtil::MakeShape(F32, {6, 1}), concatenate)), /*init_value=*/ builder.AddInstruction( - HloInstruction::CreateConstant(Literal::CreateR0<float>(0))), + HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(0))), /*dimensions_to_reduce=*/{1}, add_f32)); auto exp = builder.AddInstruction( @@ -176,7 +176,7 @@ TEST_F(CpuFusionTest, ElementwiseOpChainWithNonfusableInstruction) { auto two = builder.AddInstruction(HloInstruction::CreateBroadcast( cshape, builder.AddInstruction( - HloInstruction::CreateConstant(Literal::CreateR0<float>(2.0))), + HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(2.0))), {})); builder.AddInstruction( HloInstruction::CreateBinary(cshape, HloOpcode::kMultiply, two, floor)); @@ -231,7 +231,7 @@ TEST_F(CpuFusionTest, TestOperandOrderToAvoidDuplication) { // operand vectors. Test for this problem by counting the number of nodes in // each fusion instruction to ensure that negate is not duplicated. auto builder = HloComputation::Builder(TestName()); - auto input_literal = Literal::CreateR1<float>({1.0, 2.0, 3.0}); + auto input_literal = LiteralUtil::CreateR1<float>({1.0, 2.0, 3.0}); Shape vshape = input_literal->shape(); auto constant = builder.AddInstruction( @@ -292,10 +292,10 @@ TEST_F(CpuFusionTest, DoNotDuplicateExpensiveOps) { // computation. The duplication is caused by the other use of exp2 in the // tuple. auto builder = HloComputation::Builder(TestName()); - auto input_literal1 = Literal::CreateR1<float>({1.0, 2.0, 3.0}); - auto input_literal2 = Literal::CreateR1<float>({-2.0, -42.0, 2.0}); + auto input_literal1 = LiteralUtil::CreateR1<float>({1.0, 2.0, 3.0}); + auto input_literal2 = LiteralUtil::CreateR1<float>({-2.0, -42.0, 2.0}); auto constant = builder.AddInstruction( - HloInstruction::CreateConstant(Literal::CreateR0<float>(42.0))); + HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(42.0))); Shape shape = constant->shape(); auto exp1 = builder.AddInstruction( |