Commit 5afb473c authored by hrchilds's avatar hrchilds

Update from February 15, 2007

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@811 18c085ea-50e0-402c-830e-de6fd14e8384
parent 0bd91576
......@@ -150,8 +150,14 @@ $0 = shift @ARGV;
# Made GDB only set paths to the main program source directory
# for the executable being launched.
#
# Eric Brugger, Thu Feb 15 12:35:04 PST 2007
# Added support for passing additional sublauncher arguments. Enhanced
# the qsub launch method to support qsub/mpiexec and qsub/srun. Corrected
# several qsub errors.
#
###############################################################################
use POSIX qw(ceil);
# -----------------------------------------------------------------------------
# Setup
......@@ -273,6 +279,7 @@ $fullusage = "$usage
-l <method> Launch in parallel using the given method.
-pl <method> Launch only the engine in parallel as specified.
-la <args> Additional arguments for the parallel launcher.
-sla <args> Additional arguments for the parallel sublauncher.
-np <# procs> The number of processors to use.
-nn <# nodes> The number of nodes to allocate.
-p <part> Partition to run in.
......@@ -478,6 +485,7 @@ while (scalar(@ARGV) > 0) {
elsif ($arg eq "-l") { $launch=shift; $launch_set=1; }
elsif ($arg eq "-pl") { $parlaunch=shift; $parlaunch_set=1; }
elsif ($arg eq "-la") { $_=shift; @launchargs=split; $launchargs_set=1; }
elsif ($arg eq "-sla") { $_=shift; @sublaunchargs=split; $sublaunchargs_set=1; }
elsif ($arg eq "-n" ) { $name = shift; $name_set = 1; }
elsif ($arg eq "-p" ) { $part = shift; $part_set = 1; }
elsif ($arg eq "-b" ) { $bank = shift; $bank_set = 1; }
......@@ -1229,13 +1237,15 @@ if ($procs_set or ($parallel and $parlaunch_set))
{
($psubcmd, $sublauncher) = split /\W+/, substr($launch,4);
$sublauncher = "" if (!defined $sublauncher);
$sublauncherargs = "";
$sublauncherargs = "$sublaunchargs $sublauncherargs" if $sublaunchargs_set;
if ($sublauncher eq "srun" and $procs_set)
{
$sublauncherargs = "-n $procs";
$sublauncherargs = "$sublauncherargs -n $procs";
}
elsif ($sublauncher eq "mpirun" and $procs_set)
{
$sublauncherargs = "-np $procs";
$sublauncherargs = "$sublauncherargs -np $procs";
}
if (grep(/csh/, "$ENV{SHELL}"))
......@@ -1289,6 +1299,7 @@ if ($procs_set or ($parallel and $parlaunch_set))
push @parcmd, "-q", $part if $part_set;
push @parcmd, "-W" , $time if $time_set;
push @parcmd, $sublauncher;
push @parcmd, $sublaunchargs if $sublaunchargs_set;
push @parcmd, @visitcmd;
@printcmd = @parcmd;
push @printcmd, ("\"".(pop @printcmd)."\"");
......@@ -1308,6 +1319,8 @@ if ($procs_set or ($parallel and $parlaunch_set))
# qsub
elsif (substr($launch,0,4) eq "qsub")
{
($psubcmd, $sublauncher) = split /\W+/, substr($launch,4);
$sublauncher = "" if (!defined $sublauncher);
chomp($tdate = `date | cut -c 12-19`);
chomp($tuser = `whoami`);
$tfilename = "/tmp/visit.$tuser.$tdate";
......@@ -1318,21 +1331,38 @@ if ($procs_set or ($parallel and $parlaunch_set))
if ($security_key_set) { push @visitcmd, "-key", $security_key; }
push @visitcmd, @post_args;
$cdcmd = "cd $cwd\n";
$libcmd = "setenv LIBPATH $ENV{LIBPATH}\n";
$ldlibcmd = "setenv LD_LIBRARY_PATH $ENV{LD_LIBRARY_PATH}\n";
$plugincmd = "setenv VISITPLUGINDIR $ENV{VISITPLUGINDIR}\n";
$mpicmd = "mpiexec -np $procs -pernode @visitcmd\n";
if ($sublauncher eq "mpiexec")
{
@mpicmd = ("mpiexec");
push @mpicmd, @sublaunchargs if $sublaunchargs_set;
push @mpicmd, "-n", $procs if $procs_set;
push @mpicmd, "@visitcmd\n";
}
elsif ($sublauncher eq "srun")
{
@mpicmd = ("srun");
push @mpicmd, @launchargs if $launchargs_set;
push @mpicmd, "-n", $procs if $procs_set;
push @mpicmd, "@visitcmd\n";
}
print TFILE "#!/bin/tcsh\n";
print TFILE $cdcmd;
print TFILE $libcmd;
print TFILE $ldlibcmd;
print TFILE $plugincmd;
print TFILE $mpicmd;
print TFILE "@mpicmd";
close(TFILE);
@parcmd = ("qsub");
push @parcmd, @launchargs if $launchargs_set;
push @parcmd, "-l nodes=$procs:ppn=2:vis" if $procs_set;
$nodes = $procs if (!$nodes_set);
$ppn = ceil($procs / $nodes);
push @parcmd, "-l nodes=$nodes:ppn=$ppn";
if ($time_set)
{
$wtime = $time*60;
......@@ -1342,10 +1372,11 @@ if ($procs_set or ($parallel and $parlaunch_set))
@printcmd = @parcmd;
push @parcmd, $tfilename;
push @printcmd, $cdcmd;
push @printcmd, $libcmd;
push @printcmd, $ldlibcmd;
push @printcmd, $plugincmd;
push @printcmd, $mpicmd;
push @printcmd, @mpicmd;
push @printcmd, ("\"".(pop @printcmd)."\"");
}
}
......
......@@ -57,6 +57,7 @@ pengra_icc=true
thunder=true
prism=true
yana=true
xchem=true
davinci=true
dist=undefined
......@@ -80,6 +81,7 @@ do
thunder=false
prism=false
yana=false
xchem=false
davinci=false
shift
;;
......@@ -163,6 +165,14 @@ do
yana=true
shift
;;
-xchem)
xchem=false
shift
;;
+xchem)
xchem=true
shift
;;
-davinci)
davinci=false
shift
......@@ -700,6 +710,60 @@ then
fi
fi
#
# Build on xchem.
#
rm -f xchem
cat <<EOF > xchem
#!/bin/sh
PATH=/usr/X11R6/bin:\$PATH
if test ! -d tmp ; then
mkdir tmp
fi
if test ! -d tmp/$user ; then
mkdir tmp/$user
fi
if test ! -d tmp/$user/xchem ; then
mkdir tmp/$user/xchem
fi
rm -rf tmp/$user/xchem/visitbuild
mkdir tmp/$user/xchem/visitbuild
mv xchem_$dist.tar.gz tmp/$user/xchem/visitbuild/$dist.tar.gz
cd tmp/$user/xchem/visitbuild
gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist
ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 ./configure --enable-parallel --enable-visitmodule >> ../buildlog 2>&1
make -j 3 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.linux-x86_64.tar.gz ..
cd ..
rm -f resultlog
echo " build of visit on xchem" > resultlog 2>&1
echo " -------------------------" >> resultlog 2>&1
echo "" >> resultlog 2>&1
ls -l >> resultlog 2>&1
echo "" >> resultlog 2>&1
echo "number of database plugins = "\`ls $dist/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
echo "number of operator plugins = "\`ls $dist/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
echo "number of plot plugins = "\`ls $dist/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
echo "" >> resultlog 2>&1
echo "The database plugins:" >> resultlog 2>&1
ls $dist/plugins/databases/libI* | sed "s/$dist\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
mail $emailName < resultlog
EOF
if [ $xchem = true ]
then
if [ $test = no ]
then
scp xchem xchem:xchem_buildit
scp $dist.tar.gz xchem:xchem_$dist.tar.gz
ssh xchem "chmod 750 xchem_buildit;./xchem_buildit" &
fi
fi
#
# Build on davinci.
#
......@@ -746,5 +810,5 @@ fi
#
if [ $test = no ]
then
rm -f hoth sunspot quad berg up pengra pengra_icc thunder prism yana davinci
rm -f hoth sunspot quad berg up pengra pengra_icc thunder prism yana xchem davinci
fi
......@@ -148,7 +148,11 @@
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">7200</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">qsub</Field>
<Field name="launchMethod" type="string">qsub/mpiexec</Field>
<Field name="launchArgsSet" type="bool">true</Field>
<Field name="launchArgs" type="string">-l vis</Field>
<Field name="sublaunchArgsSet" type="bool">true</Field>
<Field name="sublaunchArgs" type="string">-pernode</Field>
<Field name="active" type="bool">false</Field>
<Field name="parallel" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/projects/llnl/visit" </Field>
......
......@@ -154,7 +154,11 @@
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">7200</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">qsub</Field>
<Field name="launchMethod" type="string">qsub/mpiexec</Field>
<Field name="launchArgsSet" type="bool">true</Field>
<Field name="launchArgs" type="string">-l vis</Field>
<Field name="sublaunchArgsSet" type="bool">true</Field>
<Field name="sublaunchArgs" type="string">-pernode</Field>
<Field name="active" type="bool">false</Field>
<Field name="parallel" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/projects/llnl/visit" </Field>
......
......@@ -591,6 +591,50 @@
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="parallel" type="bool">true</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">xchem.llnl.gov</Field>
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">1</Field>
<Field name="numNodesSet" type="bool">false</Field>
<Field name="numNodes" type="int">0</Field>
<Field name="partitionSet" type="bool">false</Field>
<Field name="partition" type="string"></Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string"></Field>
<Field name="timeLimitSet" type="bool">false</Field>
<Field name="timeLimit" type="string"></Field>
<Field name="launchMethodSet" type="bool">false</Field>
<Field name="launchMethod" type="string"></Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/opt/llnl/visit"</Field>
<Field name="parallel" type="bool">false</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">parallel</Field>
<Field name="host" type="string">xchem.llnl.gov</Field>
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">8</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">2</Field>
<Field name="partitionSet" type="bool">false</Field>
<Field name="partition" type="string"></Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string"></Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">30m</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">qsub/mpiexec</Field>
<Field name="sublaunchArgsSet" type="bool">true</Field>
<Field name="sublaunchArgs" type="string">--comm=pmi</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit"</Field>
<Field name="parallel" type="bool">true</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">yana.llnl.gov</Field>
......
......@@ -619,6 +619,52 @@ isit" "-switch" "ib" </Field>
<Field name="parallel" type="bool">true</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">xchem.llnl.gov</Field>
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">1</Field>
<Field name="numNodesSet" type="bool">false</Field>
<Field name="numNodes" type="int">0</Field>
<Field name="partitionSet" type="bool">false</Field>
<Field name="partition" type="string"></Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string"></Field>
<Field name="timeLimitSet" type="bool">false</Field>
<Field name="timeLimit" type="string"></Field>
<Field name="launchMethodSet" type="bool">false</Field>
<Field name="launchMethod" type="string"></Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/opt/llnl/visit"</Field>
<Field name="parallel" type="bool">false</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">parallel</Field>
<Field name="host" type="string">xchem.llnl.gov</Field>
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">8</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">2</Field>
<Field name="partitionSet" type="bool">false</Field>
<Field name="partition" type="string"></Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string"></Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">30m</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">qsub/mpiexec</Field>
<Field name="sublaunchArgsSet" type="bool">true</Field>
<Field name="sublaunchArgs" type="string">--comm=pmi</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit"</Field>
<Field name="parallel" type="bool">true</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">yana.llnl.gov</Field>
......
......@@ -62,6 +62,7 @@ pengra_icc=true
thunder=true
prism=true
yana=true
xchem=true
davinci=true
ver=undefined
......@@ -86,6 +87,7 @@ do
thunder=false
prism=false
yana=false
xchem=false
davinci=false
shift
;;
......@@ -169,6 +171,14 @@ do
yana=true
shift
;;
-xchem)
xchem=false
shift
;;
+xchem)
xchem=true
shift
;;
-davinci)
davinci=false
shift
......@@ -578,6 +588,42 @@ then
fi
fi
#
# Install on xchem.
#
rm -f xchem
cat <<EOF > xchem
#!/bin/sh
./visit-install -private -c open -b bdivp -gw -l $ver linux-x86_64-fedora4 /opt/llnl/visit > installlog 2>&1
rm -f resultlog
echo " install of visit on xchem" > resultlog 2>&1
echo " ---------------------------" >> resultlog 2>&1
echo "" >> resultlog 2>&1
df -k /opt/llnl/visit >> resultlog 2>&1
echo "" >> resultlog 2>&1
ls -l /opt/llnl/visit/$ver/linux-x86_64/bin >> resultlog 2>&1
echo "" >> resultlog 2>&1
echo "number of database plugins = "\`ls /opt/llnl/visit/$ver/linux-x86_64/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
echo "number of operator plugins = "\`ls /opt/llnl/visit/$ver/linux-x86_64/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
echo "number of plot plugins = "\`ls /opt/llnl/visit/$ver/linux-x86_64/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
echo "" >> resultlog 2>&1
echo "The database plugins:" >> resultlog 2>&1
ls /opt/llnl/visit/$ver/linux-x86_64/plugins/databases/libI* | sed "s/\/opt\/llnl\/visit\/$ver\/linux-x86_64\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
mail $emailName < resultlog
EOF
if [ $xchem = true ]
then
if [ $test = no ]
then
scp xchem:tmp/$user/xchem/visitbuild/visit$ver2.linux-x86_64.tar.gz visit$ver2.linux-x86_64-fedora4.tar.gz
scp visit$ver2.linux-x86_64-fedora4.tar.gz xchem:
scp visit-install xchem:
scp xchem xchem:xchem_install
ssh xchem "chmod 750 xchem_install;./xchem_install"
fi
fi
#
# Install on davinci.
#
......@@ -619,5 +665,5 @@ fi
#
if [ $test = no ]
then
rm -f hoth sunspot quad berg up pengra pengra_icc thunder prism yana davinci
rm -f hoth sunspot quad berg up pengra pengra_icc thunder prism yana xchem davinci
fi
......@@ -313,6 +313,9 @@ RemoteProxyBase::AddArgument(const std::string &arg)
// Hank Childs, Sat Dec 3 20:17:07 PST 2005
// Added argument for hardware acceleration.
//
// Eric Brugger, Thu Feb 15 12:04:45 PST 2007
// Added an argument for passing additional sublauncher arguments.
//
// ****************************************************************************
void
......@@ -397,6 +400,13 @@ RemoteProxyBase::AddProfileArguments(const HostProfile &profile,
AddArgument(profile.GetLaunchArgs());
}
if (profile.GetSublaunchArgsSet() &&
profile.GetSublaunchArgs().length() > 0)
{
AddArgument("-sla");
AddArgument(profile.GetSublaunchArgs());
}
if (profile.GetMachinefileSet() &&
profile.GetMachinefile().length() > 0)
{
......
This diff is collapsed.
......@@ -50,7 +50,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Dec 3 19:08:43 PST 2005
// Creation: Wed Feb 14 11:51:34 PDT 2007
//
// Modifications:
//
......@@ -90,6 +90,7 @@ public:
void SelectLaunchMethod();
void SelectArguments();
void SelectLaunchArgs();
void SelectSublaunchArgs();
void SelectHostAliases();
void SelectManualClientHostName();
void SelectMachinefile();
......@@ -119,6 +120,8 @@ public:
void SetParallel(bool parallel_);
void SetLaunchArgsSet(bool launchArgsSet_);
void SetLaunchArgs(const std::string &launchArgs_);
void SetSublaunchArgsSet(bool sublaunchArgsSet_);
void SetSublaunchArgs(const std::string &sublaunchArgs_);
void SetHostAliases(const std::string &hostAliases_);
void SetShareOneBatchJob(bool shareOneBatchJob_);
void SetSshPortSpecified(bool sshPortSpecified_);
......@@ -166,6 +169,9 @@ public:
bool GetLaunchArgsSet() const;
const std::string &GetLaunchArgs() const;
std::string &GetLaunchArgs();
bool GetSublaunchArgsSet() const;
const std::string &GetSublaunchArgs() const;
std::string &GetSublaunchArgs();
const std::string &GetHostAliases() const;
std::string &GetHostAliases();
bool GetShareOneBatchJob() const;
......@@ -234,6 +240,8 @@ private:
bool parallel;
bool launchArgsSet;
std::string launchArgs;
bool sublaunchArgsSet;
std::string sublaunchArgs;
std::string hostAliases;
bool shareOneBatchJob;
bool sshPortSpecified;
......
......@@ -65,6 +65,11 @@
</Field>
<Field name="launchArgs" label="launchArgs" type="string">
</Field>
<Field name="sublaunchArgsSet" label="sublaunchArgsSet" type="bool">
false
</Field>
<Field name="sublaunchArgs" label="sublaunchArgs" type="string">
</Field>
<Field name="hostAliases" label="hostAliases" type="string">
</Field>
<Field name="shareOneBatchJob" label="shareOneBatchJob" type="bool">
......
##
## Set the VISITHOME environment variable.
##
VISITHOME=/opt/llnl/visit
##
## If MESA is not set, use VisIt's mesa.
##
if test -z "$MESA"; then
MESA=$VISITHOME/mesa/5.0/linux_fedora4_gcc_4.0.2
fi
##
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/5.0.0b/linux_fedora4_gcc_4.0.2
fi
##
## If QT is not set, use VisIt's Qt.
##
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/linux_fedora4_gcc_4.0.2/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_fedora4_gcc_4.0.2/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/linux_fedora4_gcc_4.0.2/lib
fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/2.5/linux_fedora4_gcc_4.0.2
PYVERSION=python2.5
##
## Add parallel arguments.
##
CXXFLAGS="-I/opt/llnl/mpich2_shared/ch3-ssm/include -fPIC $CXXFLAGS"
CXXFLAGS="-DMPICH_IGNORE_CXX_SEEK $CXXFLAGS"
CFLAGS="-fPIC $CFLAGS"
MPI_LIBS="-L/opt/llnl/mpich2_shared/ch3-ssm/lib -Wl,-rpath=/opt/llnl/mpich2_shared/ch3-ssm/lib -lmpich -lrt"
LDFLAGS=-Wl,-rpath=/usr/lib64/tls
##
## Turn off warnings for deprecated features on g++
##
CXXFLAGS="-Wno-deprecated $CXXFLAGS"
##
## Database reader plugin support libraries
##
###############################################################################
##
## Boxlib
##
##DEFAULT_BOXLIB2D_INCLUDE=$VISITHOME/boxlib/linux_fedora4_gcc_4.0.2/include/2D
##DEFAULT_BOXLIB2D_LIBS=$VISITHOME/boxlib/linux_fedora4_gcc_4.0.2/lib
##DEFAULT_BOXLIB3D_INCLUDE=$VISITHOME/boxlib/linux_fedora4_gcc_4.0.2/include/3D
##DEFAULT_BOXLIB3D_LIBS=$VISITHOME/boxlib/linux_fedora4_gcc_4.0.2/lib
##
## CFITSIO
##
DEFAULT_CFITSIO_INCLUDE=$VISITHOME/cfitsio/3006/linux_fedora4_gcc_4.0.2/include
DEFAULT_CFITSIO_LIB=$VISITHOME/cfitsio/3006/linux_fedora4_gcc_4.0.2/lib
##
## CGNS
##
DEFAULT_CGNS_INCLUDE=$VISITHOME/cgns/2.4/linux_fedora4_gcc_4.0.2/include
DEFAULT_CGNS_LIB=$VISITHOME/cgns/2.4/linux_fedora4_gcc_4.0.2/lib
##
## HDF4
##
DEFAULT_HDF4_FLAGS=$VISITHOME/hdf4/2.4.1/linux_fedora4_gcc_4.0.2/include
DEFAULT_HDF4_LIBS=$VISITHOME/hdf4/2.4.1/linux_fedora4_gcc_4.0.2/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=$VISITHOME/hdf5/1.6.5/linux_fedora4_gcc_4.0.2/include
DEFAULT_HDF5_LIB=$VISITHOME/hdf5/1.6.5/linux_fedora4_gcc_4.0.2/lib
##
## netCDF
##
DEFAULT_NETCDF_INCLUDE=$VISITHOME/netcdf/3.6.0/linux_fedora4_gcc_4.0.2/include
DEFAULT_NETCDF_LIB=$VISITHOME/netcdf/3.6.0/linux_fedora4_gcc_4.0.2/lib
##
## Silo
##
DEFAULT_SILO_INCLUDES=$VISITHOME/silo/4.5.1/linux_fedora4_gcc_4.0.2/include
DEFAULT_SILO_LIBRARY=$VISITHOME/silo/4.5.1/linux_fedora4_gcc_4.0.2/lib
......@@ -216,6 +216,10 @@ QvisHostProfileWindow::~QvisHostProfileWindow()
// Eric Brugger, Tue Nov 28 13:48:04 PST 2006
// Added a psub/mpirun launch option.
//
// Eric Brugger, Thu Feb 15 12:14:34 PST 2007
// Added support for additional sublauncher arguments. Replaced the qsub
// launch option with qsub/mpiexec and qsub/srun.
//
// ****************************************************************************
void
QvisHostProfileWindow::CreateWindowContents()
......@@ -354,7 +358,8 @@ QvisHostProfileWindow::CreateWindowContents()
launchMethod->insertItem("yod");
launchMethod->insertItem("dmpirun");
launchMethod->insertItem("bsub");
launchMethod->insertItem("qsub");
launchMethod->insertItem("qsub/mpiexec");
launchMethod->insertItem("qsub/srun");
connect(launchMethod, SIGNAL(activated(const QString &)),
this, SLOT(launchMethodChanged(const QString &)));
launchCheckBox = new QCheckBox("Parallel launch method",
......@@ -376,6 +381,17 @@ QvisHostProfileWindow::CreateWindowContents()
parLayout->addMultiCellWidget(launchArgs, prow, prow, 2, 3);
prow++;
sublaunchArgs = new QLineEdit(parGroup, "sublaunchArgs");
connect(sublaunchArgs, SIGNAL(returnPressed()),
this, SLOT(processSublaunchArgsText()));
sublaunchArgsCheckBox = new QCheckBox("Additional sublauncher arguments",
parGroup, "sublaunchArgsLabel");
connect(sublaunchArgsCheckBox, SIGNAL(toggled(bool)),
this, SLOT(toggleSublaunchArgs(bool)));
parLayout->addMultiCellWidget(sublaunchArgsCheckBox, prow, prow, 0, 1);
parLayout->addMultiCellWidget(sublaunchArgs, prow, prow, 2, 3);
prow++;
partitionName = new QLineEdit(parGroup, "partitionName");
connect(partitionName, SIGNAL(returnPressed()),
this, SLOT(processPartitionNameText()));
......@@ -858,6 +874,9 @@ QvisHostProfileWindow::UpdateProfileList()
// Hank Childs, Sat Dec 3 20:55:49 PST 2005
// Added support for new hardware acceleration options.
//
// Eric Brugger, Thu Feb 15 12:14:34 PST 2007
// Added support for additional sublauncher arguments.
//
// ****************************************************************************
void
QvisHostProfileWindow::UpdateActiveProfile()
......@@ -881,6 +900,8 @@ QvisHostProfileWindow::UpdateActiveProfile()
machinefile->blockSignals(true);
launchArgsCheckBox->blockSignals(true);
launchArgs->blockSignals(true);
sublaunchArgsCheckBox->blockSignals(true);
sublaunchArgs->blockSignals(true);
launchCheckBox->blockSignals(true);
launchMethod->blockSignals(true);
activeProfileCheckBox->blockSignals(true);
......@@ -924,6 +945,8 @@ QvisHostProfileWindow::UpdateActiveProfile()
machinefile->setText("");
launchArgsCheckBox->setChecked(false);
launchArgs->setText("");
sublaunchArgsCheckBox->setChecked(false);
sublaunchArgs->setText("");
loadBalancing->setButton(0);
engineArguments->setText("");
activeProfileCheckBox->setChecked(false);
......@@ -979,6 +1002,11 @@ QvisHostProfileWindow::UpdateActiveProfile()
launchArgs->setText(current.GetLaunchArgs().c_str());
else
launchArgs->setText("");
sublaunchArgsCheckBox->setChecked(parEnabled && current.GetSublaunchArgsSet());
if (parEnabled && current.GetSublaunchArgsSet())
sublaunchArgs->setText(current.GetSublaunchArgs().c_str());
else
sublaunchArgs->setText("");
if (parEnabled)
numProcessors->setValue(current.GetNumProcessors());
else
......@@ -1071,6 +1099,8 @@ QvisHostProfileWindow::UpdateActiveProfile()
machinefile->blockSignals(false);
launchArgsCheckBox->blockSignals(false);
launchArgs->blockSignals(false);
sublaunchArgsCheckBox->blockSignals(false);
sublaunchArgs->blockSignals(false);
launchCheckBox->blockSignals(false);
launchMethod->blockSignals(false);
activeProfileCheckBox->blockSignals(false);
......@@ -1155,6 +1185,9 @@ QvisHostProfileWindow::ReplaceLocalHost()
// Hank Childs, Sat Dec 3 20:55:49 PST 2005
// Added support for new hardware acceleration options.
//
// Eric Brugger, Thu Feb 15 12:14:34 PST 2007
// Added support for additional sublauncher arguments.
//
// ****************************************************************************
void
......@@ -1185,6 +1218,8 @@ QvisHostProfileWindow::UpdateWindowSensitivity()
launchMethod->setEnabled(parEnabled && current->GetLaunchMethodSet());
launchArgsCheckBox->setEnabled(parEnabled);
launchArgs->setEnabled(parEnabled && current->GetLaunchArgsSet());
sublaunchArgsCheckBox->setEnabled(parEnabled);
sublaunchArgs->setEnabled(parEnabled && current->GetSublaunchArgsSet());
numProcLabel->setEnabled(parEnabled);
numProcessors->setEnabled(parEnabled);
numNodesCheckBox->setEnabled(parEnabled);
......@@ -1281,6 +1316,9 @@ QvisHostProfileWindow::UpdateWindowSensitivity()
// Jeremy Meredith, Thu Sep 15 16:39:35 PDT 2005
// Added machinefile and useVisItScriptForEnv.
//
// Eric Brugger, Thu Feb 15 12:14:34 PST 2007
// Added support for additional sublauncher arguments.
//
// ****************************************************************************
bool
QvisHostProfileWindow::GetCurrentValues(int which_widget)
......@@ -1590,6 +1628,15 @@ QvisHostProfileWindow::GetCurrentValues(int which_widget)
}
widget++;
// Do the sublauncher args
if(current.GetParallel() && (which_widget ==<