Merge pull request #8 from xylar/switch_to_configuration_on_cori

Switch Cori from partitions to configurations
E3SM-Project · Oct 14, 2021 · 33b1446 · 33b1446
2 parents 90caff7 + a12b693
commit 33b1446
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/mache/machine_info.py b/mache/machine_info.py
@@ -323,6 +323,10 @@ def get_account_defaults(self):
             The default partition on the machine, or ``None`` if no partition
             should be specified
 
+        configuration : str
+            The default configuration on the machine, or ``None`` if no
+            configuration should be specified
+
         qos : str
             The default quality of service on the machine, or ``None`` if no
             QOS should be specified
@@ -340,14 +344,21 @@ def get_account_defaults(self):
         else:
             partition = None
 
+        if config.has_option('parallel', 'configurations'):
+            configuration = config.get('parallel', 'configurations')
+            # take the first entry
+            configuration = configuration.split(',')[0].strip()
+        else:
+            configuration = None
+
         if config.has_option('parallel', 'qos'):
             qos = config.get('parallel', 'qos')
             # take the first entry
             qos = qos.split(',')[0].strip()
         else:
             qos = None
 
-        return account, partition, qos
+        return account, partition, configuration, qos
 
     def _get_config(self):
         """ get a parser for config options """

diff --git a/mache/machines/cori-haswell.cfg b/mache/machines/cori-haswell.cfg
@@ -39,8 +39,8 @@ cores_per_node = 32
 # account for running diagnostics jobs
 account = e3sm
 
-# available partition(s) (default is the first)
-partitions = haswell
+# available configurations(s) (default is the first)
+configurations = haswell
 
 # quality of service (default is the first)
 qos = regular, premium, debug
diff --git a/mache/machines/cori-knl.cfg b/mache/machines/cori-knl.cfg
@@ -39,8 +39,8 @@ cores_per_node = 68
 # account for running diagnostics jobs
 account = e3sm
 
-# available partition(s) (default is the first)
-partitions = knl
+# available configurations(s) (default is the first)
+configurations = knl
 
 # quality of service (default is the first)
 qos = regular, premium, debug