Skip to content

Commit

Permalink
Update PE layouts for edison.
Browse files Browse the repository at this point in the history 
Add -z muldefs to link line for edison.
Remove machine hopper.
  • Loading branch information
@ndkeen
ndkeen committed Jan 17, 2017
1 parent 5c14a9b commit fc8e441
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 208 deletions.
202 changes: 27 additions & 175 deletions cime_config/acme/allactive/config_pesall.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,43 +111,6 @@
</pes>
</mach>
</grid>
<grid name="any">
<mach name="edison">
<pes compset="any" pesize="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>12</ntasks_atm>
<ntasks_lnd>12</ntasks_lnd>
<ntasks_rof>12</ntasks_rof>
<ntasks_ice>12</ntasks_ice>
<ntasks_ocn>12</ntasks_ocn>
<ntasks_glc>12</ntasks_glc>
<ntasks_wav>12</ntasks_wav>
<ntasks_cpl>12</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>4</nthrds_atm>
<nthrds_lnd>4</nthrds_lnd>
<nthrds_rof>4</nthrds_rof>
<nthrds_ice>4</nthrds_ice>
<nthrds_ocn>4</nthrds_ocn>
<nthrds_glc>4</nthrds_glc>
<nthrds_wav>4</nthrds_wav>
<nthrds_cpl>4</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>0</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="any">
<mach name="eos">
<pes compset="any" pesize="any">
Expand Down Expand Up @@ -595,14 +558,14 @@
<pes compset="any" pesize="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>960</ntasks_atm>
<ntasks_lnd>960</ntasks_lnd>
<ntasks_rof>960</ntasks_rof>
<ntasks_ice>960</ntasks_ice>
<ntasks_ocn>960</ntasks_ocn>
<ntasks_glc>960</ntasks_glc>
<ntasks_wav>960</ntasks_wav>
<ntasks_cpl>960</ntasks_cpl>
<ntasks_atm>192</ntasks_atm>
<ntasks_lnd>192</ntasks_lnd>
<ntasks_rof>192</ntasks_rof>
<ntasks_ice>192</ntasks_ice>
<ntasks_ocn>192</ntasks_ocn>
<ntasks_glc>192</ntasks_glc>
<ntasks_wav>192</ntasks_wav>
<ntasks_cpl>192</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>4</nthrds_atm>
Expand Down Expand Up @@ -775,80 +738,6 @@
</pes>
</mach>
</grid>
<grid name="a%ne30np4">
<mach name="hopper">
<pes compset="any" pesize="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>1200</ntasks_atm>
<ntasks_lnd>1200</ntasks_lnd>
<ntasks_rof>1200</ntasks_rof>
<ntasks_ice>1200</ntasks_ice>
<ntasks_ocn>1200</ntasks_ocn>
<ntasks_glc>1200</ntasks_glc>
<ntasks_wav>1200</ntasks_wav>
<ntasks_cpl>1200</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>2</nthrds_atm>
<nthrds_lnd>2</nthrds_lnd>
<nthrds_rof>2</nthrds_rof>
<nthrds_ice>2</nthrds_ice>
<nthrds_ocn>2</nthrds_ocn>
<nthrds_glc>2</nthrds_glc>
<nthrds_wav>2</nthrds_wav>
<nthrds_cpl>2</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>0</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="a%ne30np4_l%ne30np4_oi%gx1v6">
<mach name="hopper">
<pes compset="any" pesize="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>1200</ntasks_atm>
<ntasks_lnd>600</ntasks_lnd>
<ntasks_rof>1200</ntasks_rof>
<ntasks_ice>600</ntasks_ice>
<ntasks_ocn>120</ntasks_ocn>
<ntasks_glc>1200</ntasks_glc>
<ntasks_wav>1200</ntasks_wav>
<ntasks_cpl>1320</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>2</nthrds_atm>
<nthrds_lnd>2</nthrds_lnd>
<nthrds_rof>2</nthrds_rof>
<nthrds_ice>2</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>2</nthrds_glc>
<nthrds_wav>2</nthrds_wav>
<nthrds_cpl>2</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>600</rootpe_ice>
<rootpe_ocn>1200</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="a%ne30np4_l%ne30np4_oi%gx1v6">
<mach name="titan|stampede|bluewaters">
<pes compset="any" pesize="any">
Expand Down Expand Up @@ -1479,7 +1368,7 @@
</mach>
</grid>
<grid name="a%T85">
<mach name="hopper|titan|stampede|janus">
<mach name="titan|stampede|janus">
<pes compset="any" pesize="any">
<comment>none</comment>
<ntasks>
Expand Down Expand Up @@ -2038,14 +1927,14 @@
<pes compset="any" pesize="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>48</ntasks_atm>
<ntasks_lnd>48</ntasks_lnd>
<ntasks_rof>48</ntasks_rof>
<ntasks_ice>48</ntasks_ice>
<ntasks_ocn>48</ntasks_ocn>
<ntasks_glc>48</ntasks_glc>
<ntasks_wav>48</ntasks_wav>
<ntasks_cpl>48</ntasks_cpl>
<ntasks_atm>96</ntasks_atm>
<ntasks_lnd>96</ntasks_lnd>
<ntasks_rof>96</ntasks_rof>
<ntasks_ice>96</ntasks_ice>
<ntasks_ocn>96</ntasks_ocn>
<ntasks_glc>96</ntasks_glc>
<ntasks_wav>96</ntasks_wav>
<ntasks_cpl>96</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
Expand Down Expand Up @@ -3144,7 +3033,7 @@
</mach>
</grid>
<grid name="a%1.9x2.5_l%1.9x2.5_oi%gx1">
<mach name="hopper|titan|stampede|janus">
<mach name="titan|stampede|janus">
<pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
<comment>none</comment>
<ntasks>
Expand Down Expand Up @@ -3365,43 +3254,6 @@
</pes>
</mach>
</grid>
<grid name="a%0.9x1.25_l%0.9x1.25_oi%gx1">
<mach name="hopper">
<pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>768</ntasks_atm>
<ntasks_lnd>128</ntasks_lnd>
<ntasks_rof>768</ntasks_rof>
<ntasks_ice>640</ntasks_ice>
<ntasks_ocn>60</ntasks_ocn>
<ntasks_glc>768</ntasks_glc>
<ntasks_wav>768</ntasks_wav>
<ntasks_cpl>128</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>3</nthrds_atm>
<nthrds_lnd>3</nthrds_lnd>
<nthrds_rof>3</nthrds_rof>
<nthrds_ice>3</nthrds_ice>
<nthrds_ocn>3</nthrds_ocn>
<nthrds_glc>3</nthrds_glc>
<nthrds_wav>3</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>128</rootpe_ice>
<rootpe_ocn>768</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="a%T62_l%T62_oi%gx1">
<mach name="titan|stampede">
<pes compset="DATM.+CICE.+POP|DATM.+DICE.+POP|DATM.+CICE.+DOCN" pesize="any">
Expand Down Expand Up @@ -3810,7 +3662,7 @@
</mach>
</grid>
<grid name="a%0.47x0.63_l%0.47x0.63_oi%gx1">
<mach name="hopper|titan|stampede|janus">
<mach name="titan|stampede|janus">
<pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
<comment>none</comment>
<ntasks>
Expand Down Expand Up @@ -4365,7 +4217,7 @@
</mach>
</grid>
<grid name="a%T341_l%T341_oi%T341">
<mach name="hopper|titan|stampede|janus">
<mach name="titan|stampede|janus">
<pes compset="CAM.+CLM4.+CICE.+DOCN%DOM" pesize="any">
<comment>none</comment>
<ntasks>
Expand Down Expand Up @@ -4402,7 +4254,7 @@
</mach>
</grid>
<grid name="a%0.23x0.31_l%0.23x0.31_oi%tx0.1v2">
<mach name="hopper|janus">
<mach name="janus">
<pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
<comment>none</comment>
<ntasks>
Expand Down Expand Up @@ -4476,7 +4328,7 @@
</mach>
</grid>
<grid name="a%T341_l%T341_oi%tx0.1v2">
<mach name="hopper|titan|stampede|janus">
<mach name="titan|stampede|janus">
<pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
<comment>none</comment>
<ntasks>
Expand Down Expand Up @@ -4513,7 +4365,7 @@
</mach>
</grid>
<grid name="a%T341_l%0.23x0.31_oi%tx0.1v2">
<mach name="hopper|titan|stampede|janus">
<mach name="titan|stampede|janus">
<pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
<comment>none</comment>
<ntasks>
Expand Down Expand Up @@ -4550,7 +4402,7 @@
</mach>
</grid>
<grid name="a%ne120np4_l%0.23x0.31_oi%tx0.1v2">
<mach name="hopper|titan|stampede|janus">
<mach name="titan|stampede|janus">
<pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
<comment>none</comment>
<ntasks>
Expand Down Expand Up @@ -4587,7 +4439,7 @@
</mach>
</grid>
<grid name="a%ne120np4_l%0.9x1.25_oi%gx1v6">
<mach name="hopper|titan|stampede|janus">
<mach name="titan|stampede|janus">
<pes compset="CAM.+CLM4.+CICE.+DOCN%DOM" pesize="any">
<comment>none</comment>
<ntasks>
Expand Down Expand Up @@ -4624,7 +4476,7 @@
</mach>
</grid>
<grid name="a%ne120np4_l%0.23x0.31_oi%tx0.1v2">
<mach name="hopper|titan|stampede|janus">
<mach name="titan|stampede|janus">
<pes compset="CAM.+CLM4.+CICE.+DOCN%DOM" pesize="any">
<comment>none</comment>
<ntasks>
Expand Down Expand Up @@ -5216,7 +5068,7 @@
</mach>
</grid>
<grid name="any">
<mach name="hopper|janus">
<mach name="janus">
<pes compset="DATM.+DLND.+DICE.+DOCN%DOM.+DROF" pesize="T">
<comment>none</comment>
<ntasks>
Expand Down
34 changes: 3 additions & 31 deletions cime_config/acme/machines/config_compilers.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,7 @@ for mct, etc.

<CXX_LINKER>CXX</CXX_LINKER>
<!-- Note that SUPPORTS_CXX is false for pgi in general, because we
need some machine-specific libraries - see hopper pgi for an
example -->
need some machine-specific libraries -->

<!-- Technically, PGI does recognize this keyword during parsing,
but support is either buggy or incomplete, notably in that
Expand Down Expand Up @@ -261,8 +260,7 @@ for mct, etc.

<CXX_LINKER>CXX</CXX_LINKER>
<!-- Note that SUPPORTS_CXX is false for pgi in general, because we
need some machine-specific libraries - see hopper pgi for an
example -->
need some machine-specific libraries -->
<!-- Technically, PGI does recognize this keyword during parsing,
but support is either buggy or incomplete, notably in that
the "contiguous" attribute is incompatible with "intent".-->
Expand Down Expand Up @@ -554,7 +552,7 @@ for mct, etc.
<ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
<CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
<ADD_SLIBS> -L$(NETCDF_DIR) -lnetcdff -Wl,--as-needed,-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf </ADD_SLIBS>
<ADD_SLIBS> ${MKLROOT}/lib/intel64/libmkl_scalapack_lp64.a -Wl,--start-group ${MKLROOT}/lib/intel64/libmkl_intel_lp64.a ${MKLROOT}/lib/intel64/libmkl_core.a ${MKLROOT}/lib/intel64/libmkl_sequential.a -Wl,--end-group ${MKLROOT}/lib/intel64/libmkl_blacs_intelmpi_lp64.a -lpthread -lm </ADD_SLIBS>
<ADD_SLIBS> ${MKLROOT}/lib/intel64/libmkl_scalapack_lp64.a -Wl,--start-group ${MKLROOT}/lib/intel64/libmkl_intel_lp64.a ${MKLROOT}/lib/intel64/libmkl_core.a ${MKLROOT}/lib/intel64/libmkl_sequential.a -Wl,--end-group ${MKLROOT}/lib/intel64/libmkl_blacs_intelmpi_lp64.a -lpthread -lm -z muldefs</ADD_SLIBS>
<ADD_GPTL_CPPDEFS> -DHAVE_PAPI </ADD_GPTL_CPPDEFS>
<MPIFC> ftn </MPIFC>
<MPICC> cc </MPICC>
Expand Down Expand Up @@ -1168,32 +1166,6 @@ for mct, etc.
<SLIBS> -L$(NETCDF_PATH)/lib -lnetcdf -lnetcdff -lpmi -L$(MKL_PATH) -lmkl_rt</SLIBS>
</compiler>


<compiler COMPILER="pgi" MACH="hopper">
<ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
<ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
<TRILINOS_PATH>/project/projectdirs/ccsm1/Trilinos/trilinos-10.12.2/hopper-pgi/install</TRILINOS_PATH>
<CXX_LIBS> -lmpichf90_pgi $(PGI_PATH)/linux86-64/$(PGI_VERSION)/lib/f90main.o </CXX_LIBS>
<SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
</compiler>

<compiler COMPILER="intel" MACH="hopper">
<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs)</ADD_SLIBS>
<ESMF_LIBDIR DEBUG="FALSE">/project/projectdirs/ccsm1/esmf/ESMF_5_3_0_intel12.1.5/lib/libO/Unicos.intel.64.mpi.default/</ESMF_LIBDIR>
<ESMF_LIBDIR DEBUG="TRUE">/project/projectdirs/ccsm1/esmf/ESMF_5_3_0_intel12.1.5/lib/libg/Unicos.intel.64.mpi.default/</ESMF_LIBDIR>
<ADD_SLIBS MPILIB="mpich"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="mpich2"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="mpt"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="openmpi"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="mvapich"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="impi"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="mpi-serial"> -mkl </ADD_SLIBS>
</compiler>

<compiler COMPILER="gnu" MACH="hopper">
<TRILINOS_PATH>/project/projectdirs/ccsm1/Trilinos/trilinos-10.12.2/hopper-gnu/install</TRILINOS_PATH>
</compiler>

<compiler MACH="grizzly" COMPILER="gnu">
<MPICC>mpicc</MPICC>
<MPIFC>mpif90</MPIFC>
Expand Down
4 changes: 2 additions & 2 deletions cime_config/acme/machines/config_machines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
</modules>
<modules compiler="gnu">
<command name="load">PrgEnv-gnu</command>
<command name="switch">gcc gcc/6.1.0</command>
<command name="switch">gcc gcc/5.1.0</command>
</modules>
<modules compiler="!intel">
<command name="switch">cray-libsci/16.07.1</command>
Expand All @@ -147,7 +147,7 @@
<command name="rm">pmi</command>
<command name="load">pmi/5.0.10-1.0000.11050.0.0.ari</command>

<!--command name="load">cray-mpich/7.3.1</command acme original -->
<!--command name="load">cray-mpich/7.3.1</command acme original -->
<!--command name="load">cray-mpich/7.4.1</command edison default -->
<command name="load">cray-mpich/7.2.5</command>
</modules>
Expand Down

0 comments on commit fc8e441

Please sign in to comment.