standardize measure function

Author: porterchild

.gitignore

@@ -9,3 +9,4 @@ DerivedData
 .build/
 .swift-version
 *.swp
+main

Benchmarks/BuildingSimulation/PyTorch/PyTorchSimulator.py

@@ -181,7 +181,7 @@ def fullPipe(simParams):
 for i in range(trials):
 
     inputs = SimParamsConstant
-    forwardOnlyTime, forwardOutput = measure(fullPipe, inputs)
+    forwardTime, forwardOutput = measure(fullPipe, inputs)
 
     simParams = SimParamsConstant
     def getGradient(simParams):
@@ -192,7 +192,7 @@ def getGradient(simParams):
     gradientTime, gradient = measure(getGradient, simParams)
 
     if i >= warmup:
-        totalForwardTime += forwardOnlyTime
+        totalForwardTime += forwardTime
         totalGradientTime += gradientTime
 
 

Benchmarks/BuildingSimulation/Swift/main.swift

@@ -178,7 +178,7 @@ func simulate(simParams: SimParams) -> Float {
     var quanta = simParams.quanta
 
     slab.temp = simParams.startingTemp
-    for i in 0 ..< timesteps {
+    for _ in 0 ..< timesteps {
         let tankAndQuanta = updateSourceTank(store: tank, quanta: quanta)
         tank = tankAndQuanta.tank
         quanta = tankAndQuanta.quanta
@@ -201,12 +201,12 @@ func dontLetTheCompilerOptimizeThisAway<T>(_ x: T) {
     blackHole = x
 }
 
-func measure(_ block: () throws -> Void) -> Double {
+func measure<T>(_ block: () throws -> T) throws -> (time: Double, result: T) {
     let t0 = DispatchTime.now()
-    try! block()
+    let result = try block()
     let t1 = DispatchTime.now()
     let elapsed = Double(t1.uptimeNanoseconds - t0.uptimeNanoseconds) / 1E9
-    return elapsed
+    return (elapsed, result)
 }
 
 @differentiable(reverse)
@@ -222,15 +222,16 @@ var totalPureForwardTime: Double = 0
 var totalGradientTime: Double = 0
 
 for _ in 0 ..< trials {
-    let forwardOnly = measure {
-        let output = fullPipe(simParams: simParams)
-        dontLetTheCompilerOptimizeThisAway(output)
+    let (forwardOnly, _) = try measure {
+        return fullPipe(simParams: simParams)
     }
+    dontLetTheCompilerOptimizeThisAway(forwardOnly)
 
-    var grad: SimParams.TangentVector?
+    let (gradientTime, grad) = try measure {
+        return gradient(at: simParams, of: fullPipe)
+    }
+    dontLetTheCompilerOptimizeThisAway(grad)
 
-    let gradientTime = measure {
-        grad = gradient(at: simParams, of: fullPipe)
     }
 
     totalPureForwardTime += forwardOnly

Benchmarks/BuildingSimulation/TensorFlow/TensorFlowSimulator.py

@@ -211,7 +211,7 @@ def measure(function, arguments):
     start = time.time()
     result = function(arguments)
     end = time.time()
-    return end - start
+    return (end - start, result)
 
 
 @tf.function
@@ -230,7 +230,7 @@ def fullPipe(simParams):
 
 for i in range(trials + warmup):
 
-    forwardOnly = measure(fullPipe, SimParamsConstant)
+    forwardTime, forwardOutput = measure(fullPipe, SimParamsConstant)
 
     simParams = tf.Variable(SimParamsConstant)
     def getGradient(simParams):
@@ -241,10 +241,10 @@ def getGradient(simParams):
         return gradient
 
 
-    gradientTime = measure(getGradient, simParams)
-    
+    gradientTime, gradient = measure(getGradient, simParams)
+
     if i >= warmup:
-        totalForwardTime += forwardOnly
+        totalForwardTime += forwardTime
         totalGradientTime += gradientTime