Upgrade to Swift 6.1: Update tools version, CI matrix, and fix unsafe

pointer usage

Author: dastrobu

.github/workflows/ci.yaml

@@ -14,7 +14,9 @@ jobs:
     strategy:
       matrix:
         swift-version:
-          - "5.9"
+          - "6.0"
+          - "6.1"
+          - "6.2"
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4

.gitignore

@@ -11,3 +11,5 @@ DerivedData/
 
 **.log
 **.bak
+
+.DS_Store

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.4
+// swift-tools-version:6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

Sources/NdArray/NdArray.swift

@@ -186,7 +186,11 @@ open class NdArray<T>: CustomDebugStringConvertible,
             for i in 0..<rowCount {
                 let row = a[i]
                 precondition(row.count == colCount, "\(row.count) == \(colCount) at row \(i)")
-                memcpy(dataStart + i * strides[0], row, colCount * MemoryLayout<T>.stride)
+                row.withUnsafeBufferPointer { p in
+                    if let base = p.baseAddress {
+                        memcpy(dataStart + i * strides[0], base, colCount * MemoryLayout<T>.stride)
+                    }
+                }
             }
         case .F:
             for i in 0..<rowCount {
@@ -219,7 +223,11 @@ open class NdArray<T>: CustomDebugStringConvertible,
                 for j in 0..<jCount {
                     let aij = ai[j]
                     precondition(aij.count == kCount, "\(aij.count) == \(kCount) at index \(i), \(j)")
-                    memcpy(dataStart + i * strides[0] + j * strides[1], aij, kCount * MemoryLayout<T>.stride)
+                    aij.withUnsafeBufferPointer { p in
+                        if let base = p.baseAddress {
+                            memcpy(dataStart + i * strides[0] + j * strides[1], base, kCount * MemoryLayout<T>.stride)
+                        }
+                    }
                 }
             }
         case .F:

Sources/NdArray/matrix/Matrix.swift

@@ -33,7 +33,11 @@ open class Matrix<T>: NdArray<T>, Sequence {
             for i in 0..<rowCount {
                 let row = a[i]
                 precondition(row.count == colCount, "\(row.count) == \(colCount) at row \(i)")
-                memcpy(dataStart + i * strides[0], row, colCount * MemoryLayout<T>.stride)
+                row.withUnsafeBufferPointer { p in
+                    if let base = p.baseAddress {
+                        memcpy(dataStart + i * strides[0], base, colCount * MemoryLayout<T>.stride)
+                    }
+                }
             }
         case .F:
             for i in 0..<rowCount {

Tests/NdArrayTests/test_support.swift

@@ -8,7 +8,7 @@ import XCTest
 internal func XCTAssertEqual<T>(_ expression1: @autoclosure () throws -> [T],
                                 _ expression2: @autoclosure () throws -> [T],
                                 accuracy: T, _ message: @autoclosure () -> String = "",
-                                file: StaticString = #file, line: UInt = #line) rethrows where T: FloatingPoint {
+                                file: StaticString = #filePath, line: UInt = #line) rethrows where T: FloatingPoint {
     let array1: [T] = try expression1()
     let array2: [T] = try expression2()
     XCTAssertEqual(array1.count, array2.count, file: file, line: line)