Skip to content

Commit aad9931

Browse files
dqwudqwu
authored
Merge branch 'dqwu/machinefiles/update-anlgce-ub22-nodes' (PR #7462)
The remaining ANL GCE nodes running Ubuntu 20.04 have recently been upgraded to 22.04. This PR updates the configuration for machine anlgce-ub22 to include these newly upgraded nodes and removes the obsolete anlgce machine, which was based on Ubuntu 20.04. [BFB]
2 parents 5264437 + a87961b commit aad9931

File tree

1 file changed

+1
-97
lines changed

1 file changed

+1
-97
lines changed

‎cime_config/machines/config_machines.xml‎

Lines changed: 1 addition & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -2025,7 +2025,7 @@
20252025

20262026
<machine MACH="anlgce-ub22">
20272027
<DESC>ANL CELS General Computing Environment (Linux) workstation (Ubuntu 22.04)</DESC>
2028-
<NODENAME_REGEX>compute-386-(01|02|03|05|07|08)|compute-240-(10|15)</NODENAME_REGEX>
2028+
<NODENAME_REGEX>compute-386-(01|02|03|04|05|06|07|08)|compute-240-(10|11|12|13|14|15)</NODENAME_REGEX>
20292029
<OS>LINUX</OS>
20302030
<COMPILERS>gnu</COMPILERS>
20312031
<MPILIBS>mpich,openmpi</MPILIBS>
@@ -2119,102 +2119,6 @@
21192119
</environment_variables-->
21202120
</machine>
21212121

2122-
<machine MACH="anlgce">
2123-
<DESC>ANL CELS General Computing Environment (Linux) workstation</DESC>
2124-
<NODENAME_REGEX>compute-(240|386)-[0-9][0-9]</NODENAME_REGEX>
2125-
<OS>LINUX</OS>
2126-
<COMPILERS>gnu</COMPILERS>
2127-
<MPILIBS>mpich,openmpi</MPILIBS>
2128-
<SAVE_TIMING_DIR>/scratch/$ENV{USER}/e3sm/timings</SAVE_TIMING_DIR>
2129-
<SAVE_TIMING_DIR_PROJECTS>.*</SAVE_TIMING_DIR_PROJECTS>
2130-
<CIME_OUTPUT_ROOT>/scratch/$ENV{USER}/e3sm/scratch</CIME_OUTPUT_ROOT>
2131-
<DIN_LOC_ROOT>/nfs/gce/projects/climate/inputdata</DIN_LOC_ROOT>
2132-
<DIN_LOC_ROOT_CLMFORC>$DIN_LOC_ROOT/atm/datm7</DIN_LOC_ROOT_CLMFORC>
2133-
<DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
2134-
<BASELINE_ROOT>/nfs/gce/projects/climate/e3sm/baselines/$COMPILER</BASELINE_ROOT>
2135-
<CCSM_CPRNC>/nfs/gce/projects/climate/e3sm/cprnc/build/cprnc</CCSM_CPRNC>
2136-
<GMAKE>make</GMAKE>
2137-
<GMAKE_J>8</GMAKE_J>
2138-
<TESTS>e3sm_developer</TESTS>
2139-
<BATCH_SYSTEM>none</BATCH_SYSTEM>
2140-
<SUPPORTED_BY>jayesh at mcs dot anl dot gov</SUPPORTED_BY>
2141-
<MAX_TASKS_PER_NODE>32</MAX_TASKS_PER_NODE>
2142-
<MAX_MPITASKS_PER_NODE>32</MAX_MPITASKS_PER_NODE>
2143-
<mpirun mpilib="mpich">
2144-
<executable>mpirun</executable>
2145-
<arguments>
2146-
<arg name="num_tasks"> -l -np {{ total_tasks }}</arg>
2147-
</arguments>
2148-
</mpirun>
2149-
<mpirun mpilib="openmpi">
2150-
<executable>mpirun</executable>
2151-
<arguments>
2152-
<arg name="num_tasks"> --oversubscribe -np {{ total_tasks }}</arg>
2153-
</arguments>
2154-
</mpirun>
2155-
<module_system type="module">
2156-
<init_path lang="python">/nfs/gce/software/spack/opt/spack/linux-ubuntu20.04-x86_64/gcc-9.3.0/lmod-8.3-6fjdtku/lmod/lmod/init/env_modules_python.py</init_path>
2157-
<init_path lang="perl">/nfs/gce/software/spack/opt/spack/linux-ubuntu20.04-x86_64/gcc-9.3.0/lmod-8.3-6fjdtku/lmod/lmod/init/perl</init_path>
2158-
<init_path lang="bash">/nfs/gce/software/spack/opt/spack/linux-ubuntu20.04-x86_64/gcc-9.3.0/lmod-8.3-6fjdtku/lmod/lmod/init/bash</init_path>
2159-
<init_path lang="sh">/nfs/gce/software/spack/opt/spack/linux-ubuntu20.04-x86_64/gcc-9.3.0/lmod-8.3-6fjdtku/lmod/lmod/init/sh</init_path>
2160-
<init_path lang="csh">/nfs/gce/software/spack/opt/spack/linux-ubuntu20.04-x86_64/gcc-9.3.0/lmod-8.3-6fjdtku/lmod/lmod/init/csh</init_path>
2161-
<cmd_path lang="python">/nfs/gce/software/spack/opt/spack/linux-ubuntu20.04-x86_64/gcc-9.3.0/lmod-8.3-6fjdtku/lmod/lmod/libexec/lmod python</cmd_path>
2162-
<cmd_path lang="perl">module</cmd_path>
2163-
<cmd_path lang="bash">module</cmd_path>
2164-
<cmd_path lang="csh">module</cmd_path>
2165-
<cmd_path lang="sh">module</cmd_path>
2166-
<modules>
2167-
<command name="purge"/>
2168-
<command name="load">autoconf/2.69-bmnwajj</command>
2169-
<command name="load">automake/1.16.3-r7w24o4</command>
2170-
<command name="load">libtool/2.4.6-uh3mpsu</command>
2171-
<command name="load">m4/1.4.19-7fztfyz</command>
2172-
<command name="load">cmake/3.20.5-zyz2eld</command>
2173-
<command name="load">gcc/11.1.0-qsjmpcg</command>
2174-
<command name="load">zlib/1.2.11-p7dmb5p</command>
2175-
</modules>
2176-
</module_system>
2177-
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
2178-
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
2179-
<environment_variables mpilib="mpi-serial">
2180-
<!-- We currently don't have modules for serial NetCDF -->
2181-
<env name="NETCDF_PATH">/nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/netcdf/4.8.0c-4.3.1cxx-4.5.3f-serial/gcc-11.1.0</env>
2182-
</environment_variables>
2183-
<environment_variables mpilib="mpich">
2184-
<!-- We currently don't have modules for HDF5, NetCDF & PnetCDF -->
2185-
<env name="LD_LIBRARY_PATH">/nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/mpich/4.0/gcc-11.1.0/lib:$ENV{LD_LIBRARY_PATH}</env>
2186-
<env name="PATH">/nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/mpich/4.0/gcc-11.1.0/bin:$ENV{PATH}</env>
2187-
<env name="ZLIB_ROOT">/nfs/gce/software/spack/opt/spack/linux-ubuntu20.04-x86_64/gcc-9.3.0/zlib-1.2.11-p7dmb5p</env>
2188-
<env name="HDF5_ROOT">/nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/hdf5/1.12.1/mpich-4.0/gcc-11.1.0</env>
2189-
<env name="NETCDF_PATH">/nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/netcdf/4.8.0c-4.3.1cxx-4.5.3f-parallel/mpich-4.0/gcc-11.1.0</env>
2190-
<env name="PNETCDF_PATH">/nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/pnetcdf/1.12.2/mpich-4.0/gcc-11.1.0</env>
2191-
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /nfs/gce/projects/climate/software/moab/devel/mpich-4.0/gcc-11.1.0; else echo "$MOAB_ROOT"; fi}</env>
2192-
</environment_variables>
2193-
<environment_variables mpilib="openmpi">
2194-
<!-- We currently don't have modules for HDF5, NetCDF & PnetCDF -->
2195-
<env name="LD_LIBRARY_PATH">/nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/openmpi/4.1.3/gcc-11.1.0/lib:$ENV{LD_LIBRARY_PATH}</env>
2196-
<env name="PATH">/nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/openmpi/4.1.3/gcc-11.1.0/bin:$ENV{PATH}</env>
2197-
<env name="ZLIB_ROOT">/nfs/gce/software/spack/opt/spack/linux-ubuntu20.04-x86_64/gcc-9.3.0/zlib-1.2.11-p7dmb5p</env>
2198-
<env name="HDF5_ROOT">/nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/hdf5/1.12.1/openmpi-4.1.3/gcc-11.1.0</env>
2199-
<env name="NETCDF_PATH">/nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/netcdf/4.8.0c-4.3.1cxx-4.5.3f-parallel/openmpi-4.1.3/gcc-11.1.0</env>
2200-
<env name="PNETCDF_PATH">/nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/pnetcdf/1.12.2/openmpi-4.1.3/gcc-11.1.0</env>
2201-
</environment_variables>
2202-
<environment_variables BUILD_THREADED="TRUE">
2203-
<env name="OMP_STACKSIZE">64M</env>
2204-
</environment_variables>
2205-
<environment_variables>
2206-
<env name="PERL5LIB">/nfs/gce/projects/climate/software/perl5/lib/perl5</env>
2207-
</environment_variables>
2208-
<environment_variables compiler="gnu" mpilib="mpich">
2209-
<env name="PKG_CONFIG_PATH">$SHELL{if [ -z "$PKG_CONFIG_PATH" ]; then echo /nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/protobuf/21.6/gcc-11.1.0/lib/pkgconfig; else echo "/nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/protobuf/21.6/gcc-11.1.0/lib/pkgconfig:$PKG_CONFIG_PATH"; fi}</env>
2210-
<env name="ADIOS2_ROOT">$SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/adios2/2.10.2/mpich-4.0/gcc-11.1.0; else echo "$ADIOS2_ROOT"; fi}</env>
2211-
<env name="BLOSC2_ROOT">$SHELL{if [ -z "$BLOSC2_ROOT" ]; then echo /nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/c-blosc2/2.15.2/gcc-11.1.0; else echo "$BLOSC2_ROOT"; fi}</env>
2212-
<env name="MGARD_ROOT">$SHELL{if [ -z "$MGARD_ROOT" ]; then echo /nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/mgard/1.5.2/gcc-11.1.0; else echo "$MGARD_ROOT"; fi}</env>
2213-
<env name="SZ_ROOT">$SHELL{if [ -z "$SZ_ROOT" ]; then echo /nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/sz/2.1.12.5/gcc-11.1.0; else echo "$SZ_ROOT"; fi}</env>
2214-
<env name="ZFP_ROOT">$SHELL{if [ -z "$ZFP_ROOT" ]; then echo /nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/zfp/1.0.1/gcc-11.1.0; else echo "$ZFP_ROOT"; fi}</env>
2215-
</environment_variables>
2216-
</machine>
2217-
22182122
<machine MACH="sandiatoss3">
22192123
<DESC>SNL clust</DESC>
22202124
<NODENAME_REGEX>(skybridge|chama)</NODENAME_REGEX>

0 commit comments

Comments
 (0)