message: [XLA] Do not try to force a particular layout when converting from an Effective
  Rank 1 to any other effective Rank 1.
diff: @@ -1012,7 +1012,7 @@ std::unique_ptr<Layout> LayoutAssignment::ChooseOperandLayoutFromOutputLayout(
  // operations. For similar reasons, if the operand and output have the same
  // rank, try to match the operand's layout to the output.
  if (ShapeUtil::TrueRank(operand->shape()) == 1 &&
  - instruction->shape().rank() == 1) {
  + ShapeUtil::TrueRank(instruction->shape()) == 1) {
  // Don't assign a layout in case of R1 -> effective R1 reshape.
  return nullptr;
  }
  @@ -1072,7 +1072,7 @@ std::unique_ptr<Layout> LayoutAssignment::ChooseOutputLayoutFromOperandLayout(
  // reshape is a bitcast when using the same layout. This may avoid copy
  // operations. For similar reasons, if the operand and output have the same
  // rank, try to match the outputs's layout to the operand.
  - if (operand->shape().rank() == 1 &&
  + if (ShapeUtil::TrueRank(operand->shape()) == 1 &&
  ShapeUtil::TrueRank(user->shape()) == 1) {
  // Don't assign a layout in case of R1 -> effective R1 reshape.
  return nullptr;
  