Skip to content
Merged
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
28 changes: 23 additions & 5 deletions contrib/scaling/scaling.pl
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
my @tests = qw(/bin/true ./orte_no_op ./mpi_no_op ./mpi_no_op ./mpi_no_op);
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",
my @starteroptionlist = (" --novm",
"",
"--distribution=cyclic -N",
"-N");
" --distribution=cyclic --ntasks-per-node=",
" -N");

# Set to true if the script should merely print the cmds
# it would run, but don't run them
Expand Down Expand Up @@ -130,7 +130,7 @@
push @starteroptions, $opt;
} elsif ($usesrun && $starter eq "srun") {
push @starters, $starter;
$opt = $starteroptionlist[$idx] . " " . $ppn;
$opt = $starteroptionlist[$idx] . $ppn;
push @starteroptions, $opt;
}
}
Expand Down Expand Up @@ -277,6 +277,10 @@ ()
}
# give it a couple of seconds to start
sleep 2;
} else {
if ($myresults) {
print FILE "\n\n";
}
}

if ($myresults) {
Expand All @@ -292,7 +296,15 @@ ()
if (!$SHOWME) {
# pre-position the executable
$cmd = $starter . $starteroptions[$index] . " $test 2>&1";
system($cmd);
my $error;
$error = system($cmd);
if (0 != $error) {
if ($myresults) {
print FILE "Command $cmd returned error $error\n";
$testnum = $testnum + 1;
next;
}
}
}
$n = 1;
while ($n <= $num_nodes) {
Expand Down Expand Up @@ -321,12 +333,18 @@ ()
print "\n--------------------------------------------------\n";
}
$testnum = $testnum + 1;
if ($starter eq "srun" or $starter eq "aprun") {
if ($testnum ge 3) {
last;
}
}
}
if ($havedvm) {
if (!$SHOWME) {
$cmd = "prun --terminate";
system($cmd);
}
$havedvm = 0;
}
$index = $index + 1;
}
Expand Down