Merge remote-tracking branch 'origin/main' into feature/ppca

Author: ProfFan

Package.resolved

@@ -1,15 +1,6 @@
 {
   "object": {
     "pins": [
-      {
-        "package": "Benchmark",
-        "repositoryURL": "https://github.com/google/swift-benchmark.git",
-        "state": {
-          "branch": null,
-          "revision": "8e0ef8bb7482ab97dcd2cd1d6855bd38921c345d",
-          "version": "0.1.0"
-        }
-      },
       {
         "package": "CSV.swift",
         "repositoryURL": "https://github.com/yaslab/CSV.swift.git",
@@ -46,6 +37,33 @@
           "version": "0.3.1"
         }
       },
+      {
+        "package": "Benchmark",
+        "repositoryURL": "https://github.com/google/swift-benchmark.git",
+        "state": {
+          "branch": null,
+          "revision": "8e0ef8bb7482ab97dcd2cd1d6855bd38921c345d",
+          "version": "0.1.0"
+        }
+      },
+      {
+        "package": "swift-models",
+        "repositoryURL": "https://github.com/tensorflow/swift-models.git",
+        "state": {
+          "branch": null,
+          "revision": "b2fc0325bf9d476bf2d7a4cd0a09d36486c506e4",
+          "version": null
+        }
+      },
+      {
+        "package": "SwiftProtobuf",
+        "repositoryURL": "https://github.com/apple/swift-protobuf.git",
+        "state": {
+          "branch": null,
+          "revision": "da9a52be9cd36c63993291ce3f1b65dafcd1e826",
+          "version": "1.14.0"
+        }
+      },
       {
         "package": "swift-tools-support-core",
         "repositoryURL": "https://github.com/apple/swift-tools-support-core.git",

Sources/SwiftFusion/Core/TensorVector.swift

@@ -128,11 +128,11 @@ extension TensorVector: Vector {
 
   /// Returns the result of calling `body` on the scalars of `self`.
   public mutating func withUnsafeMutableBufferPointer<R>(
-    _ body: (UnsafeMutableBufferPointer<Double>) throws -> R
+    _ body: (inout UnsafeMutableBufferPointer<Double>) throws -> R
   ) rethrows -> R {
     var scalars = self.tensor.scalars
     let r = try scalars.withUnsafeMutableBufferPointer { b in
-      try body(b)
+      try body(&b)
     }
     self.tensor = Tensor(shape: self.shape, scalars: scalars)
     return r

Sources/SwiftFusion/Core/Vector.swift

@@ -78,7 +78,7 @@ public protocol Vector: Differentiable where Self.TangentVector == Self {
   /// A default is provided that is correct for types that are represented as contiguous scalars
   /// in memory.
   mutating func withUnsafeMutableBufferPointer<R>(
-    _ body: (UnsafeMutableBufferPointer<Double>) throws -> R
+    _ body: (inout UnsafeMutableBufferPointer<Double>) throws -> R
   ) rethrows -> R
   #endif
 }
@@ -233,14 +233,13 @@ extension Vector {
 
   /// Returns the result of calling `body` on the scalars of `self`.
   public mutating func withUnsafeMutableBufferPointer<R>(
-    _ body: (UnsafeMutableBufferPointer<Double>) throws -> R
+    _ body: (inout UnsafeMutableBufferPointer<Double>) throws -> R
   ) rethrows -> R {
-    return try withUnsafeMutablePointer(to: &self) { [dimension = self.dimension] p in
-      try body(
-          UnsafeMutableBufferPointer<Double>(
-              start: UnsafeMutableRawPointer(p)
-                  .assumingMemoryBound(to: Double.self),
-              count: dimension))
+    try withUnsafeMutablePointer(to: &self) { [dimension = self.dimension] p in
+      var b = UnsafeMutableBufferPointer<Double>(
+        start: UnsafeMutableRawPointer(p).assumingMemoryBound(to: Double.self),
+        count: dimension)
+      return try body(&b)
     }
   }
 }

Sources/SwiftFusion/Inference/AnyArrayBuffer+Vector.swift

@@ -180,10 +180,10 @@ extension AnyVectorArrayBuffer: Vector {
 
   /// Returns the result of calling `body` on the scalars of `self`.
   public mutating func withUnsafeMutableBufferPointer<R>(
-    _ body: (UnsafeMutableBufferPointer<Double>) throws -> R
+    _ body: (inout UnsafeMutableBufferPointer<Double>) throws -> R
   ) rethrows -> R {
     var buffer = Array(scalars)
-    let r = try buffer.withUnsafeMutableBufferPointer { try body($0) }
+    let r = try buffer.withUnsafeMutableBufferPointer { try body(&$0) }
     scalars.assign(buffer)
     return r
   }

Tests/SwiftFusionTests/Core/VectorTests.swift

@@ -100,10 +100,8 @@ extension Vector {
     }
 
     mutableSelf = self
-    mutableSelf.withUnsafeMutableBufferPointer { b in
-      for (i, j) in zip(b.indices, distinctScalars.indices) {
-        b[i] = distinctScalars[j]
-      }
+    _ = mutableSelf.withUnsafeMutableBufferPointer { b in
+      b.assign(distinctScalars)
     }
     XCTAssertTrue(mutableSelf.scalars.elementsEqual(distinctScalars))
   }