Skip to content

[AD] Rewrite some of the tests with Tracked<Float> (2) #27767

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 12 commits into from
Oct 18, 2019
Merged

[AD] Rewrite some of the tests with Tracked<Float> (2) #27767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fccb33a
Leak checking in superset_adjoint.swift
bgogul Oct 17, 2019
e2b95df
Leak checking in method.swift.
bgogul Oct 17, 2019
a8c9ca7
Add a valueWithGradient function.
bgogul Oct 17, 2019
016a8bc
Leak checking class_method.swift.
bgogul Oct 17, 2019
f8291cb
Leak checking for existential.swift.
bgogul Oct 17, 2019
237afc5
Simplify versions of gradient.
bgogul Oct 17, 2019
03704df
Leak checking for e2e_differentiable_property.swift
bgogul Oct 17, 2019
41a9f93
Leak checking for custom_derivatives.swift
bgogul Oct 17, 2019
0f2711a
Some leak checking in array.swift
bgogul Oct 17, 2019
4e05254
Some leak checking in forward_mode_runtime.swift
bgogul Oct 17, 2019
6b170e0
Formatting.
dan-zheng Oct 17, 2019
4750624
Formatting update to test/AutoDiff/custom_derivatives.swift
bgogul Oct 18, 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
29 changes: 19 additions & 10 deletions stdlib/private/DifferentiationUnittest/DifferentiationUnittest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,18 +257,27 @@ extension Tracked where T : Differentiable & FloatingPoint, T == T.TangentVector
}
}

// Differential operators for `Tracked<Float>`.
public func gradient(
at x: Tracked<Float>, in f: @differentiable (Tracked<Float>) -> Tracked<Float>
) -> Tracked<Float> {
return pullback(at: x, in: f)(1)
// Differential operators for `Tracked<T>`.

public func gradient<T, U>(
Copy link
Contributor

@rxwei rxwei Oct 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Differential operators in this file can actually be deleted once Tracked conforms to FloatingPoint. Were you working in this direction?

Copy link
Contributor

@dan-zheng dan-zheng Oct 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC,Tracked: FloatingPoint conformance caused * operator lookup for @differentiating(*) to become ambiguous.

That seems workaround-able by using @differentiable(vjp: ...) for now. We should probably investigate fixing @differentiating(*) ambiguous lookup (and @differentiating original declaration lookup for initializers/subscripts/properties) sometime.

Copy link
Contributor Author

@bgogul bgogul Oct 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rxwei, yes it would be good to make Tracked conform to FloatingPoint, but have issues that Dan mentions. I had already filed a bug: https://bugs.swift.org/browse/TF-926

Copy link
Contributor

@dan-zheng dan-zheng Oct 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Single gradient operator definitions for (...) -> Tracked<T> functions is great!
For reference: TF-927 tracks the confusing type-checker error we encountered this morning.

at x: T, in f: @differentiable (T) -> Tracked<U>
) -> T.TangentVector
where U : FloatingPoint, U.TangentVector == U {
return pullback(at: x, in: f)(Tracked<U>(1))
}

public func gradient<T, U, R>(
at x: T, _ y: U, in f: @differentiable (T, U) -> Tracked<R>
) -> (T.TangentVector, U.TangentVector)
where R : FloatingPoint, R.TangentVector == R {
return pullback(at: x, y, in: f)(Tracked<R>(1))
}

public func gradient(
at x: Tracked<Float>, _ y: Tracked<Float>,
in f: @differentiable (Tracked<Float>, Tracked<Float>) -> Tracked<Float>
) -> (Tracked<Float>, Tracked<Float>) {
return pullback(at: x, y, in: f)(1)
public func valueWithGradient<T, U : FloatingPoint>(
at x: T, in f: @differentiable (T) -> Tracked<U>
) -> (value: Tracked<U>, gradient: T.TangentVector) {
let (y, pullback) = valueWithPullback(at: x, in: f)
return (y, pullback(Tracked<U>(1)))
}

public extension Differentiable {
Expand Down
4 changes: 2 additions & 2 deletions test/AutoDiff/array.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ArrayAutoDiffTests.test("ArraySubscript") {
gradient(at: [2, 3, 4, 5, 6, 7], in: sumFirstThree))
}

ArrayAutoDiffTests.test("ArrayLiteral") {
ArrayAutoDiffTests.testWithLeakChecking("ArrayLiteral") {
func twoElementLiteral(_ x: Tracked<Float>, _ y: Tracked<Float>) -> [Tracked<Float>] {
return [x, y]
}
Expand Down Expand Up @@ -90,7 +90,7 @@ ArrayAutoDiffTests.test("ArrayConcat") {
in: sumFirstThreeConcatted))
}

ArrayAutoDiffTests.test("Array.init(repeating:count:)") {
ArrayAutoDiffTests.testWithLeakChecking("Array.init(repeating:count:)") {
@differentiable
func repeating(_ x: Tracked<Float>) -> [Tracked<Float>] {
Array(repeating: x, count: 10)
Expand Down
Loading