Skip to content

Commit

Permalink
Merge branch 'alcf/machines/theta' (PR #1689)
Browse files Browse the repository at this point in the history 
Update ALCF Theta machine config

[BFB]
  • Loading branch information
@amametjanov
amametjanov committed Aug 1, 2017
2 parents 96720e1 + af3f14a commit edc7b29
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 37 deletions.
3 changes: 2 additions & 1 deletion config/acme/machines/config_batch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,8 @@

<batch_system MACH="theta" type="cobalt_theta">
<queues>
<queue walltimemax="00:60:00" jobmin="1" jobmax="3200" default="true">default</queue>
<queue walltimemax="01:00:00" jobmin="512" jobmax="231936" default="true">default</queue>
<queue walltimemax="01:00:00" jobmin="1" jobmax="1024" strict="true">debug-cache-quad</queue>
</queues>
</batch_system>

Expand Down
15 changes: 6 additions & 9 deletions config/acme/machines/config_compilers.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1012,21 +1012,18 @@ for mct, etc.
</compiler>

<compiler COMPILER="intel" MACH="theta">
<MPIFC> ftn </MPIFC>
<MPICC> cc </MPICC>
<MPICXX> CC </MPICXX>
<ADD_FFLAGS DEBUG="FALSE"> -O2 -xMIC-AVX512 </ADD_FFLAGS>
<ADD_CFLAGS DEBUG="FALSE"> -O2 -xMIC-AVX512 </ADD_CFLAGS>
<ADD_FFLAGS DEBUG="TRUE"> -O0 -g -xMIC-AVX512 </ADD_FFLAGS>
<ADD_CFLAGS DEBUG="TRUE"> -O0 -g -xMIC-AVX512 </ADD_CFLAGS>
<SFC> ifort </SFC>
<SCC> icc </SCC>
<SCXX> icpc </SCXX>
<ADD_FFLAGS DEBUG="FALSE"> -O2 -debug minimal -qno-opt-dynamic-align </ADD_FFLAGS>
<ADD_CFLAGS compile_threaded="true"> -qopenmp </ADD_CFLAGS>
<ADD_FFLAGS compile_threaded="true"> -qopenmp </ADD_FFLAGS>
<ADD_FFLAGS_NOOPT compile_threaded="true"> -qopenmp </ADD_FFLAGS_NOOPT>
<ADD_LDFLAGS compile_threaded="true"> -qopenmp </ADD_LDFLAGS>
<CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
<ADD_SLIBS> -L$(NETCDF_DIR)/lib -lnetcdff -L$(NETCDF_DIR)/lib -lnetcdf -Wl,-rpath -Wl,$(NETCDF_DIR)/lib </ADD_SLIBS>
<ADD_SLIBS> -mkl -lpthread -lm </ADD_SLIBS>
<ADD_CPPFLAGS> -DHAVE_COMM_F2C </ADD_CPPFLAGS>
<ADD_SLIBS> -mkl -lpthread </ADD_SLIBS>
<ADD_CPPDEFS> -DARCH_MIC_KNL </ADD_CPPDEFS>
</compiler>

<compiler COMPILER="pgi" MACH="blues">
Expand Down
53 changes: 26 additions & 27 deletions config/acme/machines/config_machines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1284,21 +1284,20 @@
<TESTS>acme_developer</TESTS>
<COMPILERS>intel,gnu,cray</COMPILERS>
<MPILIBS>mpt</MPILIBS>
<CIME_OUTPUT_ROOT>/projects/EarlyPerf_theta/acme/scratch/$USER</CIME_OUTPUT_ROOT>
<DIN_LOC_ROOT>/projects/EarlyPerf_theta/acme/inputdata</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/projects/EarlyPerf_theta/acme/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<CIME_OUTPUT_ROOT>/projects/$PROJECT/$USER</CIME_OUTPUT_ROOT>
<DIN_LOC_ROOT>/projects/$PROJECT/acme/inputdata</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/projects/$PROJECT/acme/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
<DOUT_L_MSROOT>/projects/EarlyPerf_theta/acme/csm/$CASE</DOUT_L_MSROOT>
<CCSM_BASELINE>/projects/EarlyPerf_theta/acme/baselines</CCSM_BASELINE>
<CCSM_CPRNC>/projects/EarlyPerf_theta/acme/tools/cprnc</CCSM_CPRNC>
<SAVE_TIMING_DIR>/projects/EarlyPerf_theta/acme</SAVE_TIMING_DIR>
<DOUT_L_MSROOT>$CIME_OUTPUT_ROOT/csm/$CASE</DOUT_L_MSROOT>
<CCSM_BASELINE>/projects/$PROJECT/acme/baselines</CCSM_BASELINE>
<CCSM_CPRNC>/projects/$PROJECT/acme/tools/cprnc/cprnc</CCSM_CPRNC>
<OS>CNL</OS>
<BATCH_SYSTEM>cobalt_theta</BATCH_SYSTEM>
<SUPPORTED_BY>acme</SUPPORTED_BY>
<GMAKE_J>8</GMAKE_J>
<MAX_TASKS_PER_NODE>64</MAX_TASKS_PER_NODE>
<PES_PER_NODE>64</PES_PER_NODE>
<PROJECT>Theta_ESP</PROJECT>
<PROJECT>OceanClimate</PROJECT>
<PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
<PIO_CONFIG_OPTS> -D PIO_BUILD_TIMING:BOOL=ON </PIO_CONFIG_OPTS>
<mpirun mpilib="default">
Expand All @@ -1321,47 +1320,47 @@
<cmd_path lang="sh">module</cmd_path>
<cmd_path lang="csh">module</cmd_path>
<modules>
<command name="rm">craype-mic-knl</command>
<command name="rm">PrgEnv-intel</command>
<command name="rm">PrgEnv-cray</command>
<command name="rm">PrgEnv-gnu</command>
<command name="rm">intel</command>
<command name="rm">cce</command>
<command name="rm">cray-mpich</command>
<command name="rm">cray-parallel-netcdf</command>
<command name="rm">cray-hdf5-parallel</command>
<command name="rm">pmi</command>
<command name="rm">cray-libsci</command>
<command name="rm">cray-mpich</command>
<command name="rm">cray-netcdf</command>
<command name="rm">cray-hdf5</command>
<command name="rm">cray-netcdf</command>
<command name="rm">cray-netcdf-hdf5parallel</command>
<command name="rm">cray-libsci</command>
<command name="rm">craype</command>
</modules>
<modules>
<command name="load">craype/2.5.11</command>
</modules>
<modules compiler="intel">
<command name="load">PrgEnv-intel/6.0.3</command>
<command name="switch">intel intel/17.0.2.174</command>
<command name="rm">cray-libsci</command>
<command name="load">PrgEnv-intel/6.0.4</command>
<command name="load">intel/17.0.4.196</command>
</modules>
<modules compiler="cray">
<command name="load">PrgEnv-cray/6.0.3</command>
<command name="switch">cce cce/8.5.4</command>
<command name="load">PrgEnv-cray/6.0.4</command>
<command name="load">cce/8.6.0</command>
</modules>
<modules compiler="gnu">
<command name="load">PrgEnv-gnu/6.0.3</command>
<command name="switch">gcc gcc/6.2.0</command>
</modules>
<modules>
<command name="swap">craype craype/2.5.9</command>
<command name="load">PrgEnv-gnu/6.0.4</command>
<command name="load">gcc/6.3.0</command>
</modules>
<modules compiler="!intel">
<command name="switch">cray-libsci/16.09.1</command>
<command name="switch">cray-libsci/17.06.1</command>
</modules>
<modules>
<command name="load">cray-mpich/7.5.3</command>
<command name="load">craype-mic-knl</command>
<command name="load">cray-mpich/7.6.0</command>
</modules>
<modules mpilib="mpt">
<command name="load">cray-netcdf-hdf5parallel/4.4.1.1</command>
<command name="load">cray-hdf5-parallel/1.10.0.1</command>
<command name="load">cray-parallel-netcdf/1.8.0</command>
<command name="load">cray-netcdf-hdf5parallel/4.4.1.1.3</command>
<command name="load">cray-hdf5-parallel/1.10.0.3</command>
<command name="load">cray-parallel-netcdf/1.8.1.3</command>
</modules>
</module_system>
<environment_variables>
Expand Down

0 comments on commit edc7b29

Please sign in to comment.