From 843a1257f406c08a1d32f9652ca874bc867d637f Mon Sep 17 00:00:00 2001
From: Artem Polyakov <artpol84@gmail.com>
Date: Tue, 22 Dec 2015 14:44:25 +0600
Subject: [PATCH] Update html documentation with information related to PMIx.

---
 doc/html/configurator.easy.html.in |  2 ++
 doc/html/configurator.html.in      |  2 ++
 doc/html/mpi_guide.shtml           | 10 ++++++++++
 doc/html/mpiplugins.shtml          |  1 +
 4 files changed, 15 insertions(+)

diff --git a/doc/html/configurator.easy.html.in b/doc/html/configurator.easy.html.in
index 6ee31ff228d..5dce02bb5f8 100644
--- a/doc/html/configurator.easy.html.in
+++ b/doc/html/configurator.easy.html.in
@@ -369,6 +369,8 @@ Select one value for <B>MpiDefault</B>:<BR>
 This also works for MVAPICH-SHMEM.<BR>
 <input type="radio" name="mpi_default" value="pmi2"> <B>MPI-PMI2</B>
 (For MPI2 and MVAPICH2)<BR>
+<input type="radio" name="mpi_default" value="pmix"> <B>MPI-PMIx</B>
+(Exascale PMI implementation)<BR>
 <input type="radio" name="mpi_default" value="mvapich"> <B>MVAPICH</B><BR>
 <input type="radio" name="mpi_default" value="none" checked> <B>None</B>:
 +This works for most other MPI types including MPICH2, LAM MPI and Open MPI.<BR>
diff --git a/doc/html/configurator.html.in b/doc/html/configurator.html.in
index dfce5b32805..6887baed5d2 100644
--- a/doc/html/configurator.html.in
+++ b/doc/html/configurator.html.in
@@ -550,6 +550,8 @@ Select one value for <B>MpiDefault</B>:<BR>
 This also works for MVAPICH-SHMEM.<BR>
 <input type="radio" name="mpi_default" value="pmi2"> <B>MPI-PMI2</B>
 (For MPI2 and MVAPICH2)<BR>
+<input type="radio" name="mpi_default" value="pmix"> <B>MPI-PMIx</B>
+(Exascale PMI implementation)<BR>
 <input type="radio" name="mpi_default" value="mvapich"> <B>MVAPICH</B><BR>
 <input type="radio" name="mpi_default" value="none" checked> <B>None</B>:
 +This works for most other MPI types including MPICH2, LAM MPI and Open MPI.<BR>
diff --git a/doc/html/mpi_guide.shtml b/doc/html/mpi_guide.shtml
index e97ba690f08..a58696b7768 100644
--- a/doc/html/mpi_guide.shtml
+++ b/doc/html/mpi_guide.shtml
@@ -64,6 +64,10 @@ the OMPI jobs can be launched directly using the srun command. This is
 the preferred way. If the pmi2 support is enabled then the command line
 options '--mpi=pmi2' has to be specified on the srun command line.
 
+<p>Starting from Open MPI version 2.0 PMIx is natively supported. To launch
+Open MPI application using PMIx the '--mpi=pmix' option has to be
+specified on the srun command line.
+
 <p>
 For older versions of OMPI not compiled with the pmi support
 the system administrator must specify the range of ports to be reserved
@@ -98,6 +102,12 @@ $ salloc -n4 sh   # allocates 4 processors and spawns shell for job
 &gt; srun --mpi=pmi2 -n 4 a.out
 </pre>
 
+<p>or using the pmix support</p>
+
+<pre>
+&gt; srun --mpi=pmix -n 4 a.out
+</pre>
+
 <p>If the ports reserved for a job step are found by the Open MPI library
 to be in use, a message of this form will be printed and the job step
 will be re-launched:<br>
diff --git a/doc/html/mpiplugins.shtml b/doc/html/mpiplugins.shtml
index 7e13047369f..c3600485595 100644
--- a/doc/html/mpiplugins.shtml
+++ b/doc/html/mpiplugins.shtml
@@ -24,6 +24,7 @@ abbreviation for the type of node selection algorithm. We recommend, for example
 <li><b>mvapich</b>&#151;For use with MVAPICH.</li>
 <li><b>openmpi</b>&#151;For use with OpenMPI.</li>
 <li><b>pmi2</b>&#151;For use with MPI2 and MVAPICH2.</li>
+<li><b>pmix</b>&#151;Exascale PMI implementation (currently supported by Open MPI starting from version 2.0)</li>
 <li><b>none</b>&#151;For use with most other versions of MPI.</li>
 </ul>
 <p><span class="commandline">const char plugin_name[]</span><br>
-- 
GitLab