Add artifact of benchmark

hasktorch · Nov 6, 2019 · 47de11a · 47de11a
1 parent 1a1f55b
commit 47de11a
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 31 deletions.
diff --git a/.github/workflows/cabal-linux.yml b/.github/workflows/cabal-linux.yml
@@ -33,6 +33,5 @@ jobs:
         export PATH=/opt/ghc/bin:$PATH
         source setenv
         cabal v2-test all --jobs=2 --write-ghc-environment-files=always
-        cabal v2-exec codegen-exe
-        cabal exec xor-mlp -- +RTS -hc -p
-        cat xor-mlp.prof
+        cabal v2-run codegen-exe
+        cabal v2-run xor-mlp
diff --git a/.github/workflows/nix-linux.yml b/.github/workflows/nix-linux.yml
@@ -16,3 +16,19 @@ jobs:
       with:
         name: hasktorch
         signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
+    - name: Run benchmark
+      run: |
+        nix-env -i mnist
+        ln -s ~/.nix-profile data
+        nix-build -A hasktorch-examples_cpu ./default.nix
+        export DEVICE=cpu
+        export NUM_ITERS=3000
+        ./result/bin/static-mnist-mlp +RTS -hc -p -A128m
+        cat static-mnist-mlp.prof
+        mkdir artifact
+        mv static-mnist-mlp.* artifact
+        mv loss.html artifact
+    - uses: actions/upload-artifact@master
+      with:
+        name: benchmark
+        path: artifact
diff --git a/.github/workflows/stack-linux.yml b/.github/workflows/stack-linux.yml
@@ -29,6 +29,9 @@ jobs:
         stack test codegen
         stack test libtorch-ffi
         stack test hasktorch
-        stack exec codegen-exe
-        stack exec xor-mlp -- +RTS -hc -p
-        cat xor-mlp.prof
+        stack run codegen-exe
+        stack run regression
+        stack run gaussian-process
+        stack run vae
+        stack run optimizers
+        stack run xor-mlp
diff --git a/.github/workflows/stack-macos.yaml b/.github/workflows/stack-macos.yaml
@@ -29,10 +29,9 @@ jobs:
         stack test codegen
         stack test libtorch-ffi
         stack test hasktorch
-        stack exec codegen-exe
-        stack exec regression
-        stack exec gaussian-process
-        stack exec vae
-        stack exec optimizers
-        stack exec xor-mlp -- +RTS -hc -p
-        cat xor-mlp.prof
+        stack run codegen-exe
+        stack run regression
+        stack run gaussian-process
+        stack run vae
+        stack run optimizers
+        stack run xor-mlp
diff --git a/examples/static-mnist-cnn/Main.hs b/examples/static-mnist-cnn/Main.hs
@@ -34,6 +34,7 @@ import           System.Random
 
 import qualified ATen.Cast                     as ATen
 import qualified ATen.Class                    as ATen
+import qualified ATen.GC                       as ATen
 import qualified ATen.Type                     as ATen
 import qualified ATen.Managed.Type.Tensor      as ATen
 import qualified ATen.Managed.Type.Context     as ATen
@@ -115,9 +116,13 @@ instance ( KnownDType dtype
 type BatchSize = 512
 type TestBatchSize = 8192
 
-train :: forall (device :: (D.DeviceType, Nat)) . _ => IO ()
-train = do
-  let (numIters, printEvery) = (1000000, 250)
+train
+  :: forall (device :: (D.DeviceType, Nat))
+  . _
+  => Int
+  -> IO ()
+train numIters = do
+  let printEvery = 250
   (trainingData, testData) <- I.initMnist
   ATen.manual_seed_L 123
   init            <- A.sample (CNNSpec @ 'D.Float @device)
@@ -178,9 +183,13 @@ train = do
     return (crossEntropyLoss prediction target, errorRate prediction target)
 
 main :: IO ()
-main = do
+main = ATen.monitorMemory $ do
   deviceStr <- try (getEnv "DEVICE") :: IO (Either SomeException String)
+  numItersStr <- try (getEnv "NUM_ITERS") :: IO (Either SomeException String)
+  numIters <- case numItersStr of
+    Right iters -> return $ read iters
+    _ -> return 1000000
   case deviceStr of
-    Right "cpu"    -> train @'( 'D.CPU, 0)
-    Right "cuda:0" -> train @'( 'D.CUDA, 0)
+    Right "cpu"    -> train @'( 'D.CPU, 0) numIters
+    Right "cuda:0" -> train @'( 'D.CUDA, 0) numIters
     _              -> error "Don't know what to do or how."
diff --git a/examples/static-mnist-mlp/Main.hs b/examples/static-mnist-mlp/Main.hs
@@ -32,6 +32,7 @@ import           System.Random
 
 import qualified ATen.Cast                     as ATen
 import qualified ATen.Class                    as ATen
+import qualified ATen.GC                       as ATen
 import qualified ATen.Type                     as ATen
 import qualified ATen.Managed.Type.Tensor      as ATen
 import qualified ATen.Managed.Type.Context     as ATen
@@ -137,9 +138,10 @@ type HiddenFeatures1 = 256
 train
   :: forall (device :: (D.DeviceType, Nat))
    . _
-  => IO ()
-train = do
-  let (numIters, printEvery) = (1000000, 250)
+  => Int
+  -> IO ()
+train numIters = do
+  let printEvery = 250
       dropoutProb            = 0.5
   (trainingData, testData) <- I.initMnist
   ATen.manual_seed_L 123
@@ -210,9 +212,13 @@ train = do
     return (crossEntropyLoss prediction target, errorRate prediction target)
 
 main :: IO ()
-main = do
+main = ATen.monitorMemory $ do
   deviceStr <- try (getEnv "DEVICE") :: IO (Either SomeException String)
+  numItersStr <- try (getEnv "NUM_ITERS") :: IO (Either SomeException String)
+  numIters <- case numItersStr of
+    Right iters -> return $ read iters
+    _ -> return 1000000
   case deviceStr of
-    Right "cpu"    -> train @'( 'D.CPU, 0)
-    Right "cuda:0" -> train @'( 'D.CUDA, 0)
+    Right "cpu"    -> train @'( 'D.CPU, 0) numIters
+    Right "cuda:0" -> train @'( 'D.CUDA, 0) numIters
     _              -> error "Don't know what to do or how."
diff --git a/setup-cabal.sh b/setup-cabal.sh
@@ -14,6 +14,4 @@ extra-lib-dirs:
     $(pwd)/deps/libtorch/lib
   , $(pwd)/deps/mklml/lib
 
-profiling: True
-
 EOF
diff --git a/stack.yaml b/stack.yaml
@@ -21,7 +21,3 @@ extra-lib-dirs:
 
 extra-deps:
 - template-0.2.0.10@sha256:f822de4d34c45bc84b33a61bc112c15fedee6fa6dc414c62b10456395a868f85
-
-build:
-  library-profiling: true
-  executable-profiling: true