Skip to content

More tests for scalars constructor. #9694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 27, 2025
Merged

More tests for scalars constructor. #9694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions extension/apple/ExecuTorch/__tests__/ModuleTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,9 @@ class ModuleTest: XCTestCase {
return
}
let module = Module(filePath: modelPath)
var inputData: [Float] = [1.0]
let inputTensor = inputData.withUnsafeMutableBytes {
Tensor(bytesNoCopy: $0.baseAddress!, shape:[1], dataType: .float)
}
let inputs = [inputTensor, inputTensor]
let inputs = [Tensor([1], dataType: .float), Tensor([1], dataType: .float)]
var outputs: [Value]?
XCTAssertNoThrow(outputs = try module.forward(inputs))
var outputData: [Float] = [2.0]
let outputTensor = outputData.withUnsafeMutableBytes {
Tensor(bytesNoCopy: $0.baseAddress!, shape:[1], dataType: .float, shapeDynamism: .static)
}
XCTAssertEqual(outputs?[0].tensor, outputTensor)
XCTAssertEqual(outputs?[0].tensor, Tensor([2], dataType: .float, shapeDynamism: .static))
}
}
156 changes: 156 additions & 0 deletions extension/apple/ExecuTorch/__tests__/TensorTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,71 @@ class TensorTest: XCTestCase {
XCTAssertFalse(tensor4.isEqual(tensor2.copy()))
}

func testInitScalarsUInt8() {
let data: [UInt8] = [1, 2, 3, 4, 5, 6]
let tensor = Tensor(data.map(NSNumber.init), dataType: .byte)
XCTAssertEqual(tensor.dataType, .byte)
XCTAssertEqual(tensor.shape, [6])
XCTAssertEqual(tensor.strides, [1])
XCTAssertEqual(tensor.dimensionOrder, [0])
XCTAssertEqual(tensor.count, 6)
tensor.bytes { pointer, count, dataType in
XCTAssertEqual(Array(UnsafeBufferPointer(start: pointer.assumingMemoryBound(to: UInt8.self), count: count)), data)
}
}

func testInitScalarsInt8() {
let data: [Int8] = [1, 2, 3, 4, 5, 6]
let tensor = Tensor(data.map(NSNumber.init), dataType: .char)
XCTAssertEqual(tensor.dataType, .char)
XCTAssertEqual(tensor.shape, [6])
XCTAssertEqual(tensor.strides, [1])
XCTAssertEqual(tensor.dimensionOrder, [0])
XCTAssertEqual(tensor.count, 6)
tensor.bytes { pointer, count, dataType in
XCTAssertEqual(Array(UnsafeBufferPointer(start: pointer.assumingMemoryBound(to: Int8.self), count: count)), data)
}
}

func testInitScalarsInt16() {
let data: [Int16] = [1, 2, 3, 4, 5, 6]
let tensor = Tensor(data.map(NSNumber.init))
XCTAssertEqual(tensor.dataType, .short)
XCTAssertEqual(tensor.shape, [6])
XCTAssertEqual(tensor.strides, [1])
XCTAssertEqual(tensor.dimensionOrder, [0])
XCTAssertEqual(tensor.count, 6)
tensor.bytes { pointer, count, dataType in
XCTAssertEqual(Array(UnsafeBufferPointer(start: pointer.assumingMemoryBound(to: Int16.self), count: count)), data)
}
}

func testInitScalarsInt32() {
let data: [Int32] = [1, 2, 3, 4, 5, 6]
let tensor = Tensor(data.map(NSNumber.init))
XCTAssertEqual(tensor.dataType, .int)
XCTAssertEqual(tensor.shape, [6])
XCTAssertEqual(tensor.strides, [1])
XCTAssertEqual(tensor.dimensionOrder, [0])
XCTAssertEqual(tensor.count, 6)
tensor.bytes { pointer, count, dataType in
XCTAssertEqual(Array(UnsafeBufferPointer(start: pointer.assumingMemoryBound(to: Int32.self), count: count)), data)
}
}

func testInitScalarsInt64() {
let data: [Int64] = [1, 2, 3, 4, 5, 6]
let tensor = Tensor(data.map(NSNumber.init))
XCTAssertEqual(tensor.dataType, .long)
XCTAssertEqual(tensor.shape, [6])
XCTAssertEqual(tensor.strides, [1])
XCTAssertEqual(tensor.dimensionOrder, [0])
XCTAssertEqual(tensor.count, 6)
tensor.bytes { pointer, count, dataType in
XCTAssertEqual(Array(UnsafeBufferPointer(start: pointer.assumingMemoryBound(to: Int64.self), count: count)), data)
}
}

func testInitScalarsFloat() {
let data: [Float] = [1, 2, 3, 4, 5, 6]
let tensor = Tensor(data.map(NSNumber.init))
Expand All @@ -236,4 +301,95 @@ class TensorTest: XCTestCase {
XCTAssertEqual(Array(UnsafeBufferPointer(start: pointer.assumingMemoryBound(to: Float.self), count: count)), data)
}
}

func testInitScalarsDouble() {
let data: [Double] = [1, 2, 3, 4, 5, 6]
let tensor = Tensor(data.map(NSNumber.init))
XCTAssertEqual(tensor.dataType, .double)
XCTAssertEqual(tensor.shape, [6])
XCTAssertEqual(tensor.strides, [1])
XCTAssertEqual(tensor.dimensionOrder, [0])
XCTAssertEqual(tensor.count, 6)
tensor.bytes { pointer, count, dataType in
XCTAssertEqual(Array(UnsafeBufferPointer(start: pointer.assumingMemoryBound(to: Double.self), count: count)), data)
}
}

func testInitScalarsBool() {
let data: [Bool] = [true, false, true, false, true, false]
let tensor = Tensor(data.map(NSNumber.init), dataType: .bool)
XCTAssertEqual(tensor.dataType, .bool)
XCTAssertEqual(tensor.shape, [6])
XCTAssertEqual(tensor.strides, [1])
XCTAssertEqual(tensor.dimensionOrder, [0])
XCTAssertEqual(tensor.count, 6)
tensor.bytes { pointer, count, dataType in
XCTAssertEqual(Array(UnsafeBufferPointer(start: pointer.assumingMemoryBound(to: Bool.self), count: count)), data)
}
}

func testInitScalarsUInt16() {
let data: [UInt16] = [1, 2, 3, 4, 5, 6]
let tensor = Tensor(data.map(NSNumber.init), dataType: .uInt16)
XCTAssertEqual(tensor.dataType, .uInt16)
XCTAssertEqual(tensor.shape, [6])
XCTAssertEqual(tensor.strides, [1])
XCTAssertEqual(tensor.dimensionOrder, [0])
XCTAssertEqual(tensor.count, 6)
tensor.bytes { pointer, count, dataType in
XCTAssertEqual(Array(UnsafeBufferPointer(start: pointer.assumingMemoryBound(to: UInt16.self), count: count)), data)
}
}

func testInitScalarsUInt32() {
let data: [UInt32] = [1, 2, 3, 4, 5, 6]
let tensor = Tensor(data.map(NSNumber.init), dataType: .uInt32)
XCTAssertEqual(tensor.dataType, .uInt32)
XCTAssertEqual(tensor.shape, [6])
XCTAssertEqual(tensor.strides, [1])
XCTAssertEqual(tensor.dimensionOrder, [0])
XCTAssertEqual(tensor.count, 6)
tensor.bytes { pointer, count, dataType in
XCTAssertEqual(Array(UnsafeBufferPointer(start: pointer.assumingMemoryBound(to: UInt32.self), count: count)), data)
}
}

func testInitScalarsUInt64() {
let data: [UInt64] = [1, 2, 3, 4, 5, 6]
let tensor = Tensor(data.map(NSNumber.init), dataType: .uInt64)
XCTAssertEqual(tensor.dataType, .uInt64)
XCTAssertEqual(tensor.shape, [6])
XCTAssertEqual(tensor.strides, [1])
XCTAssertEqual(tensor.dimensionOrder, [0])
XCTAssertEqual(tensor.count, 6)
tensor.bytes { pointer, count, dataType in
XCTAssertEqual(Array(UnsafeBufferPointer(start: pointer.assumingMemoryBound(to: UInt64.self), count: count)), data)
}
}

func testInitScalarsInt() {
let data: [Int] = [1, 2, 3, 4, 5, 6]
let tensor = Tensor(data.map(NSNumber.init), dataType: .long)
XCTAssertEqual(tensor.dataType, .long)
XCTAssertEqual(tensor.shape, [6])
XCTAssertEqual(tensor.strides, [1])
XCTAssertEqual(tensor.dimensionOrder, [0])
XCTAssertEqual(tensor.count, 6)
tensor.bytes { pointer, count, dataType in
XCTAssertEqual(Array(UnsafeBufferPointer(start: pointer.assumingMemoryBound(to: Int.self), count: count)), data)
}
}

func testInitScalarsUInt() {
let data: [UInt] = [1, 2, 3, 4, 5, 6]
let tensor = Tensor(data.map(NSNumber.init), dataType: .uInt64)
XCTAssertEqual(tensor.dataType, .uInt64)
XCTAssertEqual(tensor.shape, [6])
XCTAssertEqual(tensor.strides, [1])
XCTAssertEqual(tensor.dimensionOrder, [0])
XCTAssertEqual(tensor.count, 6)
tensor.bytes { pointer, count, dataType in
XCTAssertEqual(Array(UnsafeBufferPointer(start: pointer.assumingMemoryBound(to: UInt.self), count: count)), data)
}
}
}
5 changes: 1 addition & 4 deletions extension/apple/ExecuTorch/__tests__/ValueTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ class ValueTest: XCTestCase {
}

func testTensor() {
var data: [Float] = [1.0, 2.0, 3.0, 4.0, 5.0, 6.0]
let tensor = data.withUnsafeMutableBytes {
Tensor(bytesNoCopy: $0.baseAddress!, shape: [2, 3], dataType: .float)
}
let tensor = Tensor([1.0, 2.0, 3.0, 4.0, 5.0, 6.0])
let value = Value(tensor)
XCTAssertTrue(value.isTensor)
XCTAssertEqual(value.tensor, tensor)
Expand Down
Loading