---

yaml
---
r: 312279
b: refs/heads/tensorflow-merge
c: 9a9822e
h: refs/heads/master
i:
  312277: 4c3eea1
  312275: 6b84b95
  312271: d2e6ebe

Author: dan-zheng

[refs]

@@ -1379,7 +1379,7 @@ refs/heads/chase-my-tail: 8bb91443a9e81bbfac92a2621a0af887a1da8dbf
 refs/heads/consider-outer-alternatives: 708bac749ec60a22a79e2eefbe734f9488a7370d
 refs/heads/revert-25740-oops-i-linked-it-again: fdd41aeb682fc488572bdc1cf71b2ff6997ba576
 refs/heads/swift-5.1-branch-06-12-2019: e63b7b2d3b93c48232d386099d0ec525d21d8f8d
-refs/heads/tensorflow-merge: 92449819bc98bb921402d9a5b8c41199d4e37038
+refs/heads/tensorflow-merge: 9a9822ed7185848f5de55e4983fa13e7094dfea1
 refs/heads/update-checkout-sha-info: 5832743c5c2a842976c42a508a4c6dcceefb0aef
 refs/tags/swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-12-a: 228f0448d9bb909aacbba4afcb7c600a405d15da
 refs/tags/swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-14-a: 922861a77b5fc2bf46bc917da70ceb15eef76836

branches/tensorflow-merge/stdlib/public/core/AutoDiff.swift

@@ -678,6 +678,7 @@ public struct AnyDerivative : Differentiable & AdditiveArithmetic {
   }
 
   /// Creates a type-erased derivative from the given derivative.
+  @differentiable(vjp: _vjpInit(_:))
   public init<T>(_ base: T)
     where T : Differentiable, T.TangentVector == T,
           T.AllDifferentiableVariables == T,
@@ -688,6 +689,18 @@ public struct AnyDerivative : Differentiable & AdditiveArithmetic {
     self._box = _ConcreteDerivativeBox<T>(base)
   }
 
+  @usableFromInline internal static func _vjpInit<T>(
+    _ base: T
+  ) -> (AnyDerivative, (AnyDerivative) -> T.CotangentVector)
+    where T : Differentiable, T.TangentVector == T,
+          T.AllDifferentiableVariables == T,
+          // NOTE: The requirement below should be defined on `Differentiable`.
+          // But it causes a crash due to generic signature minimization bug.
+          T.CotangentVector == T.CotangentVector.AllDifferentiableVariables
+  {
+    return (AnyDerivative(base), { v in v.base as! T.CotangentVector })
+  }
+
   public typealias TangentVector = AnyDerivative
   public typealias CotangentVector = AnyDerivative
   public typealias AllDifferentiableVariables = AnyDerivative

branches/tensorflow-merge/test/AutoDiff/anyderivative.swift

@@ -75,6 +75,7 @@ AnyDerivativeTests.test("Casting") {
 }
 
 AnyDerivativeTests.test("Derivatives") {
+  // Test `AnyDerivative` operations.
   func tripleSum(_ x: AnyDerivative, _ y: AnyDerivative) -> AnyDerivative {
     let sum = x + y
     return sum + sum + sum
@@ -112,6 +113,42 @@ AnyDerivativeTests.test("Derivatives") {
     expectEqual(expectedVJP, 𝛁x.base as? Generic<Double>.CotangentVector)
     expectEqual(expectedVJP, 𝛁y.base as? Generic<Double>.CotangentVector)
   }
+
+  // Test `AnyDerivative` initializer.
+  func typeErased<T>(_ x: T) -> AnyDerivative
+    where T : Differentiable, T.TangentVector == T,
+          T.AllDifferentiableVariables == T,
+          // NOTE: The requirement below should be defined on `Differentiable`.
+          // But it causes a crash due to generic signature minimization bug.
+          T.CotangentVector == T.CotangentVector.AllDifferentiableVariables
+  {
+    let any = AnyDerivative(x)
+    return any + any
+  }
+
+  do {
+    let x: Float = 3
+    let v = AnyDerivative(Float(1))
+    let 𝛁x = pullback(at: x, in: { x in typeErased(x) })(v)
+    let expectedVJP: Float = 2
+    expectEqual(expectedVJP, 𝛁x)
+  }
+
+  do {
+    let x = Vector.TangentVector(x: 4, y: 5)
+    let v = AnyDerivative(Vector.CotangentVector(x: 1, y: 1))
+    let 𝛁x = pullback(at: x, in: { x in typeErased(x) })(v)
+    let expectedVJP = Vector.CotangentVector(x: 2, y: 2)
+    expectEqual(expectedVJP, 𝛁x)
+  }
+
+  do {
+    let x = Generic<Double>.TangentVector(x: 4)
+    let v = AnyDerivative(Generic<Double>.CotangentVector(x: 1))
+    let 𝛁x = pullback(at: x, in: { x in typeErased(x) })(v)
+    let expectedVJP = Generic<Double>.CotangentVector(x: 2)
+    expectEqual(expectedVJP, 𝛁x)
+  }
 }
 
 runAllTests()