Merge pull request #3173 from SteVwonder/fix-spectrum

shell: fix Spectrum 2020.06 bootstrap
flux-framework · Aug 29, 2020 · babd275 · babd275
2 parents e31fab0 + 12a3536
commit babd275
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/shell/lua.d/spectrum.lua b/src/shell/lua.d/spectrum.lua
@@ -77,6 +77,8 @@ plugin.register {
             -- Approximately `ulimit -Ss 10240`
             -- Used to silence IBM MCM warnings
             setrlimit ("stack", 10485760)
+            local rank = task.info.rank
+            task.setenv ("OMPI_COMM_WORLD_RANK", rank)
             end
         }
     }

diff --git a/t/t3001-mpi-personalities.t b/t/t3001-mpi-personalities.t
@@ -60,4 +60,14 @@ test_expect_success NO_ASAN,HAVE_JQ "spectrum mpi only enabled with option" '
   grep /opt/ibm/spectrum spectrum.out
 '
 
+test_expect_success HAVE_JQ 'spectrum mpi sets OMPI_COMM_WORLD_RANK' '
+  flux jobspec srun -n${SIZE} -N${SIZE} printenv OMPI_COMM_WORLD_RANK \
+    | jq ".attributes.system.shell.options.mpi = \"spectrum\"" > j.spectrum &&
+  jobid=$(flux job submit j.spectrum) &&
+  flux job attach ${jobid} | sort -n > spectrum.rank.out &&
+  test_debug "cat spectrum.rank.out" &&
+  printf "0\n1\n2\n3\n" > spectrum.rank.expected &&
+  test_cmp spectrum.rank.expected spectrum.rank.out
+'
+
 test_done