Fix ResNet build. (#140)

* Fix ResNet build.

* Remove Foundation import.

Author: rxwei

CIFAR/data.swift renamed to CIFAR/Data.swift

@@ -117,42 +117,3 @@ extension ResNet {
         self.init(blockCount: kind.rawValue)
     }
 }
-
-// TODO: remove this when TF supports differentiableReduce, thanks @rxwei!
-public extension Array where Element: Differentiable {
-    func differentiableReduce<Result: Differentiable>(
-        _ initialResult: Result,
-        _ nextPartialResult: @differentiable (Result, Element) -> Result
-    ) -> Result {
-        return reduce(initialResult, nextPartialResult)
-    }
-
-    @usableFromInline
-    @differentiating(differentiableReduce(_:_:), wrt: (self, initialResult))
-    internal func reduceDerivative<Result: Differentiable>(
-        _ initialResult: Result,
-        _ nextPartialResult: @differentiable (Result, Element) -> Result
-    ) -> (value: Result,
-          pullback: (Result.CotangentVector) -> (Array.CotangentVector, Result.CotangentVector)) {
-        var pullbacks: [(Result.CotangentVector) -> (Result.CotangentVector, Element.CotangentVector)] = []
-        let count = self.count
-        pullbacks.reserveCapacity(count)
-        var result = initialResult
-        for element in self {
-            let (y, pb) = Swift.valueWithPullback(at: result, element, in: nextPartialResult)
-            result = y
-            pullbacks.append(pb)
-        }
-        return (value: result, pullback: { cotangent in
-            var resultCotangent = cotangent
-            var elementCotangents = CotangentVector([])
-            elementCotangents.base.reserveCapacity(count)
-            for pullback in pullbacks.reversed() {
-                let (newResultCotangent, elementCotangent) = pullback(resultCotangent)
-                resultCotangent = newResultCotangent
-                elementCotangents.base.append(elementCotangent)
-            }
-            return (CotangentVector(elementCotangents.base.reversed()), resultCotangent)
-        })
-    }
-}

CIFAR/models.swift renamed to CIFAR/Models.swift

@@ -175,42 +175,3 @@ extension WideResNet {
         }
     }
 }
-
-// TODO: remove this when TF supports differentiableReduce, thanks @rxwei!
-public extension Array where Element: Differentiable {
-    func differentiableReduce<Result: Differentiable>(
-        _ initialResult: Result,
-        _ nextPartialResult: @differentiable (Result, Element) -> Result
-    ) -> Result {
-        return reduce(initialResult, nextPartialResult)
-    }
-
-    @usableFromInline
-    @differentiating(differentiableReduce(_:_:), wrt: (self, initialResult))
-    internal func reduceDerivative<Result: Differentiable>(
-        _ initialResult: Result,
-        _ nextPartialResult: @differentiable (Result, Element) -> Result
-    ) -> (value: Result,
-          pullback: (Result.CotangentVector) -> (Array.CotangentVector, Result.CotangentVector)) {
-        var pullbacks: [(Result.CotangentVector) -> (Result.CotangentVector, Element.CotangentVector)] = []
-        let count = self.count
-        pullbacks.reserveCapacity(count)
-        var result = initialResult
-        for element in self {
-            let (y, pb) = Swift.valueWithPullback(at: result, element, in: nextPartialResult)
-            result = y
-            pullbacks.append(pb)
-        }
-        return (value: result, pullback: { cotangent in
-            var resultCotangent = cotangent
-            var elementCotangents = CotangentVector([])
-            elementCotangents.base.reserveCapacity(count)
-            for pullback in pullbacks.reversed() {
-                let (newResultCotangent, elementCotangent) = pullback(resultCotangent)
-                resultCotangent = newResultCotangent
-                elementCotangents.base.append(elementCotangent)
-            }
-            return (CotangentVector(elementCotangents.base.reversed()), resultCotangent)
-        })
-    }
-}

CIFAR/resnet.swift renamed to CIFAR/ResNet.swift

@@ -0,0 +1,52 @@
+// Copyright 2019 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: Remove this when it's moved to the standard library.
+extension Array where Element: Differentiable {
+    func differentiableReduce<Result: Differentiable>(
+        _ initialResult: Result,
+        _ nextPartialResult: @differentiable (Result, Element) -> Result
+    ) -> Result {
+        return reduce(initialResult, nextPartialResult)
+    }
+    
+    @differentiating(differentiableReduce(_:_:), wrt: (self, initialResult))
+    func reduceDerivative<Result: Differentiable>(
+        _ initialResult: Result,
+        _ nextPartialResult: @differentiable (Result, Element) -> Result
+    ) -> (value: Result,
+          pullback: (Result.CotangentVector) -> (Array.CotangentVector, Result.CotangentVector)) {
+        var pullbacks: [(Result.CotangentVector)
+            -> (Result.CotangentVector, Element.CotangentVector)] = []
+        let count = self.count
+        pullbacks.reserveCapacity(count)
+        var result = initialResult
+        for element in self {
+            let (y, pb) = Swift.valueWithPullback(at: result, element, in: nextPartialResult)
+            result = y
+            pullbacks.append(pb)
+        }
+        return (value: result, pullback: { cotangent in
+            var resultCotangent = cotangent
+            var elementCotangents = CotangentVector([])
+            elementCotangents.base.reserveCapacity(count)
+            for pullback in pullbacks.reversed() {
+                let (newResultCotangent, elementCotangent) = pullback(resultCotangent)
+                resultCotangent = newResultCotangent
+                elementCotangents.base.append(elementCotangent)
+            }
+            return (CotangentVector(elementCotangents.base.reversed()), resultCotangent)
+        })
+    }
+}