From 3825d321fb968678da6d5b2067e01414230dfe39 Mon Sep 17 00:00:00 2001
From: Blake Hechtman <blakehechtman@google.com>
Date: Thu, 15 Oct 2020 06:38:36 -0700
Subject: [PATCH] [XLA] No-op reshapes should not return true for inserting or
deleting one-sized dimensions.
PiperOrigin-RevId: 337296604
Change-Id: Ia87c85568c69908d61fdf4a5be2824f0e356cafd
---
tensorflow/compiler/xla/shape_util.cc | 3 +--
tensorflow/compiler/xla/shape_util_test.cc | 2 --
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/tensorflow/compiler/xla/shape_util.cc b/tensorflow/compiler/xla/shape_util.cc
index 238879ebdc0..0c877bf6102 100644
--- a/tensorflow/compiler/xla/shape_util.cc
+++ b/tensorflow/compiler/xla/shape_util.cc
@@ -1074,8 +1074,7 @@ ShapeUtil::InsertedOrDeleted1SizedDimensions(const Shape& shape_pre,
}
}
- return std::make_tuple(!deleted_indices.empty() || !inserted_indices.empty(),
- deleted_indices, inserted_indices);
+ return std::make_tuple(true, deleted_indices, inserted_indices);
}
/* static */ std::vector<std::pair<int64, int64>>
diff --git a/tensorflow/compiler/xla/shape_util_test.cc b/tensorflow/compiler/xla/shape_util_test.cc
index 414b53d4f67..4e2030667ee 100644
--- a/tensorflow/compiler/xla/shape_util_test.cc
+++ b/tensorflow/compiler/xla/shape_util_test.cc
@@ -558,8 +558,6 @@ TEST(ShapeUtilTest, InsertedOrDeleted1SizedDimensions) {
ShapeUtil::InsertedOrDeleted1SizedDimensions(shape0, shape1)));
EXPECT_FALSE(std::get<0>(
ShapeUtil::InsertedOrDeleted1SizedDimensions(shape0, shape2)));
- EXPECT_FALSE(std::get<0>(
- ShapeUtil::InsertedOrDeleted1SizedDimensions(shape0, shape0)));
}
TEST(ShapeUtilTest, ForEachIndex) {