---

yaml
---
r: 277501
b: refs/heads/tensorflow-merge
c: 0790a41
h: refs/heads/master
i:
  277499: 926a272

Author: rxwei

[refs]

@@ -1124,7 +1124,7 @@ refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-29-a: 1b087071edaea398480fb778e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-30-a: 8bc9e108e1480d9217299984e428c601c7aaac75
 refs/tags/swift-4.2.1-RELEASE: 02a6ca969ea1387475b6caeb69c31186df7d30b6
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-11-01-a: 3b0299288f8287094b9ef587f46df54f42a347af
-refs/heads/tensorflow-merge: 133501508aa0a8d80caa210d6a25e4d757750952
+refs/heads/tensorflow-merge: 0790a41665fc5b30f9099e6508177b6b87de0eec
 refs/heads/TensorFlowLite: b91446471276e37bbfe64767c875f3c7f7102954
 refs/heads/ad-side-effects: 19e0c0de1f59b0929c381925df2e8c72cdf4a728
 refs/heads/add-test-for-asan-compiler-crash: 3cdeecffb47bf28707b299fa2b5bdf0769a4a826

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

@@ -35,7 +35,7 @@ internal final class TensorBuffer<Scalar> {
   final class BoxedArray {
     var array: [Scalar]
 
-    init(_ array: [Scalar]) {
+    init(_ array: __owned [Scalar]) {
       self.array = array
     }
   }
@@ -292,7 +292,7 @@ public struct ShapedArray<Scalar> : _ShapedArrayProtocol {
   public private(set) var shape: [Int]
 
   /// Creates a `ShapedArray` from a `TensorBuffer` and a shape.
-  internal init(buffer: TensorBuffer<Scalar>, shape: [Int]) {
+  internal init(buffer: __owned TensorBuffer<Scalar>, shape: __owned [Int]) {
     precondition(buffer.count == shape.reduce(1, *),
       "The scalar count of the buffer does not match the shape.")
     self.buffer = buffer
@@ -349,19 +349,15 @@ public extension ShapedArray {
     self.init(buffer: other.buffer, shape: other.shape)
   }
 
-  init(shape: [Int], scalars: [Scalar]) {
-    let scalarCount = shape.reduce(1, *)
-    precondition(scalarCount == scalars.count, "Scalar count mismatch.")
-    let buffer = TensorBuffer<Scalar>.create(count: scalarCount) { buffPtr in
-      let ptr = buffPtr.baseAddress!
-      scalars.withUnsafeBufferPointer { arrayBuf in
-        ptr.initialize(from: arrayBuf.baseAddress!, count: scalarCount)
-      }
-    }
+  init(shape: __owned [Int], scalars: __owned [Scalar]) {
+    precondition(shape.reduce(1, *) == scalars.count, "Scalar count mismatch.")
+    let buffer = TensorBuffer<Scalar>(allocation: .native(.init(scalars)),
+                                      count: scalars.count)
     self.init(buffer: buffer, shape: shape)
   }
 
-  init<S : Sequence>(shape: [Int], scalars: S) where S.Element == Scalar {
+  init<S : Sequence>(shape: __owned [Int],
+                     scalars: __shared S) where S.Element == Scalar {
     let scalarCount = shape.reduce(1, *)
     let buffer = TensorBuffer<Scalar>.create(count: scalarCount) { buffPtr in
       let ptr = buffPtr.baseAddress!
@@ -381,25 +377,25 @@ public extension ShapedArray {
   }
 
   /// Creates a `ShapedArray` from a scalar value.
-  init(_ scalar: Scalar) {
-    let buffer = TensorBuffer<Scalar>.create(count: 1) { buffPtr in
-      let ptr = buffPtr.baseAddress!
-      ptr.initialize(to: scalar)
-    }
-    self.init(buffer: buffer, shape: [])
+  init(_ scalar: __owned Scalar) {
+    self.init(
+      buffer: TensorBuffer(allocation: .native(.init([scalar])), count: 1),
+      shape: []
+    )
   }
 
   /// Creates a `ShapedArray` with the specified shape and a single, repeated
   /// value.
   /// - Parameters:
   ///   - shape: The dimensions of the array.
   ///   - repeatedValue: The scalar value to repeat.
-  init(shape: [Int], repeating repeatedValue: Scalar) {
+  init(shape: __owned [Int], repeating repeatedValue: __owned Scalar) {
     let scalarCount = shape.reduce(1, *)
-    let buffer = TensorBuffer<Scalar>.create(count: scalarCount) { buffPtr in
-      let ptr = buffPtr.baseAddress!
-      ptr.initialize(repeating: repeatedValue, count: scalarCount)
-    }
+    let buffer = TensorBuffer<Scalar>(
+      allocation: .native(.init(Array(repeating: repeatedValue,
+                                      count: scalarCount))),
+      count: scalarCount
+    )
     self.init(buffer: buffer, shape: shape)
   }
 }
@@ -507,7 +503,7 @@ extension ShapedArray where Scalar : TensorFlowScalar {
   }
 
   @usableFromInline
-  func makeTensorHandle() -> TensorHandle<Scalar> {
+  __consuming func makeTensorHandle() -> TensorHandle<Scalar> {
     // This initializer is designed to optimize conversion from TF-allocated
     // `ShapedArray` instances.
     switch buffer.allocation {
@@ -533,7 +529,7 @@ extension ShapedArray where Scalar : TensorFlowScalar {
 
 /// Tensor conversion.
 public extension Tensor {
-  init(_ array: ShapedArray<Scalar>) {
+  init(_ array: __owned ShapedArray<Scalar>) {
     self.init(handle: array.makeTensorHandle())
   }
 }
@@ -670,8 +666,8 @@ public struct ShapedArraySlice<Scalar> : _ShapedArrayProtocol {
   /// subdimensional indices and subarray bounds.
   @inlinable
   internal init(
-    base: ShapedArray<Scalar>,
-    baseIndices indices: [Int] = [],
+    base: __owned ShapedArray<Scalar>,
+    baseIndices indices: __owned [Int] = [],
     bounds: Range<Int>? = nil
   ) {
     precondition(indices.count <= base.rank,
@@ -709,16 +705,17 @@ public extension ShapedArraySlice {
 
 /// Slice initializers.
 public extension ShapedArraySlice {
-  init(shape: [Int], scalars: [Scalar]) {
+  init(shape: __owned [Int], scalars: __owned [Scalar]) {
     self.init(base: ShapedArray(shape: shape, scalars: scalars))
   }
 
-  init<S : Sequence>(shape: [Int], scalars: S) where S.Element == Scalar {
+  init<S : Sequence>(shape: __owned [Int],
+                     scalars: __shared S) where S.Element == Scalar {
     self.init(base: ShapedArray(shape: shape, scalars: scalars))
   }
 
   /// Creates a `ShapedArraySlice` from a scalar value.
-  init(_ scalar: Scalar) {
+  init(_ scalar: __owned Scalar) {
     self.init(base: ShapedArray(scalar))
   }
 
@@ -727,7 +724,7 @@ public extension ShapedArraySlice {
   /// - Parameters:
   ///   - shape: The dimensions of the array.
   ///   - repeatedValue: The scalar value to repeat.
-  init(shape: [Int], repeating repeatedValue: Scalar) {
+  init(shape: __owned [Int], repeating repeatedValue: __owned Scalar) {
     self.init(base: ShapedArray(shape: shape, repeating: repeatedValue))
   }
 }
@@ -874,7 +871,7 @@ extension ShapedArraySlice : RandomAccessCollection, MutableCollection {
 
 /// Tensor conversion.
 public extension ShapedArraySlice where Scalar : TensorFlowScalar {
-  init(_ tensor: Tensor<Scalar>) {
+  init(_ tensor: __shared Tensor<Scalar>) {
     self.init(base: tensor.array)
   }
 }