Resolve Swift toolchain build errors (#316)

This week, the S4TF team encountered several failures building toolchains: 1. Outdated Package.resolved in [swift/FastaiNotebook_11_imagenette](https://github.com/fastai/fastai_dev/blob/master/swift/FastaiNotebook_11_imagenette/Package.resolved). 2. A regression in `ParameterlessLayer` caused by a change in type inference behavior in [swiftlang/swift#32578](swiftlang/swift#32578). This PR includes two workarounds that unblock toolchain builds: 1. Remove Package.resolved ([swift-apis/1036](tensorflow/swift-apis#1036)). Since this file is regenerated on build, it's often not necessary to include in source control. 2. Add a typealias to instances conforming to `ParameterlessLayer`, which was effective in swift-apis and swift-models (see [tensorflow/swift-apis#1037](tensorflow/swift-apis#1037)). I'm happy to create an additional PR to remove the other Package.resolved files in this repo and add to .gitignore, if desired.
fastai · Jul 3, 2020 · 4a33cb2 · 4a33cb2
1 parent 9ba4512
commit 4a33cb2
Show file tree

Hide file tree

Showing 18 changed files with 67 additions and 34 deletions.
diff --git a/swift/01a_fastai_layers.ipynb b/swift/01a_fastai_layers.ipynb
@@ -460,6 +460,8 @@
     "\n",
     "@frozen\n",
     "public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {\n",
+    "    // swift-apis#1037 workaround.\n",
+    "    public typealias TangentVector = EmptyTangentVector\n",
     "    // TF-603 workaround.\n",
     "    public typealias Input = Tensor<Scalar>\n",
     "    public typealias Output = Tensor<Scalar>\n",
@@ -508,6 +510,8 @@
     "\n",
     "@frozen\n",
     "public struct FAGlobalAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {\n",
+    "    // swift-apis#1037 workaround.\n",
+    "    public typealias TangentVector = EmptyTangentVector\n",
     "    // TF-603 workaround.\n",
     "    public typealias Input = Tensor<Scalar>\n",
     "    public typealias Output = Tensor<Scalar>\n",

diff --git a/...tebook_01a_fastai_layers/Sources/FastaiNotebook_01a_fastai_layers/01a_fastai_layers.swift b/...tebook_01a_fastai_layers/Sources/FastaiNotebook_01a_fastai_layers/01a_fastai_layers.swift
@@ -223,6 +223,8 @@ public extension FAConv2D {
 
 @frozen
 public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>
@@ -263,6 +265,8 @@ public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,Parameterles
 
 @frozen
 public struct FAGlobalAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>

diff --git a/...book_02_fully_connected/Sources/FastaiNotebook_02_fully_connected/01a_fastai_layers.swift b/...book_02_fully_connected/Sources/FastaiNotebook_02_fully_connected/01a_fastai_layers.swift
@@ -223,6 +223,8 @@ public extension FAConv2D {
 
 @frozen
 public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>
@@ -263,6 +265,8 @@ public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,Parameterles
 
 @frozen
 public struct FAGlobalAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>

diff --git a/...FastaiNotebook_02a_why_sqrt5/Sources/FastaiNotebook_02a_why_sqrt5/01a_fastai_layers.swift b/...FastaiNotebook_02a_why_sqrt5/Sources/FastaiNotebook_02a_why_sqrt5/01a_fastai_layers.swift
@@ -223,6 +223,8 @@ public extension FAConv2D {
 
 @frozen
 public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>
@@ -263,6 +265,8 @@ public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,Parameterles
 
 @frozen
 public struct FAGlobalAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>

diff --git a/...3_minibatch_training/Sources/FastaiNotebook_03_minibatch_training/01a_fastai_layers.swift b/...3_minibatch_training/Sources/FastaiNotebook_03_minibatch_training/01a_fastai_layers.swift
@@ -223,6 +223,8 @@ public extension FAConv2D {
 
 @frozen
 public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>
@@ -263,6 +265,8 @@ public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,Parameterles
 
 @frozen
 public struct FAGlobalAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>

diff --git a/...t/FastaiNotebook_04_callbacks/Sources/FastaiNotebook_04_callbacks/01a_fastai_layers.swift b/...t/FastaiNotebook_04_callbacks/Sources/FastaiNotebook_04_callbacks/01a_fastai_layers.swift
@@ -223,6 +223,8 @@ public extension FAConv2D {
 
 @frozen
 public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>
@@ -263,6 +265,8 @@ public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,Parameterles
 
 @frozen
 public struct FAGlobalAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>

diff --git a/swift/FastaiNotebook_05_anneal/Sources/FastaiNotebook_05_anneal/01a_fastai_layers.swift b/swift/FastaiNotebook_05_anneal/Sources/FastaiNotebook_05_anneal/01a_fastai_layers.swift
@@ -223,6 +223,8 @@ public extension FAConv2D {
 
 @frozen
 public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>
@@ -263,6 +265,8 @@ public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,Parameterles
 
 @frozen
 public struct FAGlobalAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>

diff --git a/...book_05b_early_stopping/Sources/FastaiNotebook_05b_early_stopping/01a_fastai_layers.swift b/...book_05b_early_stopping/Sources/FastaiNotebook_05b_early_stopping/01a_fastai_layers.swift
@@ -223,6 +223,8 @@ public extension FAConv2D {
 
 @frozen
 public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>
@@ -263,6 +265,8 @@ public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,Parameterles
 
 @frozen
 public struct FAGlobalAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>

diff --git a/swift/FastaiNotebook_06_cuda/Sources/FastaiNotebook_06_cuda/01a_fastai_layers.swift b/swift/FastaiNotebook_06_cuda/Sources/FastaiNotebook_06_cuda/01a_fastai_layers.swift
@@ -223,6 +223,8 @@ public extension FAConv2D {
 
 @frozen
 public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>
@@ -263,6 +265,8 @@ public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,Parameterles
 
 @frozen
 public struct FAGlobalAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>

diff --git a/...t/FastaiNotebook_07_batchnorm/Sources/FastaiNotebook_07_batchnorm/01a_fastai_layers.swift b/...t/FastaiNotebook_07_batchnorm/Sources/FastaiNotebook_07_batchnorm/01a_fastai_layers.swift
@@ -223,6 +223,8 @@ public extension FAConv2D {
 
 @frozen
 public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>
@@ -263,6 +265,8 @@ public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,Parameterles
 
 @frozen
 public struct FAGlobalAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>

diff --git a/...FastaiNotebook_08_data_block/Sources/FastaiNotebook_08_data_block/01a_fastai_layers.swift b/...FastaiNotebook_08_data_block/Sources/FastaiNotebook_08_data_block/01a_fastai_layers.swift
@@ -223,6 +223,8 @@ public extension FAConv2D {
 
 @frozen
 public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>
@@ -263,6 +265,8 @@ public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,Parameterles
 
 @frozen
 public struct FAGlobalAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>

diff --git a/...us_dictionary/Sources/FastaiNotebook_08a_heterogeneous_dictionary/01a_fastai_layers.swift b/...us_dictionary/Sources/FastaiNotebook_08a_heterogeneous_dictionary/01a_fastai_layers.swift
@@ -223,6 +223,8 @@ public extension FAConv2D {
 
 @frozen
 public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>
@@ -263,6 +265,8 @@ public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,Parameterles
 
 @frozen
 public struct FAGlobalAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>

diff --git a/..._data_block_generic/Sources/FastaiNotebook_08c_data_block_generic/01a_fastai_layers.swift b/..._data_block_generic/Sources/FastaiNotebook_08c_data_block_generic/01a_fastai_layers.swift
@@ -223,6 +223,8 @@ public extension FAConv2D {
 
 @frozen
 public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>
@@ -263,6 +265,8 @@ public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,Parameterles
 
 @frozen
 public struct FAGlobalAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>

diff --git a/...t/FastaiNotebook_09_optimizer/Sources/FastaiNotebook_09_optimizer/01a_fastai_layers.swift b/...t/FastaiNotebook_09_optimizer/Sources/FastaiNotebook_09_optimizer/01a_fastai_layers.swift
@@ -223,6 +223,8 @@ public extension FAConv2D {
 
 @frozen
 public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>
@@ -263,6 +265,8 @@ public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,Parameterles
 
 @frozen
 public struct FAGlobalAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>

diff --git a/swift/FastaiNotebook_10_mixup_ls/Sources/FastaiNotebook_10_mixup_ls/01a_fastai_layers.swift b/swift/FastaiNotebook_10_mixup_ls/Sources/FastaiNotebook_10_mixup_ls/01a_fastai_layers.swift
@@ -223,6 +223,8 @@ public extension FAConv2D {
 
 @frozen
 public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>
@@ -263,6 +265,8 @@ public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,Parameterles
 
 @frozen
 public struct FAGlobalAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>

diff --git a/swift/FastaiNotebook_11_imagenette/Package.resolved b/swift/FastaiNotebook_11_imagenette/Package.resolved
diff --git a/...FastaiNotebook_11_imagenette/Sources/FastaiNotebook_11_imagenette/01a_fastai_layers.swift b/...FastaiNotebook_11_imagenette/Sources/FastaiNotebook_11_imagenette/01a_fastai_layers.swift
@@ -223,6 +223,8 @@ public extension FAConv2D {
 
 @frozen
 public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>
@@ -263,6 +265,8 @@ public struct FAAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,Parameterles
 
 @frozen
 public struct FAGlobalAvgPool2D<Scalar: TensorFlowFloatingPoint>: FALayer,ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
     // TF-603 workaround.
     public typealias Input = Tensor<Scalar>
     public typealias Output = Tensor<Scalar>

diff --git a/swift/FastaiNotebook_11_imagenette/Sources/FastaiNotebook_11_imagenette/11_imagenette.swift b/swift/FastaiNotebook_11_imagenette/Sources/FastaiNotebook_11_imagenette/11_imagenette.swift
@@ -29,6 +29,9 @@ public struct ConvLayer: Layer {
 }
 
 public struct MaybeAvgPool2D: ParameterlessLayer {
+    // swift-apis#1037 workaround.
+    public typealias TangentVector = EmptyTangentVector
+
     @noDerivative let poolSize: (Int, Int, Int, Int)
     @noDerivative let strides: (Int, Int, Int, Int)
     @noDerivative let padding: Padding