From 32c45974bccbd76791e499983c8a89af1cad97df Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Mon, 21 May 2007 23:42:19 +0000
Subject: [PATCH] validate mpich1_shmem logic
---
doc/html/quickstart.shtml | 6 +++---
src/plugins/mpi/mpich1_shmem/mpich1_shmem.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/html/quickstart.shtml b/doc/html/quickstart.shtml
index 7601c853885..c7ab8b567fb 100644
--- a/doc/html/quickstart.shtml
+++ b/doc/html/quickstart.shtml
@@ -324,8 +324,8 @@ for more information.</p>
<p><a href="http://www-unix.mcs.anl.gov/mpi/mpich1/"><b>MPICH1</b></a>
has several different programming models. If you are using the shared
-memory model (DEFAULT_DEVICE=ch_shmem in the mpirun script), then
-initiated the tasks using the <span class="commandline">srun</span> command
+memory model (<i>DEFAULT_DEVICE=ch_shmem</i> in the mpirun script), then
+initiate the tasks using the <span class="commandline">srun</span> command
with the <i>--mpi=mpich1_shmem</i> option.</p>
<pre>
$ srun -n16 --mpi=mpich1_shmem a.out
@@ -333,7 +333,7 @@ $ srun -n16 --mpi=mpich1_shmem a.out
<p>Other MPICH1 programming models current rely upon the SLURM
<span class="commandline">salloc</span> or
-<span class="commandline">sbatch</span> command to allocate.
+<span class="commandline">sbatch</span> command to allocate resources.
In either case, specify the maximum number of tasks required for the job.
You will then need to build a list of hosts to be used and use that
as an argument to the mpirun command.
diff --git a/src/plugins/mpi/mpich1_shmem/mpich1_shmem.c b/src/plugins/mpi/mpich1_shmem/mpich1_shmem.c
index cadd9e8e035..19bb60d01b4 100644
--- a/src/plugins/mpi/mpich1_shmem/mpich1_shmem.c
+++ b/src/plugins/mpi/mpich1_shmem/mpich1_shmem.c
@@ -83,7 +83,7 @@ int p_mpi_hook_slurmstepd_task(const mpi_plugin_task_info_t *job,
char ***env)
{
debug("Using mpi/mpich1_shmem");
- env_array_overwrite_fmt(env, "MPIRUN_NP", "%u", job->ntasks);
+ env_array_overwrite_fmt(env, "MPICH_NP", "%u", job->ntasks);
return SLURM_SUCCESS;
}
--
GitLab