From 6e7b8e662f3c4a14ff9b831f3f512debd6ceca46 Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Sat, 27 Jan 2024 09:15:49 -0700
Subject: [PATCH] Update machine chicoma-cpu

---
 .../machines/Depends.chicoma-cpu.gnu.cmake    | 13 +++++++
 cime_config/machines/config_machines.xml      | 34 ++++++++++++-------
 2 files changed, 34 insertions(+), 13 deletions(-)
 create mode 100644 cime_config/machines/Depends.chicoma-cpu.gnu.cmake

diff --git a/cime_config/machines/Depends.chicoma-cpu.gnu.cmake b/cime_config/machines/Depends.chicoma-cpu.gnu.cmake
new file mode 100644
index 000000000000..9ebd88ff8762
--- /dev/null
+++ b/cime_config/machines/Depends.chicoma-cpu.gnu.cmake
@@ -0,0 +1,13 @@
+# For this file, fixes non-BFB behavior of stealth feature on pm-cpu with -O2
+set(NOOPT
+  eam/src/physics/cam/zm_conv.F90)
+
+if (NOT DEBUG)
+  foreach(ITEM IN LISTS NOOPT)
+    e3sm_deoptimize_file("${ITEM}")
+  endforeach()
+endif()
+
+
+
+
diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml
index b9904bb8e789..fe81f85d250d 100644
--- a/cime_config/machines/config_machines.xml
+++ b/cime_config/machines/config_machines.xml
@@ -4110,7 +4110,7 @@
     <DESC>Chicoma CPU-only nodes at LANL IC. Each node has 2 AMD EPYC 7H12 64-Core (Milan) 512GB</DESC>
     <NODENAME_REGEX>ch-fe*</NODENAME_REGEX>
     <OS>Linux</OS>
-    <COMPILERS>gnu,nvidia,intel,aocc,amdclang</COMPILERS>
+    <COMPILERS>gnu,intel,nvidia,amdclang</COMPILERS>
     <MPILIBS>mpich</MPILIBS>
     <CIME_OUTPUT_ROOT>/lustre/scratch4/turquoise/$ENV{USER}/E3SM/scratch/chicoma-cpu</CIME_OUTPUT_ROOT>
     <DIN_LOC_ROOT>/usr/projects/e3sm/inputdata</DIN_LOC_ROOT>
@@ -4124,15 +4124,15 @@
     <BATCH_SYSTEM>slurm</BATCH_SYSTEM>
     <SUPPORTED_BY>e3sm</SUPPORTED_BY>
     <MAX_TASKS_PER_NODE>256</MAX_TASKS_PER_NODE>
-    <MAX_MPITASKS_PER_NODE>64</MAX_MPITASKS_PER_NODE>
+    <MAX_MPITASKS_PER_NODE>128</MAX_MPITASKS_PER_NODE>
     <PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
     <mpirun mpilib="default">
       <executable>srun</executable>
       <arguments>
         <arg name="label"> --label</arg>
         <arg name="num_tasks"> -n {{ total_tasks }} -N {{ num_nodes }}</arg>
-        <arg name="thread_count">-c $ENV{OMP_NUM_THREADS}</arg>
-        <arg name="binding"> $SHELL{if [ 128 -ge `./xmlquery --value MAX_MPITASKS_PER_NODE` ]; then echo "--cpu_bind=cores"; else echo "--cpu_bind=threads";fi;} </arg>
+        <arg name="thread_count">-c $SHELL{echo 256/`./xmlquery --value MAX_MPITASKS_PER_NODE`|bc}</arg>
+        <arg name="binding"> $SHELL{if [ 128 -ge `./xmlquery --value MAX_MPITASKS_PER_NODE` ]; then echo "--cpu_bind=cores"; else echo "--cpu_bind=threads";fi;}</arg>
         <arg name="placement"> -m plane=$SHELL{echo `./xmlquery --value MAX_MPITASKS_PER_NODE`}</arg>
     </arguments>
     </mpirun>
@@ -4151,23 +4151,36 @@
         <command name="unload">cray-hdf5-parallel</command>
         <command name="unload">cray-netcdf-hdf5parallel</command>
         <command name="unload">cray-parallel-netcdf</command>
+        <command name="unload">cray-netcdf</command>
+        <command name="unload">cray-hdf5</command>
         <command name="unload">PrgEnv-gnu</command>
+        <command name="unload">PrgEnv-intel</command>
         <command name="unload">PrgEnv-nvidia</command>
         <command name="unload">PrgEnv-cray</command>
         <command name="unload">PrgEnv-aocc</command>
+        <command name="unload">intel</command>
+        <command name="unload">intel-oneapi</command>
+        <command name="unload">nvidia</command>
+        <command name="unload">aocc</command>
+        <command name="unload">cudatoolkit</command>
+        <command name="unload">climate-utils</command>
         <command name="unload">craype-accel-nvidia80</command>
         <command name="unload">craype-accel-host</command>
-        <command name="unload">cce</command>
+        <command name="unload">perftools-base</command>
+        <command name="unload">perftools</command>
+        <command name="unload">darshan</command>
       </modules>
 
       <modules compiler="gnu">
         <command name="load">PrgEnv-gnu/8.4.0</command>
         <command name="load">gcc/12.2.0</command>
+        <command name="load">cray-libsci/23.05.1.4</command>
       </modules>
 
       <modules compiler="nvidia">
         <command name="load">PrgEnv-nvidia/8.4.0</command>
         <command name="load">nvidia/22.7</command>
+        <command name="load">cray-libsci/23.05.1.4</command>
       </modules>
 
       <modules compiler="intel">
@@ -4175,26 +4188,21 @@
         <command name="load">intel-classic/2023.2.0</command>
       </modules>
 
-      <modules compiler="aocc">
-        <command name="load">PrgEnv-aocc/8.4.0</command>
-        <command name="load">aocc/3.2.0</command>
-      </modules>
-
       <modules compiler="amdclang">
         <command name="load">PrgEnv-aocc/8.4.0</command>
         <command name="load">aocc/3.2.0</command>
+        <command name="load">cray-libsci/23.05.1.4</command>
       </modules>
 
       <modules>
         <command name="load">craype-accel-host</command>
-        <command name="load">cray-libsci</command>
-        <command name="load">craype</command>
+        <command name="load">craype/2.7.21</command>
         <command name="load">cray-mpich/8.1.26</command>
         <command name="load">libfabric/1.15.2.0</command>
         <command name="load">cray-hdf5-parallel/1.12.2.3</command>
         <command name="load">cray-netcdf-hdf5parallel/4.9.0.3</command>
         <command name="load">cray-parallel-netcdf/1.12.3.3</command>
-        <command name="load">cmake/3.22.3</command>
+        <command name="load">cmake/3.25.1</command>
       </modules>
     </module_system>