Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions contrib/scaling/scaling.pl
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
my @options = ("", "", "", "-mca mpi_add_procs_cutoff 0 -mca pmix_base_async_modex 1", "-mca mpi_add_procs_cutoff 0 -mca pmix_base_async_modex 1 -mca async_mpi_init 1 -mca async_mpi_finalize 1");
my @starterlist = qw(mpirun prun srun aprun);
my @starteroptionlist = (" --novm",
"",
" --system-server-only",
" --distribution=cyclic --ntasks-per-node=",
" -N");

Expand Down Expand Up @@ -267,7 +267,7 @@ ()
# if we are going to use the dvm, then we
if ($starter eq "prun") {
# need to start it
$cmd = "orte-dvm -mca pmix_system_server 1 2>&1 &";
$cmd = "orte-dvm --system_server 2>&1 &";
if ($myresults) {
print FILE "\n\n$cmd\n";
}
Expand Down Expand Up @@ -341,7 +341,7 @@ ()
}
if ($havedvm) {
if (!$SHOWME) {
$cmd = "prun --terminate";
$cmd = "prun --system-server-only --terminate";
system($cmd);
}
$havedvm = 0;
Expand Down
6 changes: 4 additions & 2 deletions orte/orted/pmix/pmix_server.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,10 @@ int pmix_server_init(void)
}

/* if requested, tell the server to drop a system-level
* PMIx connection point */
if (orte_pmix_server_globals.system_server) {
* PMIx connection point - only do this for the HNP as, in
* at least one case, a daemon can be colocated with the
* HNP and would overwrite the server rendezvous file */
if (orte_pmix_server_globals.system_server && ORTE_PROC_IS_HNP) {
kv = OBJ_NEW(opal_value_t);
kv->key = strdup(OPAL_PMIX_SERVER_SYSTEM_SUPPORT);
kv->type = OPAL_BOOL;
Expand Down