Skip to content
This repository was archived by the owner on Jul 1, 2023. It is now read-only.

Fix tests. #130

Merged
merged 2 commits into from
May 23, 2019
Merged

Fix tests. #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85eec40
Fix tests.
dan-zheng May 22, 2019
c5e4d3c
Disable UpSampling3D.
dan-zheng May 23, 2019
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
6 changes: 3 additions & 3 deletions Sources/DeepLearning/Layer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1340,7 +1340,7 @@ public struct UpSampling1D<Scalar: TensorFlowFloatingPoint>: Layer {
///
/// - Parameter size: The upsampling factor for timesteps.
public init(size: Int) {
self.size = size
self.size = size
}

/// Returns the output obtained from applying the layer to the given input.
Expand All @@ -1366,7 +1366,7 @@ public struct UpSampling2D<Scalar: TensorFlowFloatingPoint>: Layer {
///
/// - Parameter size: The upsampling factor for rows and columns.
public init(size: Int) {
self.size = size
self.size = size
}

/// Returns the output obtained from applying the layer to the given input.
Expand All @@ -1392,7 +1392,7 @@ public struct UpSampling3D<Scalar: TensorFlowFloatingPoint>: Layer {
///
/// - Parameter size: The upsampling factor for rows and columns.
public init(size: Int) {
self.size = size
self.size = size
}

/// Returns the output obtained from applying the layer to the given input.
Expand Down
32 changes: 20 additions & 12 deletions Tests/DeepLearningTests/LayerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ import XCTest

final class LayerTests: XCTestCase {
func testConv1D() {
let filter = Tensor<Float>(ones: [3, 1, 2]) * Tensor<Float>([[[0.33333333, 1]]])
let filter = Tensor<Float>(ones: [3, 1, 2]) * Tensor<Float>([[[0.5, 1]]])
let bias = Tensor<Float>([0, 1])
let layer = Conv1D<Float>(filter: filter, bias: bias, activation: identity, stride: 1, padding: .valid)
let input = Tensor<Float>([[0, 1, 2, 3, 4], [10, 11, 12, 13, 14]]).expandingShape(at: 2)
let output = layer.inferring(from: input)
let expected = Tensor<Float>([[[1, 4], [2, 7], [3, 10]], [[11, 34], [12, 37], [13, 40]]])
let expected = Tensor<Float>(
shape: [2, 3, 2],
scalars: [1.5, 4, 3, 7, 4.5, 10, 16.5, 34, 18, 37, 19.5, 40])
XCTAssertEqual(output, expected)
}

Expand Down Expand Up @@ -82,7 +84,7 @@ final class LayerTests: XCTestCase {
let layer = AvgPool3D<Float>(poolSize: (2, 4, 5), strides: (1, 1, 1), padding: .valid)
let input = Tensor(shape: [1, 2, 4, 5, 1], scalars: (0..<40).map(Float.init))
let output = layer.inferring(from: input)
let expected = Tensor<Float>([[[[[9.5]]]]])
let expected = Tensor<Float>([[[[[19.5]]]]])
XCTAssertEqual(output, expected)
}

Expand Down Expand Up @@ -132,9 +134,15 @@ final class LayerTests: XCTestCase {
let size = 6
let layer = UpSampling3D<Float>(size: size)
let input = Tensor<Float>(shape: [1, 4, 3, 2, 1], scalars: (0..<24).map(Float.init))
// TODO(TF-525): Fix `UpSampling3D.call`.
// Broadcasting does not support tensors with high rank:
// Broadcast between [1,4,1,3,1,2,1,1] and [1,1,6,1,6,1,6,1] is not supported yet.
/*
let output = layer.inferring(from: input)
let expected = TensorShape([1, input.shape[1] * size, input.shape[2] * size, input.shape[3] * size, 1])
XCTAssertEqual(output.shape, expected)
XCTAssertEqual(output.shape, expected)
*/
}

func testReshape() {
Expand Down Expand Up @@ -165,7 +173,7 @@ final class LayerTests: XCTestCase {
let input = Tensor<Float>(ones: [1, 2]) * Tensor<Float>([0.3, 0.7])
let output = cell(input: input, state: state).state
let expected = SimpleRNNCell.State(
Tensor<Float>([[2.76649, 6.2999997, 2.76649, 6.2999997, 2.76649]])
Tensor<Float>([[0.9921227, 0.9999934, 0.9921227, 0.9999934, 0.9921227]])
)
XCTAssertEqual(output, expected)
}
Expand All @@ -180,21 +188,21 @@ final class LayerTests: XCTestCase {
return rnn(inputs)
}
XCTAssertEqual(outputs.map { $0.value },
[[[-0.0026294366, -0.0058668107, 0.04495003, 0.20311214]],
[[ 0.06788494, 0.050665878, 0.02415526, 0.09249911]],
[[ 0.06621192, 0.009049267, 0.065047316, 0.11534518]],
[[ 0.05612204, 0.00022032857, 0.05407162, 0.09784105]]])
[[[ -0.00262943, -0.005866742, 0.044919778, 0.20036437]],
[[ 0.066890605, 0.049586136, 0.024610005, 0.09341654]],
[[ 0.065792546, 0.009325638, 0.06439907, 0.114802904]],
[[ 0.055909205, 0.00035158166, 0.054020774, 0.09812111]]])
let (𝛁rnn, 𝛁inputs) = pullback(.init(inputs.map { SimpleRNNCell<Float>.State($0) }))
XCTAssertEqual(𝛁rnn.cell.weight,
[[ 0.0, 0.0, 0.0, 0.0],
[-0.0051278225, 0.0013102926, 0.00740262, 0.018119661],
[ -0.010255645, 0.0026205853, 0.01480524, 0.036239322],
[ -0.015383467, 0.003930878, 0.02220786, 0.054358985],
[-0.0051169936, 0.0014167001, 0.0074189613, 0.017496519],
[ -0.010233987, 0.0028334002, 0.0148379225, 0.034993038],
[ -0.015350982, 0.0042501003, 0.022256885, 0.05248956],
[ 0.0, 0.0, 0.0, 0.0],
[ 0.0, 0.0, 0.0, 0.0],
[ 0.0, 0.0, 0.0, 0.0],
[ 0.0, 0.0, 0.0, 0.0]])
XCTAssertEqual(𝛁rnn.cell.bias, [-0.051278222, 0.013102926, 0.0740262, 0.18119662])
XCTAssertEqual(𝛁rnn.cell.bias, [-0.051169936, 0.014167001, 0.07418961, 0.17496519])
}

static var allTests = [
Expand Down