Skip to content

Commit 0d9cd5e

Browse files
jonbobjonbob
committed
Merge branch 'milena/scripts/update-IC-machines' (PR #2641)
Update machine files for LANL IC This PR updates machine files for LANL IC machines: * removes wolf, which has been deactivated * updates grizzly * introduces badger, which is not fully supported yet [BFB]
2 parents 2d51191 + 6228515 commit 0d9cd5e

File tree

5 files changed

+123
-155
lines changed

5 files changed

+123
-155
lines changed

‎config/e3sm/allactive/config_pesall.xml

-37
Original file line numberDiff line numberDiff line change
@@ -183,43 +183,6 @@
183183
</pes>
184184
</mach>
185185
</grid>
186-
<grid name="any">
187-
<mach name="wolf">
188-
<pes compset="any" pesize="any">
189-
<comment>none</comment>
190-
<ntasks>
191-
<ntasks_atm>96</ntasks_atm>
192-
<ntasks_lnd>96</ntasks_lnd>
193-
<ntasks_rof>96</ntasks_rof>
194-
<ntasks_ice>96</ntasks_ice>
195-
<ntasks_ocn>96</ntasks_ocn>
196-
<ntasks_glc>96</ntasks_glc>
197-
<ntasks_wav>96</ntasks_wav>
198-
<ntasks_cpl>96</ntasks_cpl>
199-
</ntasks>
200-
<nthrds>
201-
<nthrds_atm>1</nthrds_atm>
202-
<nthrds_lnd>1</nthrds_lnd>
203-
<nthrds_rof>1</nthrds_rof>
204-
<nthrds_ice>1</nthrds_ice>
205-
<nthrds_ocn>1</nthrds_ocn>
206-
<nthrds_glc>1</nthrds_glc>
207-
<nthrds_wav>1</nthrds_wav>
208-
<nthrds_cpl>1</nthrds_cpl>
209-
</nthrds>
210-
<rootpe>
211-
<rootpe_atm>0</rootpe_atm>
212-
<rootpe_lnd>0</rootpe_lnd>
213-
<rootpe_rof>0</rootpe_rof>
214-
<rootpe_ice>0</rootpe_ice>
215-
<rootpe_ocn>0</rootpe_ocn>
216-
<rootpe_glc>0</rootpe_glc>
217-
<rootpe_wav>0</rootpe_wav>
218-
<rootpe_cpl>0</rootpe_cpl>
219-
</rootpe>
220-
</pes>
221-
</mach>
222-
</grid>
223186
<grid name="a%ne16np4">
224187
<mach name="any">
225188
<pes compset="any" pesize="any">

‎config/e3sm/machines/config_batch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@
439439
</queues>
440440
</batch_system>
441441

442-
<batch_system MACH="wolf" type="slurm" >
442+
<batch_system MACH="badger" type="slurm" >
443443
<directives>
444444
<directive>--nodes={{ num_nodes }}</directive>
445445
<directive>--ntasks-per-node={{ tasks_per_node }}</directive>

‎config/e3sm/machines/config_compilers.xml

+68-71
Original file line numberDiff line numberDiff line change
@@ -1245,39 +1245,6 @@ for mct, etc.
12451245
</SLIBS>
12461246
</compiler>
12471247

1248-
<compiler MACH="grizzly" COMPILER="gnu">
1249-
<CXX_LIBS>
1250-
<base>-lstdc++ -lmpi_cxx</base>
1251-
</CXX_LIBS>
1252-
<MPICC>mpicc</MPICC>
1253-
<MPICXX>mpic++</MPICXX>
1254-
<MPIFC>mpif90</MPIFC>
1255-
<PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
1256-
<SCC>gcc</SCC>
1257-
<SCXX>g++</SCXX>
1258-
<SFC>gfortran</SFC>
1259-
<SLIBS>
1260-
<append>$SHELL{$ENV{NETCDF_PATH}/bin/nf-config --flibs} -llapack -lblas</append>
1261-
<append> $ENV{MKLROOT}/lib/intel64/libmkl_scalapack_lp64.a -Wl,--start-group $ENV{MKLROOT}/lib/intel64/libmkl_intel_lp64.a $ENV{MKLROOT}/lib/intel64/libmkl_core.a $ENV{MKLROOT}/lib/intel64/libmkl_sequential.a -Wl,--end-group $ENV{MKLROOT}/lib/intel64/libmkl_blacs_intelmpi_lp64.a -lpthread -lm -z muldefs</append>
1262-
</SLIBS>
1263-
</compiler>
1264-
1265-
<compiler MACH="grizzly" COMPILER="intel">
1266-
<CXX_LIBS>
1267-
<base>-lstdc++ -lmpi_cxx</base>
1268-
</CXX_LIBS>
1269-
<MPICC>mpicc</MPICC>
1270-
<MPICXX>mpic++</MPICXX>
1271-
<MPIFC>mpif90</MPIFC>
1272-
<PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
1273-
<SCC>icc</SCC>
1274-
<SCXX>icpc</SCXX>
1275-
<SFC>ifort</SFC>
1276-
<SLIBS>
1277-
<append>$SHELL{$ENV{NETCDF_PATH}/bin/nf-config --flibs} -llapack -lblas</append>
1278-
</SLIBS>
1279-
</compiler>
1280-
12811248
<compiler MACH="itasca" COMPILER="intel">
12821249
<CFLAGS>
12831250
<base> -O2 -fp-model precise -I/soft/intel/x86_64/2013/composer_xe_2013/composer_xe_2013_sp1.3.174/mkl/include </base>
@@ -2093,71 +2060,101 @@ ntel/x86_64/2013/composer_xe_2013/composer_xe_2013_sp1.3.174/mkl/include </base>
20932060
<SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
20942061
</compiler>
20952062

2096-
<compiler MACH="userdefined">
2097-
<CONFIG_ARGS>
2098-
<base/>
2099-
</CONFIG_ARGS>
2100-
<CPPDEFS>
2101-
<append/>
2102-
</CPPDEFS>
2103-
<ESMF_LIBDIR/>
2104-
<MPI_LIB_NAME/>
2105-
<MPI_PATH/>
2106-
<NETCDF_PATH> USERDEFINED_MUST_EDIT_THIS</NETCDF_PATH>
2107-
<PNETCDF_PATH/>
2063+
<compiler MACH="grizzly" COMPILER="gnu">
2064+
<PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
2065+
<MPICC>mpicc</MPICC>
2066+
<MPIFC>mpif90</MPIFC>
2067+
<MPICXX>mpic++</MPICXX>
2068+
<SFC>gfortran</SFC>
2069+
<SCC>gcc</SCC>
2070+
<SCXX>g++</SCXX>
21082071
<SLIBS>
2109-
<append># USERDEFINED $SHELL{$NETCDF_PATH/bin/nf-config --flibs}</append>
2072+
<append>$SHELL{$ENV{NETCDF_PATH}/bin/nf-config --flibs} -llapack -lblas</append>
2073+
<append>$ENV{MKLROOT}/lib/intel64/libmkl_scalapack_lp64.a -Wl,--start-group $ENV{MKLROOT}/lib/intel64/libmkl_intel_lp64.a $ENV{MKLROOT}/lib/intel64/libmkl_core.a $ENV{MKLROOT}/lib/intel64/libmkl_sequential.a -Wl,--end-group $ENV{MKLROOT}/lib/intel64/libmkl_blacs_intelmpi_lp64.a -lpthread -lm -z muldefs</append>
21102074
</SLIBS>
2075+
<CXX_LIBS>
2076+
<base>-lstdc++ -lmpi_cxx</base>
2077+
</CXX_LIBS>
21112078
</compiler>
21122079

2113-
<compiler MACH="wolf" COMPILER="gnu">
2114-
<ALBANY_PATH>$ENV{ALBANY_PATH}</ALBANY_PATH>
2080+
<compiler MACH="grizzly" COMPILER="intel">
2081+
<PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
2082+
<MPICC>mpicc</MPICC>
2083+
<MPIFC>mpif90</MPIFC>
2084+
<MPICXX>mpic++</MPICXX>
2085+
<SFC>ifort</SFC>
2086+
<SCC>icc</SCC>
2087+
<SCXX>icpc</SCXX>
2088+
<SLIBS>
2089+
<append>$SHELL{$ENV{NETCDF_PATH}/bin/nf-config --flibs} -llapack -lblas</append>
2090+
<append>-mkl -lpthread</append>
2091+
</SLIBS>
21152092
<CXX_LIBS>
21162093
<base>-lstdc++ -lmpi_cxx</base>
21172094
</CXX_LIBS>
2095+
</compiler>
2096+
2097+
<compiler MACH="badger" COMPILER="gnu">
2098+
<PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
21182099
<MPICC>mpicc</MPICC>
2119-
<MPICXX>mpic++</MPICXX>
21202100
<MPIFC>mpif90</MPIFC>
2101+
<MPICXX>mpic++</MPICXX>
2102+
<SFC>gfortran</SFC>
21212103
<SCC>gcc</SCC>
21222104
<SCXX>g++</SCXX>
2123-
<SFC>gfortran</SFC>
21242105
<SLIBS>
21252106
<append>$SHELL{$ENV{NETCDF_PATH}/bin/nf-config --flibs} -llapack -lblas</append>
2107+
<append>$ENV{MKLROOT}/lib/intel64/libmkl_scalapack_lp64.a -Wl,--start-group $ENV{MKLROOT}/lib/intel64/libmkl_intel_lp64.a $ENV{MKLROOT}/lib/intel64/libmkl_core.a $ENV{MKLROOT}/lib/intel64/libmkl_sequential.a -Wl,--end-group $ENV{MKLROOT}/lib/intel64/libmkl_blacs_intelmpi_lp64.a -lpthread -lm -z muldefs</append>
21262108
</SLIBS>
2127-
<TRILINOS_PATH>$ENV{TRILINOS_PATH}</TRILINOS_PATH>
2109+
<CXX_LIBS>
2110+
<base>-lstdc++ -lmpi_cxx</base>
2111+
</CXX_LIBS>
21282112
</compiler>
21292113

2130-
<compiler MACH="wolf" COMPILER="intel">
2114+
<compiler MACH="badger" COMPILER="intel">
2115+
<PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
21312116
<MPICC>mpicc</MPICC>
2132-
<MPICXX>mpic++</MPICXX>
21332117
<MPIFC>mpif90</MPIFC>
2118+
<MPICXX>mpic++</MPICXX>
2119+
<SFC>ifort</SFC>
21342120
<SCC>icc</SCC>
21352121
<SCXX>icpc</SCXX>
2136-
<SFC>ifort</SFC>
21372122
<SLIBS>
21382123
<append>$SHELL{$ENV{NETCDF_PATH}/bin/nf-config --flibs} -llapack -lblas</append>
2139-
<append MPILIB="mpich"> -mkl=cluster </append>
2140-
<append MPILIB="mpich2"> -mkl=cluster </append>
2141-
<append MPILIB="mpt"> -mkl=cluster </append>
2142-
<append MPILIB="openmpi"> -mkl=cluster </append>
2143-
<append MPILIB="mvapich"> -mkl=cluster </append>
2144-
<append MPILIB="impi"> -mkl=cluster </append>
2145-
<append MPILIB="mpi-serial"> -mkl </append>
2124+
<append>-mkl -lpthread</append>
21462125
</SLIBS>
2147-
<TRILINOS_PATH>$ENV{TRILINOS_PATH}</TRILINOS_PATH>
2126+
<CXX_LIBS>
2127+
<base>-lstdc++ -lmpi_cxx</base>
2128+
</CXX_LIBS>
2129+
<CFLAGS>
2130+
<base>compile_threaded="true"> -qopenmp</base>
2131+
</CFLAGS>
2132+
<FFLAGS>
2133+
<base>compile_threaded="true"> -qopenmp</base>
2134+
</FFLAGS>
2135+
<LDFLAGS>
2136+
<base>compile_threaded="true"> -qopenmp</base>
2137+
</LDFLAGS>
2138+
<FFLAGS_NOOPT>
2139+
<base>compile_threaded="true"> -qopenmp</base>
2140+
</FFLAGS_NOOPT>
21482141
</compiler>
21492142

2150-
<compiler MACH="wolf" COMPILER="pgi">
2151-
<MPICC>mpicc</MPICC>
2152-
<MPICXX>mpic++</MPICXX>
2153-
<MPIFC>mpif90</MPIFC>
2154-
<SCC>pgcc</SCC>
2155-
<SCXX>pgc++</SCXX>
2156-
<SFC>pgfortran</SFC>
2143+
<compiler MACH="userdefined">
2144+
<CONFIG_ARGS>
2145+
<base/>
2146+
</CONFIG_ARGS>
2147+
<CPPDEFS>
2148+
<append/>
2149+
</CPPDEFS>
2150+
<ESMF_LIBDIR/>
2151+
<MPI_LIB_NAME/>
2152+
<MPI_PATH/>
2153+
<NETCDF_PATH> USERDEFINED_MUST_EDIT_THIS</NETCDF_PATH>
2154+
<PNETCDF_PATH/>
21572155
<SLIBS>
2158-
<append>$SHELL{$ENV{NETCDF_PATH}/bin/nf-config --flibs} -llapack -lblas</append>
2156+
<append># USERDEFINED $SHELL{$NETCDF_PATH/bin/nf-config --flibs}</append>
21592157
</SLIBS>
2160-
<TRILINOS_PATH>$ENV{TRILINOS_PATH}</TRILINOS_PATH>
21612158
</compiler>
21622159

21632160
</config_compilers>

0 commit comments

Comments
 (0)