Skip to content

Commit

Permalink
Merge branch 'mark-petersen/machinefiles/remove-grizzly-badger' (PR #…
Browse files Browse the repository at this point in the history 
…6290)

Remove retired LANL machines grizzly and badger

LANL machines grizzly and badger have been retired. This is a clean-up
pull request to remove them.

[BFB]
  • Loading branch information
@jonbob
jonbob committed Mar 20, 2024
2 parents 79cb609 + 817d65a commit b9cc7f8
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 180 deletions.
22 changes: 0 additions & 22 deletions cime_config/machines/config_batch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -653,28 +653,6 @@
</queues>
</batch_system>

<batch_system MACH="grizzly" type="slurm" >
<directives>
<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">standard</queue>
</queues>
</batch_system>

<batch_system MACH="badger" type="slurm" >
<directives>
<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">standard</queue>
</queues>
</batch_system>

<batch_system MACH="chicoma-cpu" type="slurm">
<directives>
<directive>--partition=standard </directive>
Expand Down
156 changes: 0 additions & 156 deletions cime_config/machines/config_machines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4275,162 +4275,6 @@

</machine>

<machine MACH="grizzly">
<DESC>LANL Linux Cluster, 36 pes/node, batch system slurm</DESC>
<NODENAME_REGEX>gr-fe.*.lanl.gov</NODENAME_REGEX>
<OS>LINUX</OS>
<COMPILERS>intel,gnu</COMPILERS>
<MPILIBS>openmpi,impi,mvapich</MPILIBS>
<PROJECT>climateacme</PROJECT>
<CIME_OUTPUT_ROOT>/lustre/scratch4/turquoise/$ENV{USER}/E3SM/scratch</CIME_OUTPUT_ROOT>
<DIN_LOC_ROOT>/lustre/scratch4/turquoise/$ENV{USER}/E3SM/input_data</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/lustre/scratch4/turquoise/$ENV{USER}/E3SM/input_data/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>/lustre/scratch4/turquoise/$ENV{USER}/E3SM/archive/$CASE</DOUT_S_ROOT>
<BASELINE_ROOT>/lustre/scratch4/turquoise/$ENV{USER}/E3SM/input_data/ccsm_baselines/$COMPILER</BASELINE_ROOT>
<CCSM_CPRNC>/turquoise/usr/projects/climate/SHARED_CLIMATE/software/wolf/cprnc/v0.40/cprnc</CCSM_CPRNC>
<GMAKE_J>4</GMAKE_J>
<TESTS>e3sm_developer</TESTS>
<BATCH_SYSTEM>slurm</BATCH_SYSTEM>
<SUPPORTED_BY>luke.vanroekel @ gmail.com</SUPPORTED_BY>
<MAX_TASKS_PER_NODE>36</MAX_TASKS_PER_NODE>
<MAX_MPITASKS_PER_NODE>32</MAX_MPITASKS_PER_NODE>
<PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
<mpirun mpilib="default">
<executable>srun</executable>
<arguments>
<arg name="num_tasks"> -n {{ total_tasks }}</arg>
</arguments>
</mpirun>
<mpirun mpilib="mpi-serial">
<executable/>
</mpirun>
<module_system type="module">
<init_path lang="perl">/usr/share/Modules/init/perl.pm</init_path>
<init_path lang="python">/usr/share/Modules/init/python.py</init_path>
<init_path lang="sh">/etc/profile.d/z00_lmod.sh</init_path>
<init_path lang="csh">/etc/profile.d/z00_lmod.csh</init_path>
<cmd_path lang="perl">/usr/share/lmod/lmod/libexec/lmod perl</cmd_path>
<cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path>
<cmd_path lang="sh">module</cmd_path>
<cmd_path lang="csh">module</cmd_path>
<modules>
<command name="purge"/>
<command name="load">cmake/3.16.2</command>
</modules>
<modules compiler="gnu" mpilib="openmpi">
<command name="load">gcc/6.4.0</command>
<command name="load">openmpi/2.1.2</command>
</modules>
<modules compiler="gnu" mpilib="mvapich">
<command name="load">gcc/6.4.0</command>
<command name="load">mvapich2/2.3</command>
</modules>
<modules compiler="intel" mpilib="impi">
<command name="load">intel/19.0.4</command>
<command name="load">intel-mpi/2019.4</command>
</modules>
<modules compiler="intel" mpilib="mvapich">
<command name="load">intel/18.0.2</command>
<command name="load">mvapich2/2.2</command>
</modules>
<modules compiler="intel" mpilib="openmpi">
<command name="load">intel/19.0.4</command>
<command name="load">openmpi/2.1.2</command>
</modules>
<modules>
<command name="load">friendly-testing</command>
<command name="load">hdf5-parallel/1.8.16</command>
<command name="load">pnetcdf/1.11.2</command>
<command name="load">netcdf-h5parallel/4.7.3</command>
<command name="load">mkl/2019.0.4</command>
</modules>
</module_system>
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
<environment_variables>
<env name="MKLROOT">$ENV{MKLROOT}</env>
<env name="PNETCDF_HINTS">romio_ds_write=disable;romio_ds_read=disable;romio_cb_write=enable;romio_cb_read=enable</env>
</environment_variables>
</machine>

<machine MACH="badger">
<DESC>LANL Linux Cluster, 36 pes/node, batch system slurm</DESC>
<NODENAME_REGEX>ba-fe.*.lanl.gov</NODENAME_REGEX>
<OS>LINUX</OS>
<COMPILERS>intel,gnu</COMPILERS>
<MPILIBS>openmpi,impi,mvapich</MPILIBS>
<PROJECT>climateacme</PROJECT>
<CIME_OUTPUT_ROOT>/lustre/scratch4/turquoise/$ENV{USER}/E3SM/scratch</CIME_OUTPUT_ROOT>
<DIN_LOC_ROOT>/lustre/scratch4/turquoise/$ENV{USER}/E3SM/input_data</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/lustre/scratch4/turquoise/$ENV{USER}/E3SM/input_data/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>/lustre/scratch4/turquoise/$ENV{USER}/E3SM/archive/$CASE</DOUT_S_ROOT>
<BASELINE_ROOT>/lustre/scratch4/turquoise/$ENV{USER}/E3SM/input_data/ccsm_baselines/$COMPILER</BASELINE_ROOT>
<CCSM_CPRNC>/turquoise/usr/projects/climate/SHARED_CLIMATE/software/wolf/cprnc/v0.40/cprnc</CCSM_CPRNC>
<GMAKE_J>4</GMAKE_J>
<TESTS>e3sm_developer</TESTS>
<BATCH_SYSTEM>slurm</BATCH_SYSTEM>
<SUPPORTED_BY>e3sm</SUPPORTED_BY>
<MAX_TASKS_PER_NODE>36</MAX_TASKS_PER_NODE>
<MAX_MPITASKS_PER_NODE>32</MAX_MPITASKS_PER_NODE>
<PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
<mpirun mpilib="default">
<executable>srun</executable>
<arguments>
<arg name="num_tasks"> -n {{ total_tasks }}</arg>
</arguments>
</mpirun>
<mpirun mpilib="mpi-serial">
<executable/>
</mpirun>
<module_system type="module">
<init_path lang="perl">/usr/share/Modules/init/perl.pm</init_path>
<init_path lang="python">/usr/share/Modules/init/python.py</init_path>
<init_path lang="sh">/etc/profile.d/z00_lmod.sh</init_path>
<init_path lang="csh">/etc/profile.d/z00_lmod.csh</init_path>
<cmd_path lang="perl">/usr/share/lmod/lmod/libexec/lmod perl</cmd_path>
<cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path>
<cmd_path lang="sh">module</cmd_path>
<cmd_path lang="csh">module</cmd_path>
<modules>
<command name="purge"/>
<command name="load">cmake/3.16.2</command>
</modules>
<modules compiler="gnu" mpilib="openmpi">
<command name="load">gcc/6.4.0</command>
<command name="load">openmpi/2.1.2</command>
</modules>
<modules compiler="gnu" mpilib="mvapich">
<command name="load">gcc/6.4.0</command>
<command name="load">mvapich2/2.3</command>
</modules>
<modules compiler="intel" mpilib="impi">
<command name="load">intel/19.0.4</command>
<command name="load">intel-mpi/2019.4</command>
</modules>
<modules compiler="intel" mpilib="mvapich">
<command name="load">intel/18.0.2</command>
<command name="load">mvapich2/2.2</command>
</modules>
<modules compiler="intel" mpilib="openmpi">
<command name="load">intel/19.0.4</command>
<command name="load">openmpi/2.1.2</command>
</modules>
<modules>
<command name="load">friendly-testing</command>
<command name="load">hdf5-parallel/1.8.16</command>
<command name="load">pnetcdf/1.11.2</command>
<command name="load">netcdf-h5parallel/4.7.3</command>
<command name="load">mkl/2019.0.4</command>
</modules>
</module_system>
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
<environment_variables>
<env name="MKLROOT">$ENV{MKLROOT}</env>
<env name="PNETCDF_HINTS">romio_ds_write=disable;romio_ds_read=disable;romio_cb_write=enable;romio_cb_read=enable</env>
</environment_variables>
</machine>

<machine MACH="chicoma-cpu">
<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>
Expand Down
2 changes: 0 additions & 2 deletions cime_config/machines/config_pio.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@
<value mach="lawrencium-lr6">netcdf</value>
<value mach="eddi">netcdf</value>
<value mach="cades">netcdf</value>
<value mach="grizzly">netcdf</value>
<value mach="badger">netcdf</value>
<value mach="chicoma-cpu">netcdf</value>
<value mach="chicoma-gpu">netcdf</value>
<value mach="bebop" mpilib="impi" compset=".*CAM5.+MPAS.*">netcdf</value>
Expand Down

0 comments on commit b9cc7f8

Please sign in to comment.