Merge branch 'tensorflow' into tensorflow-merge

Author: pschuh

lib/SILOptimizer/Mandatory/Differentiation.cpp

@@ -3828,6 +3828,12 @@ class AdjointEmitter final : public SILInstructionVisitor<AdjointEmitter> {
         type.getCategory());
   }
 
+  /// Substitutes all replacement types of the given substitution map using the
+  /// adjoint function's substitution map.
+  SubstitutionMap remapSubstitutionMap(SubstitutionMap substMap) {
+    return substMap.subst(getAdjoint().getForwardingSubstitutionMap());
+  }
+
   //--------------------------------------------------------------------------//
   // Managed value mapping
   //--------------------------------------------------------------------------//
@@ -4654,7 +4660,8 @@ class AdjointEmitter final : public SILInstructionVisitor<AdjointEmitter> {
           pullbackType, *applyInfo.originalPullbackType);
       auto *thunkRef = builder.createFunctionRef(loc, thunk);
       pullback = builder.createPartialApply(
-          loc, thunkRef, thunk->getForwardingSubstitutionMap(),
+          loc, thunkRef,
+          remapSubstitutionMap(thunk->getForwardingSubstitutionMap()),
           {pullback}, pullbackType->getCalleeConvention());
     }
     args.push_back(seed);

test/AutoDiff/autodiff_diagnostics.swift

@@ -170,23 +170,6 @@ struct TF_305 : Differentiable {
   }
 }
 
-protocol TF_534_Layer : Differentiable {
-  associatedtype Input : Differentiable
-  associatedtype Output : Differentiable
-
-  @differentiable
-  func callAsFunction(_ input: Input) -> Output
-}
-struct TF_534_Tensor<Scalar> : Differentiable {}
-
-func TF_534<Model: TF_534_Layer>(
-  _ model: inout Model, inputs: Model.Input
-) -> TF_534_Tensor<Float> where Model.Output == TF_534_Tensor<Float> {
-  return valueWithPullback(at: model) { model -> Model.Output in
-    return model(inputs)
-  }.0
-}
-
 //===----------------------------------------------------------------------===//
 // Classes and existentials (not yet supported)
 //===----------------------------------------------------------------------===//

test/AutoDiff/generics.swift

@@ -151,4 +151,22 @@ func TF_523_f(_ x: TF_523_Struct) -> Float {
   return x.a * 2
 }
 
+// TF_534: Thunk substitution map remapping.
+protocol TF_534_Layer : Differentiable {
+  associatedtype Input : Differentiable
+  associatedtype Output : Differentiable
+
+  @differentiable
+  func callAsFunction(_ input: Input) -> Output
+}
+struct TF_534_Tensor<Scalar> : Differentiable {}
+
+func TF_534<Model: TF_534_Layer>(
+  _ model: inout Model, inputs: Model.Input
+) -> TF_534_Tensor<Float> where Model.Output == TF_534_Tensor<Float> {
+  return valueWithPullback(at: model) { model -> Model.Output in
+    return model(inputs)
+  }.0
+}
+
 // TODO: add more tests.

utils/update_checkout/update-checkout-config.json

@@ -401,7 +401,7 @@
                 "clang-tools-extra": "swift-DEVELOPMENT-SNAPSHOT-2019-06-23-a",
                 "libcxx": "swift-DEVELOPMENT-SNAPSHOT-2019-06-23-a",
                 "tensorflow": "ebc41609e27dcf0998d8970e77a2e1f53e13ac86",
-                "tensorflow-swift-apis": "6045403998c155382466ece924a60b4cfe9cd466",
+                "tensorflow-swift-apis": "380a95c3689bcd2d55df00a28b4640a7a4937c17",
                 "indexstore-db": "swift-DEVELOPMENT-SNAPSHOT-2019-06-23-a",
                 "sourcekit-lsp": "swift-DEVELOPMENT-SNAPSHOT-2019-06-23-a"
             }