Consolidate TensorUtils into Generation and reorganize targets

Package.swift

@@ -29,13 +29,13 @@ let package = Package(
             ]
         ),
         .executableTarget(name: "HubCLI", dependencies: ["Hub", .product(name: "ArgumentParser", package: "swift-argument-parser")]),
+        .target(name: "Generation", dependencies: ["Tokenizers"]),
         .target(name: "Hub", resources: [.process("FallbackConfigs")], swiftSettings: swiftSettings),
+        .target(name: "Models", dependencies: ["Tokenizers", "Generation"]),
         .target(name: "Tokenizers", dependencies: ["Hub", .product(name: "Jinja", package: "Jinja")]),
-        .target(name: "TensorUtils"),
-        .target(name: "Generation", dependencies: ["Tokenizers", "TensorUtils"]),
-        .target(name: "Models", dependencies: ["Tokenizers", "Generation", "TensorUtils"]),
-        .testTarget(name: "TokenizersTests", dependencies: ["Tokenizers", "Models", "Hub"], resources: [.process("Resources"), .process("Vocabs")]),
+        .testTarget(name: "GenerationTests", dependencies: ["Generation"]),
         .testTarget(name: "HubTests", dependencies: ["Hub", .product(name: "Jinja", package: "Jinja")], swiftSettings: swiftSettings),
-        .testTarget(name: "TensorUtilsTests", dependencies: ["TensorUtils", "Models", "Hub"], resources: [.process("Resources")]),
+        .testTarget(name: "ModelsTests", dependencies: ["Models", "Hub"], resources: [.process("Resources")]),
+        .testTarget(name: "TokenizersTests", dependencies: ["Tokenizers", "Models", "Hub"], resources: [.process("Resources"), .process("Vocabs")]),
     ]
 )

Sources/Generation/Generation.swift

@@ -6,7 +6,6 @@
 //
 
 import CoreML
-import TensorUtils
 import Tokenizers
 
 public enum GenerationMode {

Tests/TensorUtilsTests/LogitsWarperTests.swift → Tests/GenerationTests/LogitsWarperTests.swift

@@ -5,7 +5,7 @@
 //
 
 import CoreML
-@testable import TensorUtils
+@testable import Generation
 import XCTest
 
 final class LogitsWarperTests: XCTestCase {

Tests/TensorUtilsTests/TensorUtilsTests.swift → Tests/GenerationTests/MathTests.swift

@@ -1,14 +1,14 @@
 //
-//  TensorUtilsTests.swift
+//  MathTests.swift
 //
 //  Created by Jan Krukowski on 25/11/2023.
 //
 
 import CoreML
-@testable import TensorUtils
+@testable import Generation
 import XCTest
 
-final class TensorUtilsTests: XCTestCase {
+final class MathTests: XCTestCase {
     private let accuracy: Float = 0.00001
 
     func testCumsum() {

Tests/TensorUtilsTests/WeightsTests.swift → Tests/ModelsTests/WeightsTests.swift

@@ -1,5 +1,5 @@
 @testable import Hub
-@testable import TensorUtils
+@testable import Models
 import XCTest
 
 class WeightsTests: XCTestCase {