---

yaml
---
r: 312319
b: refs/heads/tensorflow-merge
c: 0c45261
h: refs/heads/master
i:
  312317: 9b90a11
  312315: f8c7173
  312311: 295240a
  312303: c665280
  312287: 21577de
  312255: 0044509
  312191: d167e99
  312063: 25ec2b6
  311807: d8613e9
  311295: 881526f

Author: ksasi

[refs]

@@ -1379,7 +1379,7 @@ refs/heads/chase-my-tail: 8bb91443a9e81bbfac92a2621a0af887a1da8dbf
 refs/heads/consider-outer-alternatives: 708bac749ec60a22a79e2eefbe734f9488a7370d
 refs/heads/revert-25740-oops-i-linked-it-again: fdd41aeb682fc488572bdc1cf71b2ff6997ba576
 refs/heads/swift-5.1-branch-06-12-2019: e63b7b2d3b93c48232d386099d0ec525d21d8f8d
-refs/heads/tensorflow-merge: 716575e97ee087c76c78ea5adf1a2ca541baad71
+refs/heads/tensorflow-merge: 0c452616820bfbc4f3197dd418c74adadc830b5c
 refs/heads/update-checkout-sha-info: 5832743c5c2a842976c42a508a4c6dcceefb0aef
 refs/tags/swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-12-a: 228f0448d9bb909aacbba4afcb7c600a405d15da
 refs/tags/swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-14-a: 922861a77b5fc2bf46bc917da70ceb15eef76836

branches/tensorflow-merge/stdlib/public/TensorFlow/TensorShape.swift

@@ -159,3 +159,9 @@ extension TensorShape : Codable {
     self.init(dimensions)
   }
 }
+
+extension TensorShape : CustomStringConvertible {
+  public var description: String {
+    return dimensions.description
+  }
+}

branches/tensorflow-merge/test/TensorFlowRuntime/tensor.swift

@@ -623,6 +623,11 @@ TensorTests.testAllBackends("SimpleCond") {
   expectEqual(0, selectValue(true).scalar)
 }
 
+TensorTests.testAllBackends("TensorShapeDescription") {
+  expectEqual("[2, 2]", Tensor<Int32>(ones: [2, 2]).shape.description)
+  expectEqual("[]", Tensor(1).shape.description)
+}
+
 @inline(never)
 func testXORInference() {
   func xor(_ x: Float, _ y: Float) -> Float {