Commit 52528801 authored by camp's avatar camp

Internallauncher

    I added a function to return the correct argument for the "process per node"
flag for Open MPI and MPICH. This change affects the mpirun and mpiexe commands.
If your system has a different argument then you can override this function.
This argument is only used if the user has set VisIt's -nn flag.

    I have changed the sbatch job submitter to be like qsub. This was done for
NERSC new Cori system. Now it has many functions that can be overriden to support
any system using sbatch. Also added a new job launcher srun.

    Added the hosttoip variable in MainLauncher to convert host name to IP address.
Had a problem that compute nodes could not convert host name to IP address. By default
this is turned off. You need to set hosttoip=True in your MainLauncher override.
See NERSC custom launcher for an example.

NERSC customlauncher
    Remove references to Carver. That system is gone. Added sbatch support, also 
turned on the hosttoip flag to translate the hostname to an IP address.

gui/QvisHostProfileWindow.C
    Added sbatch/srun option in the list of launchers.

config-site/cori.nersc.gov.cmake
    Added site file for NERSC's Cori system.

Removed NERSC's Carver site config file. System has been retired.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@27736 18c085ea-50e0-402c-830e-de6fd14e8384
parent eb7102e0
This diff is collapsed.
#/usr/common/graphics/visit/installs/3rdparty/cmake/3.0.2/linux-x86_64_gcc-4.9/bin/cmake
##
## ./src/svn_bin/build_visit generated host.cmake
## created: Tue Nov 17 10:45:36 PST 2015
## system: Linux cori10 3.0.101-0.46-default #1 SMP Wed Dec 17 11:04:10 UTC 2014 (8356111) x86_64 x86_64 x86_64 GNU/Linux
## by: camp
##
## Setup VISITHOME & VISITARCH variables.
##
SET(VISITHOME /usr/common/graphics/visit/installs/3rdparty)
SET(VISITARCH linux-x86_64_gcc-4.9)
VISIT_OPTION_DEFAULT(VISIT_INSTALL_PROFILES_TO_HOSTS "nersc" TYPE STRING)
VISIT_OPTION_DEFAULT(CMAKE_INSTALL_PREFIX /usr/common/graphics/visit)
VISIT_OPTION_DEFAULT(VISIT_INSTALL_THIRD_PARTY ON)
VISIT_OPTION_DEFAULT(CMAKE_BUILD_TYPE Release)
## Compiler flags.
##
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++ TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -m64 -fPIC -fvisibility=hidden -DVIZSCHEMA_DECOMPOSE_DOMAINS" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fPIC -fvisibility=hidden -DVIZSCHEMA_DECOMPOSE_DOMAINS" TYPE STRING)
##
## Parallel Build Setup.
##
VISIT_OPTION_DEFAULT(VISIT_MPI_C_FLAGS "-I/opt/cray/mpt/7.2.4/gni/mpich2-gnu/4.9/include" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_MPI_CXX_FLAGS "-I/opt/cray/mpt/7.2.4/gni/mpich2-gnu/4.9/include" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_MPI_LD_FLAGS "-L/opt/cray/mpt/7.2.4/gni/mpich2-gnu/4.9/lib -L/opt/cray/pmi/5.0.8-1.0000.10843.170.1.ari/lib64 -L/opt/cray/alps/5.2.3-2.0502.9295.14.14.ari/lib64 -Wl,-rpath,/opt/cray/mpt/7.2.4/gni/mpich2-gnu/4.9/lib -Wl,-rpath,/opt/cray/pmi/5.0.8-1.0000.10843.170.1.ari/lib64 -Wl,-rpath,/opt/cray/alps/5.2.3-2.0502.9295.14.14.ari/lib64 " TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_MPI_LIBS mpich pmi alpslli alpsutil pthread rt)
VISIT_OPTION_DEFAULT(VISIT_PARALLEL ON TYPE BOOL)
##
## VisIt Thread Option
##
VISIT_OPTION_DEFAULT(VISIT_THREAD OFF TYPE BOOL)
##############################################################
##
## Database reader plugin support libraries
##
## The HDF4, HDF5 and NetCDF libraries must be first so that
## their libdeps are defined for any plugins that need them.
##
## For libraries with LIBDEP settings, order matters.
## Libraries with LIBDEP settings that depend on other
## Library's LIBDEP settings must come after them.
##############################################################
##
##
## Mesa
##
VISIT_OPTION_DEFAULT(VISIT_MESA_DIR ${VISITHOME}/mesa/7.10.2/${VISITARCH})
##
## Python
##
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.7.6/${VISITARCH})
##
## Qt
##
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/qt/4.8.3/${VISITARCH}/bin)
##
## VTK
##
SETUP_APP_VERSION(VTK 6.1.0)
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk/${VTK_VERSION}/${VISITARCH})
##
##
## ADIOS
## (configured w/ mpi compiler wrapper)
##
VISIT_OPTION_DEFAULT(VISIT_ADIOS_DIR ${VISITHOME}/adios/1.7.0/${VISITARCH})
##
## Boxlib
##
VISIT_OPTION_DEFAULT(VISIT_BOXLIB_DIR ${VISITHOME}/boxlib/1.0.7/${VISITARCH})
##
## CCMIO
##
VISIT_OPTION_DEFAULT(VISIT_CCMIO_DIR ${VISITHOME}/ccmio/2.6.1/${VISITARCH})
##
## CFITSIO
##
VISIT_OPTION_DEFAULT(VISIT_CFITSIO_DIR ${VISITHOME}/cfitsio/3006/${VISITARCH})
##
## SZIP
##
VISIT_OPTION_DEFAULT(VISIT_SZIP_DIR ${VISITHOME}/szip/2.1/${VISITARCH})
##
## HDF5
##
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.14/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz /usr/lib z TYPE STRING)
##
## CGNS
##
VISIT_OPTION_DEFAULT(VISIT_CGNS_DIR ${VISITHOME}/cgns/3.2.1/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_CGNS_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} TYPE STRING)
##
## FastBit
##
VISIT_OPTION_DEFAULT(VISIT_FASTBIT_DIR ${VISITHOME}/fastbit/1.2.0/${VISITARCH})
##
## GDAL
##
VISIT_OPTION_DEFAULT(VISIT_GDAL_DIR ${VISITHOME}/gdal/1.10.0/${VISITARCH})
##
## H5Part
##
VISIT_OPTION_DEFAULT(VISIT_H5PART_DIR ${VISITHOME}/h5part/1.6.6/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_H5PART_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} TYPE STRING)
##
## HDF4
##
VISIT_OPTION_DEFAULT(VISIT_HDF4_DIR ${VISITHOME}/hdf4/4.2.5/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF4_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz ${VISITHOME}/vtk/${VTK_VERSION}/${VISITARCH}/lib vtkjpeg-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} TYPE STRING)
##
## Ice-T
##
VISIT_OPTION_DEFAULT(VISIT_ICET_DIR ${VISITHOME}/icet/1.0.0/${VISITARCH})
##
## NetCDF
##
VISIT_OPTION_DEFAULT(VISIT_NETCDF_DIR ${VISITHOME}/netcdf/4.1.1/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_NETCDF_LIBDEP HDF5_LIBRARY_DIR hdf5_hl HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} TYPE STRING)
##
## ITAPS
##
## MOAB implementation
ITAPS_INCLUDE_DIRECTORIES(MOAB ${VISITHOME}/itaps/1.4/MOAB/4.8.1/${VISITARCH}/include)
ITAPS_FILE_PATTERNS(MOAB *.cub)
ITAPS_LINK_LIBRARIES(MOAB iMesh MOAB hdf5_hl hdf5 sz z netcdf_c++ netcdf )
ITAPS_LINK_DIRECTORIES(MOAB ${VISITHOME}/itaps/1.4/MOAB/4.8.1/${VISITARCH}/lib ${VISITHOME}/hdf5/1.8.14/${VISITARCH}/lib ${VISITHOME}/szip/2.1/${VISITARCH}/lib ${VISITHOME}/netcdf/4.1.1/${VISITARCH}/lib )
## FMDB implementation
ITAPS_INCLUDE_DIRECTORIES(FMDB ${VISITHOME}/itaps/1.4/FMDB/1.4.0/${VISITARCH}/include)
ITAPS_FILE_PATTERNS(FMDB *.sms)
ITAPS_LINK_LIBRARIES(FMDB FMDB SCORECModel SCORECUtil )
ITAPS_LINK_DIRECTORIES(FMDB ${VISITHOME}/itaps/1.4/FMDB/1.4.0/${VISITARCH}/lib)
## GRUMMP implementation
ITAPS_INCLUDE_DIRECTORIES(GRUMMP ${VISITHOME}/itaps/1.4/GRUMMP/0.6.5/${VISITARCH}/include)
ITAPS_FILE_PATTERNS(GRUMMP *.bdry *.smesh *.vmesh)
ITAPS_LINK_LIBRARIES(GRUMMP iMesh_GRUMMP GR_3D GR_surf GR_2D GR_geom GR_base SUMAAlog_lite OptMS cgm dl)
ITAPS_LINK_DIRECTORIES(GRUMMP ${VISITHOME}/itaps/1.4/GRUMMP/0.6.5/${VISITARCH}/lib)
##
## PySide
##
VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/pyside/1.2.2/${VISITARCH}/)
##
## Silo
##
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${VISITHOME}/silo/4.10.1/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} TYPE STRING)
##
## VISUS
##
VISIT_OPTION_DEFAULT(VISIT_VISUS_DIR ${VISITHOME}/visus/ad09cb8/${VISITARCH})
##
## Xdmf
##
VISIT_OPTION_DEFAULT(VISIT_XDMF_DIR ${VISITHOME}/Xdmf/2.1.1/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_XDMF_LIBDEP HDF5_LIBRARY_DIR hdf5 VTK_LIBRARY_DIRS vtklibxml2-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} TYPE STRING)
......@@ -1159,6 +1159,7 @@ QvisHostProfileWindow::CreateLaunchSettingsGroup()
launchMethod->addItem("sbatch/ibrun");
launchMethod->addItem("sbatch/mpiexec");
launchMethod->addItem("sbatch/mpirun");
launchMethod->addItem("sbatch/srun");
connect(launchMethod, SIGNAL(activated(const QString &)),
this, SLOT(launchMethodChanged(const QString &)));
launchCheckBox = new QCheckBox(tr("Parallel launch method"), currentGroup);
......
This diff is collapsed.
<?xml version="1.0"?>
<Object name="MachineProfile">
<Field name="hostNickname" type="string">"NERSC Carver"</Field>
<Field name="host" type="string">carver.nersc.gov</Field>
<Field name="hostAliases" type="string">cvrsvc01 cvrsvc02 cvrsvc03 cvrsvc04 cvrsvc05 cvrsvc06 cvrsvc09 cvrsvc10 cvrsvc11 cvrsvc12 cvrsvc13 cvrsvc14 cvrsvc15 cvrsvc16 cvrsvc17 cvrsvc18 cvrsvc19 cvrsvc20 cvrsvc21 cvrsvc22 cvrsvc26 cvrsvc27 cvrsvc28</Field>
<Field name="directory" type="string">/usr/common/graphics/visit</Field>
<Field name="shareOneBatchJob" type="bool">false</Field>
<Field name="sshPortSpecified" type="bool">false</Field>
<Field name="sshPort" type="int">22</Field>
<Field name="useGateway" type="bool">false</Field>
<Field name="gatewayHost" type="string"></Field>
<Field name="clientHostDetermination" type="string">MachineName</Field>
<Field name="manualClientHostName" type="string"></Field>
<Field name="tunnelSSH" type="bool">true</Field>
<Field name="maximumNodesValid" type="bool">false</Field>
<Field name="maximumNodes" type="int">1</Field>
<Field name="maximumProcessorsValid" type="bool">false</Field>
<Field name="maximumProcessors" type="int">1</Field>
<Object name="LaunchProfile">
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">2</Field>
<Field name="numNodesSet" type="bool">false</Field>
<Field name="numNodes" type="int">1</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">reg_xlmem</Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string"></Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">01:00:00</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">qsub/mpirun</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector"></Field>
<Field name="parallel" type="bool">true</Field>
<Field name="launchArgsSet" type="bool">true</Field>
<Field name="launchArgs" type="string">"-l mem=32gb"</Field>
<Field name="sublaunchArgsSet" type="bool">false</Field>
<Field name="sublaunchArgs" type="string"></Field>
<Field name="sublaunchPreCmdSet" type="bool">false</Field>
<Field name="sublaunchPreCmd" type="string"></Field>
<Field name="sublaunchPostCmdSet" type="bool">false</Field>
<Field name="sublaunchPostCmd" type="string"></Field>
<Field name="machinefileSet" type="bool">false</Field>
<Field name="machinefile" type="string"></Field>
<Field name="visitSetsUpEnv" type="bool">false</Field>
<Field name="canDoHWAccel" type="bool">false</Field>
<Field name="GPUsPerNode" type="int">1</Field>
<Field name="XArguments" type="string"></Field>
<Field name="launchXServers" type="bool">false</Field>
<Field name="XDisplay" type="string">:%l</Field>
<Field name="profileName" type="string">"reg_xlmem (32 GB)"</Field>
</Object>
<Object name="LaunchProfile">
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">4</Field>
<Field name="numNodesSet" type="bool">false</Field>
<Field name="numNodes" type="int">1</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">reg_xlmem</Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string"></Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">01:00:00</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">qsub/mpirun</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector"></Field>
<Field name="parallel" type="bool">true</Field>
<Field name="launchArgsSet" type="bool">true</Field>
<Field name="launchArgs" type="string">"-l mem=64gb"</Field>
<Field name="sublaunchArgsSet" type="bool">false</Field>
<Field name="sublaunchArgs" type="string"></Field>
<Field name="sublaunchPreCmdSet" type="bool">false</Field>
<Field name="sublaunchPreCmd" type="string"></Field>
<Field name="sublaunchPostCmdSet" type="bool">false</Field>
<Field name="sublaunchPostCmd" type="string"></Field>
<Field name="machinefileSet" type="bool">false</Field>
<Field name="machinefile" type="string"></Field>
<Field name="visitSetsUpEnv" type="bool">false</Field>
<Field name="canDoHWAccel" type="bool">false</Field>
<Field name="GPUsPerNode" type="int">1</Field>
<Field name="XArguments" type="string"></Field>
<Field name="launchXServers" type="bool">false</Field>
<Field name="XDisplay" type="string">:%l</Field>
<Field name="profileName" type="string">"reg_xlmem (64 GB)"</Field>
</Object>
<Object name="LaunchProfile">
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">8</Field>
<Field name="numNodesSet" type="bool">false</Field>
<Field name="numNodes" type="int">1</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">reg_xlmem</Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string"></Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">01:00:00</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">qsub/mpirun</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector"></Field>
<Field name="parallel" type="bool">true</Field>
<Field name="launchArgsSet" type="bool">true</Field>
<Field name="launchArgs" type="string">"-l mem=128gb"</Field>
<Field name="sublaunchArgsSet" type="bool">false</Field>
<Field name="sublaunchArgs" type="string"></Field>
<Field name="sublaunchPreCmdSet" type="bool">false</Field>
<Field name="sublaunchPreCmd" type="string"></Field>
<Field name="sublaunchPostCmdSet" type="bool">false</Field>
<Field name="sublaunchPostCmd" type="string"></Field>
<Field name="machinefileSet" type="bool">false</Field>
<Field name="machinefile" type="string"></Field>
<Field name="visitSetsUpEnv" type="bool">false</Field>
<Field name="canDoHWAccel" type="bool">false</Field>
<Field name="GPUsPerNode" type="int">1</Field>
<Field name="XArguments" type="string"></Field>
<Field name="launchXServers" type="bool">false</Field>
<Field name="XDisplay" type="string">:%l</Field>
<Field name="profileName" type="string">"reg_xlmem (128 GB)"</Field>
</Object>
<Object name="LaunchProfile">
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">16</Field>
<Field name="numNodesSet" type="bool">false</Field>
<Field name="numNodes" type="int">1</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">reg_xlmem</Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string"></Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">01:00:00</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">qsub/mpirun</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector"></Field>
<Field name="parallel" type="bool">true</Field>
<Field name="launchArgsSet" type="bool">true</Field>
<Field name="launchArgs" type="string">"-l mem=256gb"</Field>
<Field name="sublaunchArgsSet" type="bool">false</Field>
<Field name="sublaunchArgs" type="string"></Field>
<Field name="sublaunchPreCmdSet" type="bool">false</Field>
<Field name="sublaunchPreCmd" type="string"></Field>
<Field name="sublaunchPostCmdSet" type="bool">false</Field>
<Field name="sublaunchPostCmd" type="string"></Field>
<Field name="machinefileSet" type="bool">false</Field>
<Field name="machinefile" type="string"></Field>
<Field name="visitSetsUpEnv" type="bool">false</Field>
<Field name="canDoHWAccel" type="bool">false</Field>
<Field name="GPUsPerNode" type="int">1</Field>
<Field name="XArguments" type="string"></Field>
<Field name="launchXServers" type="bool">false</Field>
<Field name="XDisplay" type="string">:%l</Field>
<Field name="profileName" type="string">"reg_xlmem (256 GB)"</Field>
</Object>
<Field name="activeProfile" type="int">-1</Field>
</Object>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment