Initial compatibility with stock toolchain

Models/Text/WordSeg/Lattice.swift

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import _Differentiation
 import ModelSupport
 import TensorFlow
 

Models/Text/WordSeg/Model.swift

@@ -23,6 +23,10 @@
 import ModelSupport
 import TensorFlow
 
+#if TENSORFLOW_USE_STANDARD_TOOLCHAIN
+import Numerics
+#endif
+
 /// Types that can be optimized by an optimizer.
 ///
 /// TODO: Consider promoting this into a public protocol in swift-apis?

Models/Text/WordSeg/SemiRing.swift

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import _Differentiation
+
 #if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
   import Darwin
 #elseif os(Windows)

Package.swift

@@ -27,6 +27,7 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.10.0"),
         .package(url: "https://github.com/apple/swift-argument-parser", .branch("main")),
         .package(url: "https://github.com/google/swift-benchmark", from: "0.1.0"),
+        .package(url: "https://github.com/apple/swift-numerics", .branch("main")),
     ],
     targets: [
         .target(
@@ -35,12 +36,15 @@ let package = Package(
         .target(name: "Datasets", dependencies: ["ModelSupport"], path: "Datasets"),
         .target(name: "STBImage", path: "Support/STBImage"),
         .target(
-            name: "ModelSupport", dependencies: ["STBImage"], path: "Support",
-            exclude: ["STBImage"]),
+            name: "ModelSupport",
+            dependencies: ["STBImage", .product(name: "Numerics", package: "swift-numerics"),],
+            path: "Support", exclude: ["STBImage"]),
         .target(name: "TensorBoard", dependencies: ["SwiftProtobuf", "ModelSupport", "TrainingLoop"], path: "TensorBoard"),
         .target(name: "ImageClassificationModels", path: "Models/ImageClassification"),
         .target(name: "VideoClassificationModels", path: "Models/Spatiotemporal"),
-        .target(name: "TextModels", dependencies: ["Checkpoints", "Datasets", "SwiftProtobuf"], path: "Models/Text"),
+        .target(name: "TextModels",
+            dependencies: ["Checkpoints", "Datasets", "SwiftProtobuf", .product(name: "Numerics", package: "swift-numerics")],
+            path: "Models/Text"),
         .target(name: "RecommendationModels", path: "Models/Recommendation"),
         .target(name: "TrainingLoop", dependencies: ["ModelSupport"], path: "TrainingLoop"),
         .target(

Support/AnyLayer.swift

@@ -1,3 +1,19 @@
+// Copyright 2020 The TensorFlow Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// TODO: Re-enable this for the stock toolchain when it can be realigned with VectorProtocol.
+#if !TENSORFLOW_USE_STANDARD_TOOLCHAIN
 import TensorFlow
 import _Differentiation
 
@@ -253,3 +269,4 @@ extension AnyLayer: Layer {
     return _callAsFunction(input)
   }
 }
+#endif

Support/AnyLayerTangentVector.swift

@@ -1,3 +1,19 @@
+// Copyright 2020 The TensorFlow Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// TODO: Re-enable this for the stock toolchain when it can be realigned with VectorProtocol.
+#if !TENSORFLOW_USE_STANDARD_TOOLCHAIN
 import TensorFlow
 import _Differentiation
 
@@ -824,3 +840,4 @@ extension AnyLayerTangentVector: ElementaryFunctions {
     return .init(box: x.box._root(n))
   }
 }
+#endif

Tests/SupportTests/AnyLayerTests.swift

@@ -16,6 +16,13 @@ import XCTest
 import ModelSupport
 import TensorFlow
 
+// TODO: Re-enable these once AnyLayer can be aligned with the new VectorProtocol.
+#if TENSORFLOW_USE_STANDARD_TOOLCHAIN
+final class AnyLayerTests: XCTestCase {
+    static var allTests = [(String, (XCTestCase) -> () -> Void)]()
+}
+#else
+
 struct ElementaryFunctionsTests<WrapperTestType: XCTestCase, Reference: ElementaryFunctions, Test: ElementaryFunctions> {
     let createReference: ([Float]) -> Reference
     let referenceToTest: (Reference) -> Test
@@ -167,3 +174,4 @@ final class AnyLayerTests: XCTestCase {
         ("testTangentVectorElementaryFunctions", testTangentVectorElementaryFunctions),
     ]
 }
+#endif