From 2d6b96cd480542270affe1e3e5bcf306bb0a38ee Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Tue, 6 Dec 2016 14:25:08 -0700
Subject: [PATCH] Update docs about Slurm not supporting
user_defined_parallelAPI values.
---
doc/html/ibm-pe.shtml | 6 ++++++
src/plugins/launch/poe/launch_poe.c | 9 ++++++++-
src/plugins/switch/nrt/switch_nrt.c | 9 +++++++--
3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/doc/html/ibm-pe.shtml b/doc/html/ibm-pe.shtml
index a472c24a519..942f8cd0d85 100644
--- a/doc/html/ibm-pe.shtml
+++ b/doc/html/ibm-pe.shtml
@@ -70,9 +70,15 @@ SLURM_NETWORK environment variable. Supported network options include:</p>
<li><b>lapi</b> Low-level Application Programming Interface</li>
<li><b>mpi</b> Message Passing Interface (default)</li>
<li><b>pami</b> Parallel Active Message Interface</li>
+ <li><b>pgas</b> Partitioned Global Address Programming</li>
<li><b>shmem</b> OpenSHMEM interface</li>
+ <li><b>test</b> Test Protocol</li>
<li><b>upc</b> Unified Parallel C Interface</li>
+ <br>
+ <b>NOTE:</b> Slurm supports the values listed above, and does not
+ support poe user_defined_parallelAPI values.
</ul>
+
<li>Other options</li>
<ul>
<li><b>bulk_xfer [=<i>resources</i>]</b>
diff --git a/src/plugins/launch/poe/launch_poe.c b/src/plugins/launch/poe/launch_poe.c
index d53043178c5..3e8b53abd87 100644
--- a/src/plugins/launch/poe/launch_poe.c
+++ b/src/plugins/launch/poe/launch_poe.c
@@ -522,7 +522,14 @@ extern int launch_p_create_job_step(srun_job_t *job, bool use_all_cpus,
if (opt.launch_cmd)
xstrfmtcat(poe_cmd_line,
" -euilib us");
- /* protocol options */
+ /* protocol options
+ *
+ * NOTE: Slurm supports the values listed below, and
+ * does not support poe user_defined_parallelAPI
+ * values. If you add to this list please add to
+ * the list in
+ * src/plugins/switch/net/switch_nrt.c
+ */
} else if ((!strncasecmp(token, "lapi", 4)) ||
(!strncasecmp(token, "mpi", 3)) ||
(!strncasecmp(token, "pami", 4)) ||
diff --git a/src/plugins/switch/nrt/switch_nrt.c b/src/plugins/switch/nrt/switch_nrt.c
index d019dceec8e..946f2907f04 100644
--- a/src/plugins/switch/nrt/switch_nrt.c
+++ b/src/plugins/switch/nrt/switch_nrt.c
@@ -586,7 +586,13 @@ extern int switch_p_build_jobinfo(switch_jobinfo_t *switch_job,
} else if (!xstrcasecmp(token, "us")) {
user_space = true;
- /* protocol options */
+ /* protocol options
+ *
+ * NOTE: Slurm supports the values listed below, and
+ * does not support poe user_defined_parallelAPI values.
+ * If you add to this list please add to the list in
+ * src/plugins/launch/poe/launch_poe.c
+ */
} else if ((!strncasecmp(token, "lapi", 4)) ||
(!strncasecmp(token, "mpi", 3)) ||
(!strncasecmp(token, "pami", 4)) ||
@@ -597,7 +603,6 @@ extern int switch_p_build_jobinfo(switch_jobinfo_t *switch_job,
if (protocol)
xstrcat(protocol, ",");
xstrcat(protocol, token);
-
/* adapter options */
} else if (!xstrcasecmp(token, "sn_all")) {
sn_all = true;
--
GitLab