Convert to SPM

.github/workflows/swift.yml

@@ -0,0 +1,19 @@
+name: Swift
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build
+      run: swift build -v
+    - name: Test
+      run: swift test -v

.gitignore

@@ -33,3 +33,6 @@ Pods/
 .Spotlight-V100
 *.swp
 *.lock
+
+swiftpm/xcode
+.build/

Package.swift

@@ -0,0 +1,45 @@
+// swift-tools-version: 5.5
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "CoreMLHelpers",
+    platforms: [
+        .iOS(.v11),
+        .macOS(.v12),
+        .tvOS(.v11),
+        .watchOS(.v7)
+    ],
+    products: [
+        .library(
+            name: "CoreMLHelpers",
+            targets: [
+                "CoreMLHelpers",
+            ]
+        ),
+    ],
+    dependencies: [
+
+    ],
+    targets: [
+        .target(
+            name: "CoreMLHelpers",
+            dependencies: [
+
+            ]
+        ),
+        .target(
+            name: "Experimental",
+            dependencies: [
+                "CoreMLHelpers"
+            ]
+        ),
+        .testTarget(
+            name: "CoreMLHelpersTests",
+            dependencies: [
+                "CoreMLHelpers",
+            ]
+        ),
+    ]
+)

CoreMLHelpers/CGImage+CVPixelBuffer.swift → Sources/CoreMLHelpers/CGImage+CVPixelBuffer.swift

@@ -20,6 +20,7 @@
   IN THE SOFTWARE.
 */
 
+#if canImport(CoreImage) && !os(watchOS)
 import CoreGraphics
 import CoreImage
 import VideoToolbox
@@ -166,3 +167,4 @@ extension CGImage {
     return context.createCGImage(ciImage, from: rect)
   }
 }
+#endif

CoreMLHelpers/CGImagePropertyOrientation.swift → Sources/CoreMLHelpers/CGImagePropertyOrientation.swift

@@ -20,7 +20,7 @@
   IN THE SOFTWARE.
 */
 
-#if canImport(UIKit)
+#if canImport(UIKit) && !os(watchOS)
 
 import UIKit
 

CoreMLHelpers/CVPixelBuffer+Create.swift → Sources/CoreMLHelpers/CVPixelBuffer+Create.swift

@@ -20,19 +20,30 @@
   IN THE SOFTWARE.
 */
 
+#if !os(watchOS)
 import Foundation
 import Accelerate
 
 fileprivate func metalCompatiblityAttributes() -> [String: Any] {
+    #if os(macOS)
   let attributes: [String: Any] = [
     String(kCVPixelBufferMetalCompatibilityKey): true,
     String(kCVPixelBufferOpenGLCompatibilityKey): true,
     String(kCVPixelBufferIOSurfacePropertiesKey): [
-      String(kCVPixelBufferIOSurfaceOpenGLESTextureCompatibilityKey): true,
-      String(kCVPixelBufferIOSurfaceOpenGLESFBOCompatibilityKey): true,
       String(kCVPixelBufferIOSurfaceCoreAnimationCompatibilityKey): true
     ]
   ]
+    #else
+    let attributes: [String: Any] = [
+        String(kCVPixelBufferMetalCompatibilityKey): true,
+        String(kCVPixelBufferOpenGLCompatibilityKey): true,
+        String(kCVPixelBufferIOSurfacePropertiesKey): [
+            String(kCVPixelBufferIOSurfaceOpenGLESTextureCompatibilityKey): true,
+            String(kCVPixelBufferIOSurfaceOpenGLESFBOCompatibilityKey): true,
+            String(kCVPixelBufferIOSurfaceCoreAnimationCompatibilityKey): true
+        ]
+    ]
+    #endif
   return attributes
 }
 
@@ -168,3 +179,4 @@ public extension CVPixelBuffer {
     return dstPixelBuffer
   }
 }
+#endif

CoreMLHelpers/CVPixelBuffer+Resize.swift → Sources/CoreMLHelpers/CVPixelBuffer+Resize.swift

@@ -20,6 +20,7 @@
   IN THE SOFTWARE.
 */
 
+#if canImport(CoreImage) && !os(watchOS)
 import Foundation
 import Accelerate
 import CoreImage
@@ -155,3 +156,4 @@ public func resizePixelBuffer(_ pixelBuffer: CVPixelBuffer,
   let scaledImage = ciImage.transformed(by: scaleTransform)
   context.render(scaledImage, to: output)
 }
+#endif

CoreMLHelpers/CVPixelBuffer+Rotate.swift → Sources/CoreMLHelpers/CVPixelBuffer+Rotate.swift

@@ -19,7 +19,7 @@
   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
   IN THE SOFTWARE.
 */
-
+#if !os(watchOS)
 import Foundation
 import Accelerate
 
@@ -99,3 +99,4 @@ public func rotate90PixelBuffer(_ srcPixelBuffer: CVPixelBuffer, factor: UInt8)
   }
   return dstPixelBuffer
 }
+#endif

CoreMLHelpers/Predictions.swift → Sources/CoreMLHelpers/Predictions.swift

@@ -19,7 +19,7 @@
   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
   IN THE SOFTWARE.
 */
-
+#if canImport(Vision)
 import Vision
 
 /**
@@ -41,3 +41,4 @@ public func top(_ k: Int, _ observations: [VNClassificationObservation]) -> [(St
   return observations.prefix(through: min(k, observations.count) - 1)
                      .map { ($0.identifier, Double($0.confidence)) }
 }
+#endif

CoreMLHelpers/UIImage+CVPixelBuffer.swift → Sources/CoreMLHelpers/UIImage+CVPixelBuffer.swift

@@ -20,7 +20,7 @@
   IN THE SOFTWARE.
 */
 
-#if canImport(UIKit)
+#if canImport(UIKit) && canImport(VideoToolbox)
 
 import UIKit
 import VideoToolbox

CoreMLHelpers/UIImage+Extensions.swift → Sources/CoreMLHelpers/UIImage+Extensions.swift

@@ -20,7 +20,7 @@
   IN THE SOFTWARE.
 */
 
-#if canImport(UIKit)
+#if canImport(UIKit) && !os(watchOS)
 
 import UIKit
 

Experimental/MultiArray.swift → Sources/Experimental/MultiArray.swift

@@ -20,10 +20,11 @@
   IN THE SOFTWARE.
 */
 
+#if !os(watchOS)
 import Foundation
 import CoreML
 import Swift
-
+import CoreMLHelpers
 /**
  Wrapper around MLMultiArray to make it more Swifty.
 */
@@ -336,3 +337,4 @@ extension MultiArray {
 }
 
 #endif
+#endif

Tests/CoreMLHelpersTests/CoreMLHelpersTests.swift

@@ -0,0 +1,11 @@
+import XCTest
+@testable import CoreMLHelpers
+
+final class CoreMLHelpersTests: XCTestCase {
+    func testExample() throws {
+        // This is an example of a functional test case.
+        // Use XCTAssert and related functions to verify your tests produce the correct
+        // results.
+
+    }
+}

Tests/CoreMLHelpersTests/MultiArrayTests.swift

@@ -0,0 +1,130 @@
+//
+//  MultiArrayTests.swift
+//  
+//
+//  Created by Rodrigo Dutra de Oliveira on 05/09/22.
+//
+
+import XCTest
+import CoreML
+@testable import CoreMLHelpers
+@testable import Experimental
+
+//class MultiArrayTests: XCTestCase {
+//    func testMultiArrayFromCoreMLArray() {
+//        let coreMLArray = try! MLMultiArray(shape: [3, 4, 2], dataType: .double)
+//        coreMLArray[[1, 2, 0] as [NSNumber]] = NSNumber(value: 3.14159)
+//        print(coreMLArray)
+//        
+//        var m = MultiArray<Double>(coreMLArray)
+//        XCTAssertEqual(m.shape.count, 3)
+//        XCTAssertEqual(m.shape[0], 3)
+//        XCTAssertEqual(m.shape[1], 4)
+//        XCTAssertEqual(m.shape[2], 2)
+//        
+//        XCTAssertEqual(m[1, 2, 0], 3.14159)
+//        
+//        m[1, 2, 0] = 2.71828
+//        XCTAssertEqual(m[1, 2, 0], 2.71828)
+//    }
+//    
+//    func testMultiArray() {
+//        var m = MultiArray<Float>(shape: [3, 4, 2])
+//        print(m.shape)
+//        
+//        for i in 0..<m.count {
+//            m[i] = Float(i)
+//        }
+//        print(m)
+//        
+//        let t = m.transposed([1, 2, 0])
+//        print(t.shape)
+//        print(t)
+//        
+//        let r = m.reshaped([8, 3])
+//        print(r.shape)
+//        print(r)
+//    }
+//    
+//    func testMultiArrayTransposeReshape() {
+//        let coreMLArray = try! MLMultiArray(shape: [1, 1, 48, 17, 27], dataType: .double)
+//        let ptr = UnsafeMutablePointer<Double>(OpaquePointer(coreMLArray.dataPointer))
+//        for i in 0..<1*1*48*17*27 {
+//            ptr.advanced(by: i).pointee = Double(i)
+//        }
+//        
+//        let a = MultiArray<Double>(coreMLArray)
+//        XCTAssertEqual(a.shape, [1, 1, 48, 17, 27])
+//        XCTAssertEqual(a.strides, [22032, 22032, 459, 27, 1])
+//        
+//        let expected_a: [[Double]] = [[  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10,
+//                                         11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+//                                         22, 23, 24, 25, 26 ],
+//                                      [ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+//                                        38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+//                                        49, 50, 51, 52, 53]]
+//        for j in 0..<2 {
+//            for i in 0..<27 {
+//                XCTAssertEqual(a[0, 0, 0, j, i], expected_a[j][i])
+//            }
+//        }
+//        
+//        let b = a.transposed([0, 1, 3, 4, 2])
+//        XCTAssertEqual(b.shape, [1, 1, 17, 27, 48])
+//        XCTAssertEqual(b.strides, [22032, 22032, 27, 1, 459])
+//        
+//        let expected_b: [[Double]] = [[     0,   459,   918,  1377,  1836,  2295,  2754,  3213,  3672,
+//                                            4131,  4590,  5049,  5508,  5967,  6426,  6885,  7344,  7803,
+//                                            8262,  8721,  9180,  9639, 10098, 10557, 11016, 11475, 11934,
+//                                            12393, 12852, 13311, 13770, 14229, 14688, 15147, 15606, 16065,
+//                                            16524, 16983, 17442, 17901, 18360, 18819, 19278, 19737, 20196,
+//                                            20655, 21114, 21573 ],
+//                                      [     1,   460,   919,  1378,  1837,  2296,  2755,  3214,  3673,
+//                                            4132,  4591,  5050,  5509,  5968,  6427,  6886,  7345,  7804,
+//                                            8263,  8722,  9181,  9640, 10099, 10558, 11017, 11476, 11935,
+//                                            12394, 12853, 13312, 13771, 14230, 14689, 15148, 15607, 16066,
+//                                            16525, 16984, 17443, 17902, 18361, 18820, 19279, 19738, 20197,
+//                                            20656, 21115, 21574 ]]
+//        for j in 0..<2 {
+//            for i in 0..<48 {
+//                XCTAssertEqual(b[0, 0, 0, j, i], expected_b[j][i])
+//            }
+//        }
+//        
+//        let expected_b_end: [[Double]] = [[    26,   485,   944,  1403,  1862,  2321,  2780,  3239,  3698,
+//                                               4157,  4616,  5075,  5534,  5993,  6452,  6911,  7370,  7829,
+//                                               8288,  8747,  9206,  9665, 10124, 10583, 11042, 11501, 11960,
+//                                               12419, 12878, 13337, 13796, 14255, 14714, 15173, 15632, 16091,
+//                                               16550, 17009, 17468, 17927, 18386, 18845, 19304, 19763, 20222,
+//                                               20681, 21140, 21599 ]]
+//        
+//        for j in 0..<1 {
+//            for i in 0..<48 {
+//                XCTAssertEqual(b[0, 0, 0, j + 26, i], expected_b_end[j][i])
+//            }
+//        }
+//        
+//        let c = b.reshaped([5508, 4])
+//        XCTAssertEqual(c.shape, [5508, 4])
+//        XCTAssertEqual(c.strides, [4, 1])
+//        
+//        let expected_c: [[Double]] = [[    0,  459,  918, 1377 ],
+//                                      [ 1836, 2295, 2754, 3213 ]]
+//        for j in 0..<2 {
+//            for i in 0..<4 {
+//                XCTAssertEqual(c[j, i], expected_c[j][i])
+//            }
+//        }
+//        
+//        let expected_c_end: [[Double]] = [[20654, 21113, 21572, 22031]]
+//        
+//        for j in 0..<1 {
+//            for i in 0..<4 {
+//                print(c[j + 5507, i])
+//                XCTAssertEqual(c[j + 5507, i], expected_c_end[j][i])
+//            }
+//        }
+//        
+//        //print(c)
+//    }
+//}