diff options
| author |  David Majnemer <majnemer@google.com> | 2017-09-28 10:07:51 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-09-28 10:23:10 -0700 |
| commit | 9d2d6cdfce769fee92f2211946855892c5d4ea4e (patch) | |
| tree | 780176d7940baa87610fff59b646ce4f15d9987e /tensorflow/compiler/xla/service/shape_inference_test.cc | |
| parent | 1eeca01d5c8702764f7597b5e9745573adefc88e (diff) | |
Automated g4 rollback of changelist 170130811
PiperOrigin-RevId: 170358888
Diffstat (limited to 'tensorflow/compiler/xla/service/shape_inference_test.cc')
| -rw-r--r-- | tensorflow/compiler/xla/service/shape_inference_test.cc | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/tensorflow/compiler/xla/service/shape_inference_test.cc b/tensorflow/compiler/xla/service/shape_inference_test.cc index 8df4a73229..7c9c7e8d6a 100644 --- a/tensorflow/compiler/xla/service/shape_inference_test.cc +++ b/tensorflow/compiler/xla/service/shape_inference_test.cc @@ -352,10 +352,8 @@ TEST_F(ShapeInferenceTest, Convolve) { // Dimension order: batch, feature, x0, x1 Shape lhs_shape = ShapeUtil::MakeShape(F32, {10, 11, 3, 4}); - dnums.set_input_batch_dimension(0); - dnums.set_output_batch_dimension(0); - dnums.set_input_feature_dimension(1); - dnums.set_output_feature_dimension(1); + dnums.set_batch_dimension(0); + dnums.set_feature_dimension(1); dnums.add_spatial_dimensions(2); dnums.add_spatial_dimensions(3); @@ -394,10 +392,8 @@ TEST_F(ShapeInferenceTest, ConvolveWithWindowDilation) { // Dimension order: batch, feature, x0, x1 Shape lhs_shape = ShapeUtil::MakeShape(F32, {10, 11, 103, 4}); - dnums.set_input_batch_dimension(0); - dnums.set_output_batch_dimension(0); - dnums.set_input_feature_dimension(1); - dnums.set_output_feature_dimension(1); + dnums.set_batch_dimension(0); + dnums.set_feature_dimension(1); dnums.add_spatial_dimensions(2); dnums.add_spatial_dimensions(3); @@ -437,10 +433,8 @@ TEST_F(ShapeInferenceTest, ConvolveWithBaseDilation) { // Dimension order: batch, feature, x0, x1 Shape lhs_shape = ShapeUtil::MakeShape(F32, {10, 11, 3, 4}); - dnums.set_input_batch_dimension(0); - dnums.set_output_batch_dimension(0); - dnums.set_input_feature_dimension(1); - dnums.set_output_feature_dimension(1); + dnums.set_batch_dimension(0); + dnums.set_feature_dimension(1); dnums.add_spatial_dimensions(2); dnums.add_spatial_dimensions(3); @@ -481,10 +475,8 @@ TEST_F(ShapeInferenceTest, ConvolveDimensionNumbersOverlapError) { Shape rhs_shape = ShapeUtil::MakeShape(F32, {12, 11, 3, 2}); ConvolutionDimensionNumbers dnums; - dnums.set_input_batch_dimension(3); - dnums.set_output_batch_dimension(3); - dnums.set_input_feature_dimension(2); - dnums.set_output_feature_dimension(2); + dnums.set_batch_dimension(3); + dnums.set_feature_dimension(2); dnums.add_spatial_dimensions(0); dnums.add_spatial_dimensions(1); dnums.set_kernel_input_feature_dimension(0); // duplicated with kernel_x0 |