diff --git a/doc/html/configurator.html.in b/doc/html/configurator.html.in index 73e083ae163cf70f29c88b2c4918c0a1a082e403..37d95bbbe866a0299e66ae11b647509d0397c390 100644 --- a/doc/html/configurator.html.in +++ b/doc/html/configurator.html.in @@ -411,12 +411,10 @@ handling required (InfiniBand, Myrinet, Ethernet, etc.)<BR> Specify the type of MPI to be used by default. SLURM will configure environment variables accordingly. Users can over-ride this specification with an srun option.<BR> Select one value for <B>MpiDefault</B>:<BR> -<input type="radio" name="mpi_default" value="lam"> <B>LAM MPI</B><BR> <input type="radio" name="mpi_default" value="mpichgm"> <B>Mpich-Gm</B><BR> <input type="radio" name="mpi_default" value="mvapich"> <B>MVAPICH</B><BR> -<input type="radio" name="mpi_default" value="openmpi"> <B>Open MPI</B><BR> <input type="radio" name="mpi_default" value="none" checked> <B>None</B>: -This works for most other MPI types.<BR> +This works for most other MPI types including LAM MPI and Open MPI.<BR> <P> <H2>Process Tracking</H2> diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5 index 934826a8b0cdea445556ad0de4ddf6da7691b1a8..f6b0e5c16ce22750c6470263ada7126c7fc2bd00 100644 --- a/doc/man/man5/slurm.conf.5 +++ b/doc/man/man5/slurm.conf.5 @@ -242,13 +242,10 @@ May not exceed 65533. Identifies the default type of MPI to be used. Srun may override this configuration parameter in any case. Currently supported versions include: -\fBlam\fR (which supports LAM MPI, but specify "none" instead and let -LAM MPI select the plugin using an option of the srun command), \fBmpichgm\fR, \fBmvapich\fR, -\fBopenmpi\fR (which supports Open MPI, but specify "none" instead and let -Open MPI select the plugin using an option of the srun command), and -\fBnone\fR (default, which works for many other versions of MPI). +\fBnone\fR (default, which works for many other versions of MPI including +LAM MPI and Open MPI). .TP \fBMessageTimeout\fR