Commit 5786fc55 authored by cyrush's avatar cyrush
Browse files

merge from rc (graph.llnl.gov: host profiles and ppn/msub hack)

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@8884 18c085ea-50e0-402c-830e-de6fd14e8384
parent 690a6fcd
......@@ -524,6 +524,10 @@ $0 = shift @ARGV;
# Do not set PYTHONPATH and PYTHONHOME if VisIt install does not contain
# "private" Python version.
#
# Cyrus Harrison,Thu Nov 5 15:05:16 PST 2009
# Added hack to make sure msub never sees the "ppn" argument on LLNL's
# graph cluster.
#
###############################################################################
use POSIX qw(ceil);
......@@ -1564,6 +1568,16 @@ if ($host =~ /^yana\d+$/ or $host =~ /^hopi\d+$/)
$UseTTC = 1;
}
# ----
# HACK for graph @ LLNL
#
# ----
$UsePPN = 1;
if ($host =~ /^graph\d+$/)
{
$UsePPN = 0;
}
# ----
# HACK for Eureka @ Argonne
# ----
......@@ -2596,7 +2610,8 @@ if ($procs_set or ($parallel and $parlaunch_set))
if ( $IsRunningOnJaguarCNL_ORNL ) {$qsubNumNodeStr = "size";}
elsif ( $IsRunningOnLens_ORNL ) {$qsubPPNStr = "ppn";}
if ( $use_vis ) { push @parcmd, "-l", "$qsubNumNodeStr=$nodes$qsubSeparator$qsubPPNStr=$ppn:vis";}
else { push @parcmd, "-l", "$qsubNumNodeStr=$nodes$qsubSeparator$qsubPPNStr=$ppn"; }
elsif ( $UsePPN ) { push @parcmd, "-l", "$qsubNumNodeStr=$nodes$qsubSeparator$qsubPPNStr=$ppn"; }
else { push @parcmd, "-l", "$qsubNumNodeStr=$nodes"; }
}
# command-line time fails on TACC machines, must be set in the TFILE, above
......
......@@ -185,9 +185,30 @@
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">pbatch</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">240m</Field>
<Field name="timeLimit" type="string">60:00</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">msub</Field>
<Field name="launchMethod" type="string">msub/srun</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">bdivp</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" </Field>
<Field name="parallel" type="bool">true</Field>
<Field name="hostAliases" type="string">graph#.llnl.gov graph##.llnl.gov graph###.llnl.gov graph# graph## graph###</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">parallel views</Field>
<Field name="host" type="string">graph.llnl.gov</Field>
<Field name="numProcessors" type="int">240</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">10</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">views</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">60:00</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">bdivp</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">msub/srun</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" </Field>
<Field name="parallel" type="bool">true</Field>
......
......@@ -182,7 +182,6 @@
<Field name="host" type="string">graph.llnl.gov</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" </Field>
<Field name="hostAliases" type="string">graph#.llnl.gov graph##.llnl.gov graph###.llnl.gov graph# graph## graph###</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">parallel pbatch</Field>
......@@ -193,14 +192,34 @@
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">pbatch</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">240m</Field>
<Field name="timeLimit" type="string">60:00</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">msub</Field>
<Field name="launchMethod" type="string">msub/srun</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">bdivp</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" </Field>
<Field name="parallel" type="bool">true</Field>
<Field name="hostAliases" type="string">graph#.llnl.gov graph##.llnl.gov graph###.llnl.gov graph# graph## graph###</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">parallel views</Field>
<Field name="host" type="string">graph.llnl.gov</Field>
<Field name="numProcessors" type="int">240</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">10</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">views</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">60:00</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">bdivp</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">msub/srun</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" </Field>
<Field name="parallel" type="bool">true</Field>
<Field name="hostAliases" type="string">graph#.llnl.gov graph##.llnl.gov graph###.llnl.gov graph# graph## graph###</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">serial</Field>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment