garlic/machines.nix

@@ -7,7 +7,7 @@
   mn4 = {
     config = {
       name = "mn4";
-      sshHosts = [ "mn1" "mn2" "mn3" ];
+      sshHost = "mn1";
       nixPrefix = "/gpfs/projects/bsc15/nix";
       cachelineBytes = 64;
       march = "skylake-avx512";

garlic/stages/trebuchet.nix

@@ -6,10 +6,7 @@
 {
   nextStage
 , nixPrefix
-
-# FIXME: These two should be specified in the configuration of the machine
-, sshHost ? "mn"
-, targetCluster ? "mn4"
+, sshHost
 }:
 
 with garlicTools;

garlic/stdexp.nix

@@ -16,7 +16,7 @@ rec {
   /* Takes a list of units and builds an experiment, after executing the
   trebuchet, runexp and isolate stages. Returns the trebuchet stage. */
   buildTrebuchet = units: stages.trebuchet {
-    inherit (machineConf) nixPrefix;
+    inherit (machineConf) nixPrefix sshHost;
     nextStage = stages.runexp {
       inherit (machineConf) nixPrefix;
       nextStage = stages.isolate {