---

yaml
---
r: 312283
b: refs/heads/tensorflow-merge
c: 71cd119
h: refs/heads/master
i:
  312281: 204b1be
  312279: c76e7bb

Author: jekbradbury

[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: 052c301eea9b1f903e1ad18c3f82af4701c2ab4e
+refs/heads/tensorflow-merge: 71cd119e77e565961224d0a92fe853c2945c7c81
 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/Ops.swift

@@ -1259,16 +1259,14 @@ public extension Tensor where Scalar : Numeric {
     where Scalar : TensorFlowFloatingPoint
   )
   func sum() -> Tensor {
-    let axes = Tensor<Int32>(rangeFrom: 0, to: rank, stride: 1)
-    return Raw.sum(self, reductionIndices: axes)
+    return Raw.sum(flattened(), reductionIndices: [0])
   }
 
   // NOTE: This overload is necessary, otherwise `sum()` would refer
   // to the variadic method `sum(squeezingAxes:)` with zero indices.
   @inlinable @inline(__always)
   func product() -> Tensor {
-    let axes = Tensor<Int32>(rangeFrom: 0, to: rank, stride: 1)
-    return Raw.prod(self, reductionIndices: axes)
+    return Raw.prod(flattened(), reductionIndices: [0])
   }
 
   // NOTE: This overload is necessary, otherwise `mean()` would refer
@@ -1279,8 +1277,7 @@ public extension Tensor where Scalar : Numeric {
   )
   @inlinable @inline(__always)
   func mean() -> Tensor {
-    let axes = Tensor<Int32>(rangeFrom: 0, to: rank, stride: 1)
-    return Raw.mean(self, reductionIndices: axes)
+    return Raw.mean(flattened(), reductionIndices: [0])
   }
 
   // NOTE: This overload is necessary, otherwise `mean()` would refer

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

@@ -179,6 +179,7 @@ TensorTests.testAllBackends("Reduction") {
   // 2 x 5
   let x = Tensor<Float>([[1, 2, 3, 4, 5], [1, 2, 3, 4, 5]])
   expectEqual(Tensor(30), x.sum().toHost(shape: []))
+  expectEqual(0, x.rank)
   expectEqual(Tensor(shape: [5], scalars: [2, 4, 6, 8, 10]),
               x.sum(squeezingAxes: 0).toHost(shape: []))
   expectEqual(Tensor(shape: [1, 5], scalars: [2, 4, 6, 8, 10]),