yaml

dhrun/all-tests.dh

@@ -5,9 +5,9 @@
   
   let cn = "testContainer"
   
-  let basicManifest = lib.manifestDir ++ "basic.json"
+  let basicManifest = lib.manifestDir ++ "basic.yml"
   
-  let singularityManifest = lib.manifestDir ++ "singularity.json"
+  let singularityManifest = lib.manifestDir ++ "singularity.yml"
   
   let argIfTest =
           λ(isTest : Bool)
@@ -150,7 +150,7 @@
               , isTest =
                   True
               , manifestname =
-                  "perfwrap.json"
+                  "perfwrap.yml"
               }
           )
       , qmcpack =

dhrun/lib.dh

@@ -249,7 +249,7 @@
         →   { cmd =
                 cmd
             , manifestname =
-                "perfwrap.json"
+                "perfwrap.yml"
             , filter =
                 filter
             , args =
@@ -280,7 +280,7 @@
                         
                         then  args.manifestname
                         
-                        else  "parallel.json"
+                        else  "parallel.yml"
                       )
               , containerName =
                   cn
@@ -385,7 +385,7 @@
             ⫽ { args =
                   args.args
               , manifestname =
-                  "basic.json"
+                  "basic.yml"
               , vars =
                   args.vars
               , passvars =

dhrun/manifests/basic.yml

+---
+name: basic
+version: 0.0.1
+app:
+  container:
+    cpus: 2
+    mems: 1

dhrun/manifests/parallel.yml

+---
+name: parallel
+version: 0.0.1
+app:
+  container:
+    cpus: 24
+    mems: 2

dhrun/manifests/perfwrap.yml

+---
+name: basic
+version: 0.0.1
+app:
+  container:
+    cpus: 2
+    mems: 1
+  perfwrapper: true

dhrun/manifests/singularity.yml

+---
+name: basic
+version: 0.0.1
+app:
+  container:
+    cpus: 1
+    mems: 1
+image:
+  path: docker://ubuntu
+  type: docker
+  binds:
+    - "/nix"

pkgs/nrm/default.nix

@@ -6,6 +6,7 @@ pythonPackages.buildPythonPackage {
     pythonPackages.six
     pythonPackages.numpy
     pythonPackages.tornado
+    pythonPackages.pyyaml
     pyzmq
     hwloc
     linuxPackages.perf