From c34336e47dea80b58c8b039bc1a76fd78b82bf1d Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Mon, 21 Oct 2024 11:44:41 -0600
Subject: [PATCH] Update gcc and nvidia to newer versions

This is to match proposed updates to Perlmutter-CPU
https://github.com/E3SM-Project/E3SM/pull/6702
---
 cime_config/machines/config_machines.xml | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml
index 41ee2b618e3e..a16a5fe0b67a 100644
--- a/cime_config/machines/config_machines.xml
+++ b/cime_config/machines/config_machines.xml
@@ -3973,6 +3973,8 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
         <command name="unload">cray-parallel-netcdf</command>
         <command name="unload">cray-netcdf</command>
         <command name="unload">cray-hdf5</command>
+        <command name="unload">gcc</command>
+        <command name="unload">gcc-native</command>
         <command name="unload">intel</command>
         <command name="unload">intel-oneapi</command>
         <command name="unload">nvidia</command>
@@ -3994,14 +3996,14 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
 
       <modules compiler="gnu">
         <command name="load">PrgEnv-gnu/8.5.0</command>
-        <command name="load">gcc/12.2.0</command>
-        <command name="load">cray-libsci/23.05.1.4</command>
+        <command name="load">gcc-native/12.3</command>
+        <command name="load">cray-libsci/23.12.5</command>
       </modules>
 
       <modules compiler="nvidia">
         <command name="load">PrgEnv-nvidia/8.5.0</command>
         <command name="load">nvidia/24.7</command>
-        <command name="load">cray-libsci/23.05.1.4</command>
+        <command name="load">cray-libsci/23.12.5</command>
       </modules>
 
       <modules compiler="intel">
@@ -4015,25 +4017,13 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
         <command name="load">cray-libsci/23.05.1.4</command>
       </modules>
 
-      <modules compiler="intel">
+      <modules>
         <command name="load">craype-accel-host</command>
         <command name="load">craype/2.7.30</command>
         <command name="load">cray-mpich/8.1.28</command>
         <command name="load">cray-hdf5-parallel/1.12.2.9</command>
         <command name="load">cray-netcdf-hdf5parallel/4.9.0.9</command>
         <command name="load">cray-parallel-netcdf/1.12.3.9</command>
-      </modules>
-
-      <modules compiler="!intel">
-        <command name="load">craype-accel-host</command>
-        <command name="load">craype/2.7.21</command>
-        <command name="load">cray-mpich/8.1.26</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>
-      </modules>
-
-      <modules>
         <command name="load">cmake/3.27.7</command>
       </modules>
     </module_system>
@@ -4057,7 +4047,7 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
       <env name="PNETCDF_PATH">$ENV{CRAY_PARALLEL_NETCDF_PREFIX}</env>
     </environment_variables>
     <environment_variables compiler="gnu">
-      <env name="LD_LIBRARY_PATH">/opt/cray/pe/gcc/12.2.0/snos/lib64:$ENV{LD_LIBRARY_PATH}</env>
+      <env name="LD_LIBRARY_PATH">/usr/lib64/gcc/x86_64-suse-linux/12:$ENV{LD_LIBRARY_PATH}</env>
     </environment_variables>
     <resource_limits>
       <resource name="RLIMIT_STACK">-1</resource>