From 7c7ed2b64c6eeee3f92a215e872046c95d722020 Mon Sep 17 00:00:00 2001
From: Justin Lebar <jlebar@google.com>
Date: Tue, 4 Dec 2018 23:17:30 -0800
Subject: [PATCH] [XLA] Print out shapes' layouts in local_client's
 "shape/layout doesn't match" error.

Previously we'd say "shape/layout doesn't match" and then print out the shapes
without their layouts!

PiperOrigin-RevId: 224105237
---
 tensorflow/compiler/xla/client/local_client.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/compiler/xla/client/local_client.cc b/tensorflow/compiler/xla/client/local_client.cc
index aaa5d6989ee..049cd15738a 100644
--- a/tensorflow/compiler/xla/client/local_client.cc
+++ b/tensorflow/compiler/xla/client/local_client.cc
@@ -71,9 +71,9 @@ Status LocalExecutable::ValidateExecutionOptions(
           "parameter "
           "%d: want %s, got %s",
           i,
-          ShapeUtil::HumanString(
+          ShapeUtil::HumanStringWithLayout(
               computation_layout.parameter_layout(i).shape()),
-          ShapeUtil::HumanString(arguments[i]->on_host_shape()));
+          ShapeUtil::HumanStringWithLayout(arguments[i]->on_host_shape()));
     }
   }