Skip to content

Commit f163f06

Browse files
ndkeenndkeen
authored
Merge branch E3SM-Project/ndk/machinefiles/remove-gcp12-machine (PR #7738)
Remove gcp12 machine
2 parents 8863e00 + 3aad8e0 commit f163f06

File tree

11 files changed

+2
-413
lines changed

11 files changed

+2
-413
lines changed

‎cime_config/allactive/config_pesall.xml‎

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -145,21 +145,6 @@
145145
</nthrds>
146146
</pes>
147147
</mach>
148-
<mach name="gcp12">
149-
<pes compset="any" pesize="any">
150-
<comment>allactive+gcp12: default 1 node 56x1</comment>
151-
<ntasks>
152-
<ntasks_atm>56</ntasks_atm>
153-
<ntasks_lnd>56</ntasks_lnd>
154-
<ntasks_rof>56</ntasks_rof>
155-
<ntasks_ice>56</ntasks_ice>
156-
<ntasks_ocn>56</ntasks_ocn>
157-
<ntasks_glc>16</ntasks_glc>
158-
<ntasks_wav>16</ntasks_wav>
159-
<ntasks_cpl>56</ntasks_cpl>
160-
</ntasks>
161-
</pes>
162-
</mach>
163148
<mach name="lawrencium-lr3">
164149
<pes compset="any" pesize="any">
165150
<comment>allactive+lawrencium-lr3: default, 2 nodes</comment>
@@ -275,29 +260,6 @@
275260
</ntasks>
276261
</pes>
277262
</mach>
278-
<mach name="gcp12">
279-
<pes compset="JRA_ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">
280-
<comment>"gcp12, 5 nodes, 240 partition, 2 threads 56x2"</comment>
281-
<ntasks>
282-
<ntasks_atm>280</ntasks_atm>
283-
<ntasks_lnd>280</ntasks_lnd>
284-
<ntasks_rof>280</ntasks_rof>
285-
<ntasks_ice>256</ntasks_ice>
286-
<ntasks_ocn>256</ntasks_ocn>
287-
<ntasks_glc>-1</ntasks_glc>
288-
<ntasks_wav>-1</ntasks_wav>
289-
<ntasks_cpl>280</ntasks_cpl>
290-
</ntasks>
291-
<nthrds>
292-
<nthrds_atm>2</nthrds_atm>
293-
<nthrds_lnd>2</nthrds_lnd>
294-
<nthrds_rof>2</nthrds_rof>
295-
<nthrds_ice>2</nthrds_ice>
296-
<nthrds_ocn>2</nthrds_ocn>
297-
<nthrds_cpl>2</nthrds_cpl>
298-
</nthrds>
299-
</pes>
300-
</mach>
301263
<mach name="anvil">
302264
<pes compset="JRA_ELM.+MPASSI.+MPASO.+MOSART.+SGLC" pesize="any">
303265
<comment>"anvil, GPMPAS-JRA compset, 6 nodes"</comment>
@@ -914,35 +876,6 @@
914876
</mach>
915877
</grid>
916878
<grid name="a%ne30.+_oi%.*EC.*to">
917-
<mach name="gcp12">
918-
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="any">
919-
<comment> gcp12 -compset A_WCYCL* -res ne30pg2_oECv3 with MPASO on 7 nodes </comment>
920-
<ntasks>
921-
<ntasks_atm>280</ntasks_atm>
922-
<ntasks_lnd>280</ntasks_lnd>
923-
<ntasks_rof>280</ntasks_rof>
924-
<ntasks_ice>256</ntasks_ice>
925-
<ntasks_ocn>112</ntasks_ocn>
926-
<ntasks_cpl>280</ntasks_cpl>
927-
</ntasks>
928-
<nthrds>
929-
<nthrds_atm>2</nthrds_atm>
930-
<nthrds_lnd>2</nthrds_lnd>
931-
<nthrds_rof>2</nthrds_rof>
932-
<nthrds_ice>2</nthrds_ice>
933-
<nthrds_ocn>2</nthrds_ocn>
934-
<nthrds_cpl>1</nthrds_cpl>
935-
</nthrds>
936-
<rootpe>
937-
<rootpe_atm>0</rootpe_atm>
938-
<rootpe_lnd>0</rootpe_lnd>
939-
<rootpe_rof>0</rootpe_rof>
940-
<rootpe_ice>0</rootpe_ice>
941-
<rootpe_ocn>280</rootpe_ocn>
942-
<rootpe_cpl>0</rootpe_cpl>
943-
</rootpe>
944-
</pes>
945-
</mach>
946879
<mach name="pm-cpu|muller-cpu|alvarez-cpu">
947880
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC" pesize="any">
948881
<comment> pm-cpu: -compset A_WCYCL* -res ne30pg2_oECv3 with MPASO on 8 nodes, stacked layout, 128x1 4-5 sypd</comment>
@@ -1303,19 +1236,6 @@
13031236
</rootpe>
13041237
</pes>
13051238
</mach>
1306-
<mach name="gcp12">
1307-
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="any">
1308-
<comment> gcp12 --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 4 nodes </comment>
1309-
<ntasks>
1310-
<ntasks_atm>-4</ntasks_atm>
1311-
<ntasks_cpl>-4</ntasks_cpl>
1312-
<ntasks_ocn>-4</ntasks_ocn>
1313-
<ntasks_ice>-4</ntasks_ice>
1314-
<ntasks_rof>-4</ntasks_rof>
1315-
<ntasks_lnd>-4</ntasks_lnd>
1316-
</ntasks>
1317-
</pes>
1318-
</mach>
13191239
<mach name="pm-cpu|muller-cpu|alvarez-cpu">
13201240
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="any">
13211241
<comment> pm-cpu --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 8 nodes, stacked layout, 128x1 4-5 sypd</comment>

‎cime_config/machines/cmake_macros/gnu_gcp12.cmake‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎cime_config/machines/config_batch.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -854,16 +854,6 @@
854854
</queues>
855855
</batch_system>
856856

857-
<batch_system MACH="gcp12" type="slurm" >
858-
<queues>
859-
<queue walltimemax="01:30:00" default="true">c2dh112</queue> <!-- c2d-highcpu-112 1.88984 -->
860-
<queue walltimemax="01:30:00" default="true">c2d32</queue> <!-- c2d-standard-32 0.30794 -->
861-
<queue walltimemax="01:30:00" default="true">c2d56</queue> <!-- c2d-standard-56 0.53889 -->
862-
<queue walltimemax="01:30:00" default="true">c2o60</queue> <!-- "old" c2-compute-60 0.28428 -->
863-
<queue walltimemax="01:30:00" default="true">compute</queue> <!-- c2d-standard-112 1.07776 -->
864-
</queues>
865-
</batch_system>
866-
867857
<!-- modex is PBS -->
868858
<batch_system MACH="modex" type="pbs">
869859
<directives>

‎cime_config/machines/config_machines.xml‎

Lines changed: 0 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -5362,104 +5362,6 @@
53625362
</environment_variables>
53635363
</machine>
53645364

5365-
<machine MACH="gcp12">
5366-
<DESC>Google Cloud cluster using compute nodes c2d-compute-112's gcpe3sm12</DESC>
5367-
<NODENAME_REGEX>gcpe3sm12*</NODENAME_REGEX>
5368-
<OS>LINUX</OS>
5369-
<COMPILERS>gnu</COMPILERS>
5370-
<MPILIBS>openmpi</MPILIBS>
5371-
<CIME_OUTPUT_ROOT>/home/$USER/e3sm/scratch</CIME_OUTPUT_ROOT>
5372-
<DIN_LOC_ROOT>/home/inputdata</DIN_LOC_ROOT>
5373-
<DIN_LOC_ROOT_CLMFORC>/home/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
5374-
<DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
5375-
<BASELINE_ROOT>/home/baselines/$COMPILER</BASELINE_ROOT>
5376-
<CCSM_CPRNC>/home/tools/cprnc/cprnc</CCSM_CPRNC>
5377-
<GMAKE_J>20</GMAKE_J>
5378-
<TESTS>e3sm_developer</TESTS>
5379-
<NTEST_PARALLEL_JOBS>8</NTEST_PARALLEL_JOBS>
5380-
<BATCH_SYSTEM>slurm</BATCH_SYSTEM>
5381-
<SUPPORTED_BY>e3sm</SUPPORTED_BY>
5382-
<MAX_TASKS_PER_NODE>112</MAX_TASKS_PER_NODE>
5383-
<MAX_MPITASKS_PER_NODE>56</MAX_MPITASKS_PER_NODE>
5384-
<PROJECT_REQUIRED>FALSE</PROJECT_REQUIRED>
5385-
<mpirun mpilib="openmpi">
5386-
<executable>srun</executable>
5387-
<arguments>
5388-
<arg name="pmi_layer"> --mpi=pmi2</arg>
5389-
<arg name="label"> --label</arg>
5390-
<arg name="num_tasks"> -n {{ total_tasks }} -N {{ num_nodes }} --kill-on-bad-exit</arg>
5391-
<arg name="thread_count">-c $SHELL{echo `./xmlquery --value MAX_TASKS_PER_NODE`/ {{ tasks_per_node }} |bc}</arg>
5392-
<arg name="binding"> $SHELL{if [ `./xmlquery --value MAX_TASKS_PER_NODE` -ge `./xmlquery --value MAX_MPITASKS_PER_NODE` ]; then echo "--cpu_bind=cores"; else echo "--cpu_bind=threads";fi;} </arg>
5393-
<arg name="placement">-m plane={{ tasks_per_node }}</arg>
5394-
</arguments>
5395-
</mpirun>
5396-
5397-
<module_system type="module" allow_error="true">
5398-
<init_path lang="python">/usr/share/lmod/lmod/init/env_modules_python.py</init_path>
5399-
<init_path lang="sh">/usr/share/lmod/lmod/init/sh</init_path>
5400-
<init_path lang="csh">/usr/share/lmod/lmod/init/csh</init_path>
5401-
5402-
<cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path>
5403-
<cmd_path lang="sh">module</cmd_path>
5404-
<cmd_path lang="csh">module</cmd_path>
5405-
5406-
<modules>
5407-
<command name="use">/opt/apps/spack/share/spack/modules/linux-centos7-zen2</command>
5408-
<command name="use">/opt/apps/spack/share/spack/modules/linux-centos7-x86_64_v3</command>
5409-
<command name="unload">gcc</command>
5410-
<command name="unload">openmpi</command>
5411-
<command name="unload">binutils</command>
5412-
<command name="unload">netlib-lapack</command>
5413-
<command name="unload">openblas</command>
5414-
<command name="unload">hdf5</command>
5415-
<command name="unload">netcdf-c</command>
5416-
<command name="unload">parallel-netcdf</command>
5417-
</modules>
5418-
5419-
<modules compiler="gnu">
5420-
<command name="load">gcc/12.2.0</command>
5421-
</modules>
5422-
5423-
<modules mpilib="openmpi">
5424-
<command name="load">openmpi/4.1.4</command>
5425-
</modules>
5426-
5427-
<modules compiler="gnu">
5428-
<command name="load">python</command>
5429-
<command name="load">cmake</command>
5430-
<command name="load">perl</command>
5431-
<command name="load">perl-xml-libxml</command>
5432-
<command name="load">netcdf-c</command>
5433-
<command name="load">netcdf-cxx</command>
5434-
<command name="load">netcdf-fortran</command>
5435-
<command name="load">parallel-netcdf</command>
5436-
<command name="load">hdf5</command>
5437-
<command name="load">netlib-lapack</command>
5438-
<command name="load">openblas</command>
5439-
</modules>
5440-
5441-
</module_system>
5442-
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
5443-
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
5444-
<TEST_TPUT_TOLERANCE>0.2</TEST_TPUT_TOLERANCE>
5445-
<TEST_MEMLEAK_TOLERANCE>0.20</TEST_MEMLEAK_TOLERANCE>
5446-
<environment_variables compiler="gnu">
5447-
<env name="HDF5_ROOT">$SHELL{dirname $(dirname $(which h5diff))}</env>
5448-
<env name="NETCDF_C_PATH">$SHELL{dirname $(dirname $(which nc-config))}</env>
5449-
<env name="NETCDF_FORTRAN_PATH">$SHELL{dirname $(dirname $(which nf-config))}</env>
5450-
<env name="PNETCDF_PATH">$SHELL{dirname $(dirname $(which pnetcdf-config))}</env>
5451-
<env name="OPENBLAS_PATH">/opt/apps/spack/opt/spack/linux-centos7-zen2/gcc-12.2.0/openblas-0.3.21-z66r7lyxwkhsshgreexm4cedffp73scp</env>
5452-
<env name="LAPACK_ROOT">/opt/apps/spack/opt/spack/linux-centos7-zen2/gcc-12.2.0/netlib-lapack-3.10.1-lkhddpuidlw2z74g5ui6eq5iattsfjxp</env>
5453-
<env name="PERL5LIB">$ENV{PERL5LIB}:/opt/apps/spack/opt/spack/linux-centos7-zen2/gcc-12.2.0/perl-5.36.0-sly2pft2edg2p3iyijfyy6dzntusokno/lib/site_perl/5.36.0</env>
5454-
<env name="HDF5_USE_FILE_LOCKING">FALSE</env>
5455-
</environment_variables>
5456-
5457-
<environment_variables BUILD_THREADED="TRUE">
5458-
<env name="OMP_STACKSIZE">128M</env>
5459-
<env name="OMP_PLACES">threads</env>
5460-
</environment_variables>
5461-
</machine>
5462-
54635365
<machine MACH="fugaku">
54645366
<DESC>RIKEN-CCS Fugaku: Fujitsu A64FX 48 cores/node.</DESC>
54655367
<NODENAME_REGEX>fn01sv.*</NODENAME_REGEX>

‎components/eam/cime_config/config_pes.xml‎

Lines changed: 2 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -155,21 +155,6 @@
155155
</ntasks>
156156
</pes>
157157
</mach>
158-
<mach name="gcp12">
159-
<pes compset="any" pesize="any">
160-
<comment>eam+gcp12: default 1 node, 56x1</comment>
161-
<ntasks>
162-
<ntasks_atm>-1</ntasks_atm>
163-
<ntasks_lnd>-1</ntasks_lnd>
164-
<ntasks_rof>-1</ntasks_rof>
165-
<ntasks_ice>-1</ntasks_ice>
166-
<ntasks_ocn>-1</ntasks_ocn>
167-
<ntasks_glc>-1</ntasks_glc>
168-
<ntasks_wav>-1</ntasks_wav>
169-
<ntasks_cpl>-1</ntasks_cpl>
170-
</ntasks>
171-
</pes>
172-
</mach>
173158
<mach name="lawrencium-lr3">
174159
<pes compset="any" pesize="any">
175160
<comment>eam+lawrencium-lr3: default, 2 nodes</comment>
@@ -263,21 +248,6 @@
263248
</ntasks>
264249
</pes>
265250
</mach>
266-
<mach name="gcp12">
267-
<pes compset="any" pesize="any">
268-
<comment>gcp12: any compset on ne4np4.pg2 grid, 2 nodes 96x1</comment>
269-
<ntasks>
270-
<ntasks_atm>96</ntasks_atm>
271-
<ntasks_lnd>96</ntasks_lnd>
272-
<ntasks_rof>96</ntasks_rof>
273-
<ntasks_ice>96</ntasks_ice>
274-
<ntasks_ocn>96</ntasks_ocn>
275-
<ntasks_cpl>96</ntasks_cpl>
276-
<ntasks_glc>96</ntasks_glc>
277-
<ntasks_wav>96</ntasks_wav>
278-
</ntasks>
279-
</pes>
280-
</mach>
281251
<mach name="pm-cpu|muller-cpu|alvarez-cpu">
282252
<pes compset="any" pesize="any">
283253
<comment>pm-cpu: any compset on ne4pg2 grid</comment>
@@ -803,31 +773,6 @@
803773
</mach>
804774
</grid>
805775
<grid name="a%ne30.+_oi%.*EC.*to">
806-
<mach name="gcp12">
807-
<!--Pes setting: grid is a%ne30np4_l%ne30np4_oi%oEC60to30v3_r%r05_g%null_w%null_z%null_m%oEC60to30v3
808-
Pes setting: compset is 2010_EAM%CMIP6_ELM%SPBC_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV_SIAC_SESP
809-
or a%ne30np4.pg2_l%r05_oi%EC30to60E2r2_r%null_g%null_w%null_z%null_m%EC30to60E2r2
810-
1850_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%PRES_DOCN%DOM_SROF_SGLC_SWAV_SIAC_SESP_BGC%LNDATM -->
811-
<pes compset=".*EAM.+ELM.+DOCN" pesize="any">
812-
<comment> gcp12 -compset A_WCYCL* -res ne30pg2_oECv3 or ne30pg2_r05_EC30to60E2r2 without MPASO on 5 nodes, 56x2 </comment>
813-
<ntasks>
814-
<ntasks_atm>280</ntasks_atm>
815-
<ntasks_lnd>280</ntasks_lnd>
816-
<ntasks_rof>280</ntasks_rof>
817-
<ntasks_ice>256</ntasks_ice>
818-
<ntasks_ocn>256</ntasks_ocn>
819-
<ntasks_cpl>280</ntasks_cpl>
820-
</ntasks>
821-
<nthrds>
822-
<nthrds_atm>2</nthrds_atm>
823-
<nthrds_lnd>2</nthrds_lnd>
824-
<nthrds_rof>2</nthrds_rof>
825-
<nthrds_ice>2</nthrds_ice>
826-
<nthrds_ocn>2</nthrds_ocn>
827-
<nthrds_cpl>1</nthrds_cpl>
828-
</nthrds>
829-
</pes>
830-
</mach>
831776
<mach name="pm-cpu|muller-cpu|alvarez-cpu">
832777
<!--Pes setting: grid is a%ne30np4_l%ne30np4_oi%oEC60to30v3_r%r05_g%null_w%null_z%null_m%oEC60to30v3
833778
Pes setting: compset is 2010_EAM%CMIP6_ELM%SPBC_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV_SIAC_SESP -->
@@ -932,20 +877,6 @@
932877
</ntasks>
933878
</pes>
934879
</mach>
935-
<mach name="gcp12">
936-
<!--2010_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV_SIAC_SESP-->
937-
<pes compset=".*EAM.+ELM.+MPASSI.+DOCN.+MOSART.+" pesize="any">
938-
<comment> gcp12 eam F compset --res ne30pg2_IcoswISC30E3r5 on 4 nodes </comment>
939-
<ntasks>
940-
<ntasks_atm>-4</ntasks_atm>
941-
<ntasks_cpl>-4</ntasks_cpl>
942-
<ntasks_ocn>-4</ntasks_ocn>
943-
<ntasks_ice>-4</ntasks_ice>
944-
<ntasks_rof>-4</ntasks_rof>
945-
<ntasks_lnd>-4</ntasks_lnd>
946-
</ntasks>
947-
</pes>
948-
</mach>
949880
</grid>
950881
<grid name="a%ne30np4.pg.+_oi%EC30to60E2r2">
951882
<mach name="chrysalis">
@@ -1182,9 +1113,9 @@
11821113
</ntasks>
11831114
</pes>
11841115
</mach>
1185-
<mach name="pm-cpu|muller-cpu|alvarez-cpu|gcp12">
1116+
<mach name="pm-cpu|muller-cpu|alvarez-cpu">
11861117
<pes compset=".*EAM.+ELM.+MPASSI.+DOCN.+MOSART.+" pesize="any">
1187-
<comment>pm-cpu/gcp: eam, 2 nodes: --res conusx4v1_r05_oECv3 --compset F2010 </comment>
1118+
<comment>pm-cpu: eam, 2 nodes: --res conusx4v1_r05_oECv3 --compset F2010 </comment>
11881119
<ntasks>
11891120
<ntasks_atm>-2</ntasks_atm>
11901121
<ntasks_lnd>-2</ntasks_lnd>

‎components/eamxx/cime_config/config_pes.xml‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -101,21 +101,6 @@
101101
</ntasks>
102102
</pes>
103103
</mach>
104-
<mach name="gcp12">
105-
<pes compset=".*EAM.+ELM.+DOCN" pesize="any">
106-
<comment>gcp12: ne4 eamxx F case, 1 nodes, 56x1</comment>
107-
<ntasks>
108-
<ntasks_atm>-1</ntasks_atm>
109-
<ntasks_cpl>-1</ntasks_cpl>
110-
<ntasks_ice>-1</ntasks_ice>
111-
<ntasks_lnd>-1</ntasks_lnd>
112-
<ntasks_rof>-1</ntasks_rof>
113-
<ntasks_ocn>-1</ntasks_ocn>
114-
<ntasks_glc>1</ntasks_glc>
115-
<ntasks_wav>1</ntasks_wav>
116-
</ntasks>
117-
</pes>
118-
</mach>
119104
<mach name="aurora">
120105
<pes compset="any" pesize="any">
121106
<comment>aurora: any compset on ne4 grid, 12x1</comment>
@@ -186,21 +171,6 @@
186171
</ntasks>
187172
</pes>
188173
</mach>
189-
<mach name="gcp12">
190-
<pes compset=".*EAM.+ELM.+DOCN" pesize="any">
191-
<comment>gcp12: ne30 eamxx F case, 4 nodes, 56x1 CPU</comment>
192-
<ntasks>
193-
<ntasks_atm>-4</ntasks_atm>
194-
<ntasks_cpl>-4</ntasks_cpl>
195-
<ntasks_ice>-4</ntasks_ice>
196-
<ntasks_lnd>-4</ntasks_lnd>
197-
<ntasks_rof>-4</ntasks_rof>
198-
<ntasks_ocn>-4</ntasks_ocn>
199-
<ntasks_glc>1</ntasks_glc>
200-
<ntasks_wav>1</ntasks_wav>
201-
</ntasks>
202-
</pes>
203-
</mach>
204174
</grid>
205175
<grid name="a%ne120np4">
206176
<mach name="pm-gpu|muller-gpu|alvarez-gpu">

0 commit comments

Comments
 (0)