Merge branch 'jonbob/cime/update-ic-machines-061317' (PR #1582)

Update LANL IC machines to reflect recent change from moab to slurm This PR updates machine and batch files to reflect the recent LANL machines job scheduler change from moab to slurm. It includes changes for machine grizzly from branch vanroekel/LANLIC_grizzlySlurmTransition as well as changes for machine wolf. This PR also includes adding a default pe-count for wolf to reflect new minimum core count under slurm. Tested with: -compset CMPASO-NYF -res T62_oEC60to30v3 -mach wolf [BFB]
E3SM-Project · Jun 15, 2017 · 372c1c2 · 372c1c2
2 parents f764174 + a5c5eb5
commit 372c1c2
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 11 deletions.
diff --git a/config/acme/allactive/config_pesall.xml b/config/acme/allactive/config_pesall.xml
@@ -148,6 +148,43 @@
       </pes>
     </mach>
   </grid>
+  <grid name="any">
+    <mach name="wolf">
+      <pes compset="any" pesize="any">
+        <comment>none</comment>
+        <ntasks>
+          <ntasks_atm>96</ntasks_atm>
+          <ntasks_lnd>96</ntasks_lnd>
+          <ntasks_rof>96</ntasks_rof>
+          <ntasks_ice>96</ntasks_ice>
+          <ntasks_ocn>96</ntasks_ocn>
+          <ntasks_glc>96</ntasks_glc>
+          <ntasks_wav>96</ntasks_wav>
+          <ntasks_cpl>96</ntasks_cpl>
+        </ntasks>
+        <nthrds>
+          <nthrds_atm>1</nthrds_atm>
+          <nthrds_lnd>1</nthrds_lnd>
+          <nthrds_rof>1</nthrds_rof>
+          <nthrds_ice>1</nthrds_ice>
+          <nthrds_ocn>1</nthrds_ocn>
+          <nthrds_glc>1</nthrds_glc>
+          <nthrds_wav>1</nthrds_wav>
+          <nthrds_cpl>1</nthrds_cpl>
+        </nthrds>
+        <rootpe>
+          <rootpe_atm>0</rootpe_atm>
+          <rootpe_lnd>0</rootpe_lnd>
+          <rootpe_rof>0</rootpe_rof>
+          <rootpe_ice>0</rootpe_ice>
+          <rootpe_ocn>0</rootpe_ocn>
+          <rootpe_glc>0</rootpe_glc>
+          <rootpe_wav>0</rootpe_wav>
+          <rootpe_cpl>0</rootpe_cpl>
+        </rootpe>
+      </pes>
+    </mach>
+  </grid>
   <grid name="a%ne16np4">
     <mach name="any">
       <pes compset="any" pesize="any">

diff --git a/config/acme/machines/config_batch.xml b/config/acme/machines/config_batch.xml
@@ -322,22 +322,25 @@
     </directives>
   </batch_system>
 
-  <batch_system MACH="grizzly" type="moab" >
+  <batch_system MACH="grizzly" type="slurm" >
 	<directives>
-		<directive>-l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}</directive>
-		<directive>-l qos=standard </directive>
+		<directive>--nodes={{ num_nodes }}</directive>
+		<directive>--ntasks-per-node={{ tasks_per_node }}</directive>
+		<directive>--qos=standard </directive>
 	</directives>
 	<queues>
-		<queue walltimemax="16:00:00" default="true">moab</queue>
+		<queue walltimemax="16:00:00" default="true">standard</queue>
 	</queues>
   </batch_system>
 
-   <batch_system MACH="wolf" type="moab" >
+   <batch_system MACH="wolf" type="slurm" >
 	<directives>
-		<directive>-l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}</directive>
+		<directive>--nodes={{ num_nodes }}</directive>
+		<directive>--ntasks-per-node={{ tasks_per_node }}</directive>
+		<directive>--qos=standard </directive>
 	</directives>
 	<queues>
-		<queue walltimemax="16:00:00" default="true">moab</queue>
+		<queue walltimemax="16:00:00" default="true">standard</queue>
 	</queues>
     </batch_system>
 

diff --git a/config/acme/machines/config_compilers.xml b/config/acme/machines/config_compilers.xml
@@ -1267,6 +1267,7 @@ for mct, etc.
         <SCC>gcc</SCC>
         <SCXX>g++</SCXX>
         <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas</ADD_SLIBS>
+        <ADD_SLIBS> ${MKLROOT}/lib/intel64/libmkl_scalapack_lp64.a -Wl,--start-group ${MKLROOT}/lib/intel64/libmkl_intel_lp64.a ${MKLROOT}/lib/intel64/libmkl_core.a ${MKLROOT}/lib/intel64/libmkl_sequential.a -Wl,--end-group ${MKLROOT}/lib/intel64/libmkl_blacs_intelmpi_lp64.a -lpthread -lm -z muldefs</ADD_SLIBS>
         <CXX_LIBS>-lstdc++ -lmpi_cxx</CXX_LIBS>
 </compiler>
 

diff --git a/config/acme/machines/config_machines.xml b/config/acme/machines/config_machines.xml
@@ -2053,7 +2053,7 @@
 </machine>
 
 <machine MACH="grizzly">
-	<DESC>LANL Linux Cluster, 36 pes/node, batch system Moab</DESC>
+	<DESC>LANL Linux Cluster, 36 pes/node, batch system slurm</DESC>
         <NODENAME_REGEX>gr-fe.*.lanl.gov</NODENAME_REGEX>
         <TESTS>acme_developer</TESTS>
         <COMPILERS>gnu,intel</COMPILERS>
@@ -2106,7 +2106,7 @@
 		<env name="PNETCDF_HINTS">romio_ds_write=disable;romio_ds_read=disable;romio_cb_write=enable;romio_cb_read=enable</env>
 	</environment_variables>
 
-	<BATCH_SYSTEM>moab</BATCH_SYSTEM>
+	<BATCH_SYSTEM>slurm</BATCH_SYSTEM>
 	<mpirun mpilib="default">
 		<executable>mpirun</executable>
 		<arguments>
@@ -2137,7 +2137,7 @@
 </machine>
 
 <machine MACH="wolf">
-    <DESC>LANL Linux Cluster, 16 pes/node, batch system Moab</DESC>
+    <DESC>LANL Linux Cluster, 16 pes/node, batch system slurm</DESC>
     <NODENAME_REGEX>wf-fe.*.lanl.gov</NODENAME_REGEX>
     <TESTS>acme_developer</TESTS>
 	<COMPILERS>intel,gnu</COMPILERS>
@@ -2148,7 +2148,7 @@
 	<DOUT_S_ROOT>/lustre/scratch3/turquoise/$ENV{USER}/ACME/archive/$CASE</DOUT_S_ROOT>
 	<DOUT_L_MSROOT>UNSET</DOUT_L_MSROOT>
 	<OS>LINUX</OS>
-	<BATCH_SYSTEM>moab</BATCH_SYSTEM>
+	<BATCH_SYSTEM>slurm</BATCH_SYSTEM>
 	<SUPPORTED_BY>jonbob -at- lanl.gov</SUPPORTED_BY>
 	<GMAKE_J>4</GMAKE_J>
 	<MAX_TASKS_PER_NODE>16</MAX_TASKS_PER_NODE>