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

[XLA] Validate shape on construction during parsing.

Browse Source 
PiperOrigin-RevId: 218892346
This commit is contained in:
Michael Kuperstein 2018-10-26 12:04:50 -07:00 committed by TensorFlower Gardener
parent 9c5fa10f2e
commit 68881e62a8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tensorflow/compiler/xla/shape_util.cc
View File

@ -149,7 +149,8 @@ StatusOr<Shape> MakeShapeWithLayoutInternal(
return InvalidArgument("Unsupported element type: %s",
PrimitiveType_Name(element_type));
}
Shape shape = ShapeUtil::MakeShape(element_type, dimensions);
TF_ASSIGN_OR_RETURN(Shape shape,
ShapeUtil::MakeValidatedShape(element_type, dimensions));
auto min2maj = shape.mutable_layout()->mutable_minor_to_major();
min2maj->Clear();
for (int64 value : minor_to_major) {
@ -648,7 +649,8 @@ StatusOr<Shape> ParseShapeStringInternal(absl::string_view* s) {
result = ShapeUtil::MakeTokenShape();
} else if (format_string.empty() && layout_string.empty()) {
// Create a shape without a layout set.
result = ShapeUtil::MakeShape(primitive_type, dimensions);
TF_ASSIGN_OR_RETURN(
result, ShapeUtil::MakeValidatedShape(primitive_type, dimensions));
} else if (format_string == "sparse") {
TF_ASSIGN_OR_RETURN(int64 max_elements, string_to_int64(layout_string));
result = ShapeUtil::MakeShapeWithSparseLayout(primitive_type, dimensions,