Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add number of nodes to srun on Anvil #3101

Merged
merged 2 commits into from
Aug 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cime/config/e3sm/machines/config_machines.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,7 @@
<mpirun mpilib="default">
<executable>srun</executable>
<arguments>
<arg name="num_tasks"> -l -n {{ total_tasks }} </arg>
<arg name="num_tasks"> -l -N {{ num_nodes }} -n {{ total_tasks }} </arg>
<arg name="binding">--cpu_bind=cores</arg>
<arg name="thread_count">-c $SHELL{if [ FALSE = `./xmlquery --value SMP_PRESENT` ];then echo 1;else echo $OMP_NUM_THREADS;fi}</arg>
<arg name="placement">-m plane=$SHELL{if [ FALSE = `./xmlquery --value SMP_PRESENT` ];then echo 36;else echo 36/$OMP_NUM_THREADS|bc;fi}</arg>
Expand Down
19 changes: 1 addition & 18 deletions components/homme/cmake/machineFiles/anvil.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,9 @@ SET (NetCDF_C_PATH "${NCCONFIG_OUTPUT}" CACHE STRING "")


SET (USE_MPIEXEC "srun" CACHE STRING "")
SET (USE_MPI_OPTIONS "--cpu_bind=cores" CACHE STRING "")
SET (HOMME_USE_MKL "TRUE" CACHE FILEPATH "") # for Intel
SET (USE_QUEUING FALSE CACHE BOOL "")
# for standalone HOMME builds:
SET (CPRNC_DIR /lcrc/group/acme/tools/cprnc CACHE FILEPATH "")




#EXECUTE_PROCESS(COMMAND nf-config --flibs
# RESULT_VARIABLE NFCONFIG_RESULT
# OUTPUT_VARIABLE NFCONFIG_OUTPUT
# ERROR_VARIABLE NFCONFIG_ERROR
# OUTPUT_STRIP_TRAILING_WHITESPACE
#)
#SET (ADD_LINKER_FLAGS " ${NFCONFIG_OUTPUT} " CACHE STRING "")
#
#EXECUTE_PROCESS(COMMAND nc-config --libs
# RESULT_VARIABLE NCCONFIG_RESULT
# OUTPUT_VARIABLE NCCONFIG_OUTPUT
# ERROR_VARIABLE NCCONFIG_ERROR
# OUTPUT_STRIP_TRAILING_WHITESPACE
#)
#SET (ADD_LINKER_FLAGS " ${NCCONFIG_OUTPUT} " CACHE STRING "")