Commit e4870ac0 authored by ghweber's avatar ghweber

Merged 1.12RC changes into trunk: Updates for Franklin. Pixie file format...

Merged 1.12RC changes into trunk: Updates for Franklin. Pixie file format ignore Vizschema files. build_visit use version of cmake in install dir not build dir.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7895 18c085ea-50e0-402c-830e-de6fd14e8384
parent 93fa436c
......@@ -505,6 +505,15 @@ $0 = shift @ARGV;
#
# Mark C. Miller, Wed Jul 8 16:52:17 PDT 2009
# Alter fix applied above for pwd to use getcwd() instead of $ENV{PWD}.
#
# Gunther H. Weber, Wed Jul 15 17:09:34 PDT 2009
# Modifications for Franklin: Explictly add path to qsub since otherwise it
# will not be found when using Windows version of VisIt as front end. Only
# add number of nodes option to qsub/aprun when the user specifies number of
# nodes in the host profile. Change batch job directory to user's scratch to
# ensure that current directory is visible to compute nodes making it
# possible to write log files etc. from compute nodes.
#
###############################################################################
use POSIX qw(ceil);
......@@ -1524,6 +1533,14 @@ if ( $host =~ /^nid/ )
"/opt/xt-libc/2.1.41HD/amd64/lib",
"/opt/torque/2.3.4-200809011357/lib",
"/opt/moab/5.2.4-s11143/lib");
if ($ENV{PATH} eq "")
{
$ENV{PATH} = "/opt/torque/2.3.4-200809011357/bin";
}
else
{
$ENV{PATH} = join ':' , ("$ENV{PATH}","/opt/torque/2.3.4-200809011357/bin");
}
}
}
......@@ -2360,7 +2377,15 @@ 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";
if ($IsRunningOnFranklinNERSC)
{
# Need a location visible from compute nodes
$cdcmd = "cd /scratch/scratchdirs/$ENV{USER}\n";
}
else
{
$cdcmd = "cd $cwd\n";
}
$limitcmd = "ulimit -c 0\n";
if ($sublauncher eq "mpiexec")
......@@ -2540,18 +2565,20 @@ if ($procs_set or ($parallel and $parlaunch_set))
}
push @parcmd, "-pe", "${tacc_way}way", $tacc_procs;
}
elsif ($IsRunningOnFranklinNERSC)
{
push @parcmd, "-l", "mppwidth=$procs";
if ($nodes_set) {
push @parcmd, "-l", "mppnppn=$nodes";
}
}
else
{
$qsubNumNodeStr = "nodes";
$qsubPPNStr = "ppn";
$qsubSeparator = ":";
if ( $IsRunningOnJaguarCNL_ORNL ) {$qsubNumNodeStr = "size";}
if ( $IsRunningOnFranklinNERSC ) {
$qsubNumNodeStr = "mppwidth";
$qsubPPNStr = "mppnppn";
$qsubSeparator = ",";
}
if ( $IsRunningOnLens_ORNL ) {$qsubPPNStr = "ppn";}
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"; }
}
......
......@@ -42,10 +42,10 @@ PYVERSION=python2.5
##
CC="gcc"
CXX="g++"
CFLAGS="-march=barcelona -fPIC -I/opt/mpt/3.0.2/xt/mpich2-gnu/include -DMPICH_IGNORE_CXX_SEEK $CFLAGS"
CXXFLAGS="-march=barcelona -fPIC -I/opt/mpt/3.0.2/xt/mpich2-gnu/include -DMPICH_IGNORE_CXX_SEEK $CXXFLAGS"
CFLAGS="-march=barcelona -fPIC -I/opt/mpt/default/xt/mpich2-gnu/include -DMPICH_IGNORE_CXX_SEEK $CFLAGS"
CXXFLAGS="-march=barcelona -fPIC -I/opt/mpt/default/xt/mpich2-gnu/include -DMPICH_IGNORE_CXX_SEEK $CXXFLAGS"
# Get these via CC -v
MPI_LIBS="-L/opt/xt-service/2.1.41HD/lib/snos64 /opt/mpt/3.0.2/xt/mpich2-gnu/lib/libmpich.a /opt/mpt/3.0.2/xt/pmi/lib/libpmi.a /opt/mpt/3.0.2/xt/util/lib/libalpslli.a /opt/mpt/3.0.2/xt/util/lib/libalpsutil.a -lportals -lpthread"
MPI_LIBS="/opt/mpt/default/xt/mpich2-gnu/lib/libmpich.a /opt/mpt/default/xt/pmi/lib/libpmi.a /opt/mpt/default/xt/util/lib/libalpslli.a /opt/mpt/default/xt/util/lib/libalpsutil.a /opt/xt-service/default/lib/snos64/libportals.a -lpthread"
##
## Database reader plugin support libraries
......
......@@ -321,6 +321,16 @@ avtPixieFileFormat::Initialize()
EXCEPTION1(InvalidDBTypeException,
"Cannot be a Pixie file because it looks like a VizSchema file.");
}
hid_t vsVsVersion = H5Aopen_name(runInfo, "vsVsVersion");
if (vsVsVersion >= 0)
{
H5Aclose(vsVsVersion);
H5Gclose(runInfo);
EXCEPTION1(InvalidDBTypeException,
"Cannot be a Pixie file because it looks like a VizSchema file.");
}
hid_t software = H5Aopen_name(runInfo, "software");
hid_t version = H5Aopen_name(runInfo, "version");
H5Gclose(runInfo);
......
......@@ -3446,7 +3446,7 @@ function build_vtk
#
info "Executing CMake on VTK"
cd $VTK_BUILD_DIR || error "Can't cd to VTK build dir."
CMAKE_BIN=../${CMAKE_BUILD_DIR}/bin/cmake
CMAKE_BIN=${CMAKE_INSTALL}/cmake
if [[ "$OPSYS" == "Darwin" ]]; then
${CMAKE_BIN} \
-DBUILD_SHARED_LIBS:BOOL=ON\
......
......@@ -39,7 +39,7 @@ visitExecDir = visitDir + "/current/linux-x86_64"
execName = visitExecDir + "/bin/engine_par"
pluginNameList = glob.glob(visitExecDir + "/plugins/*/*.so")
# Change this to the Lustre mount point on you machine
lustrePrefix = "/scratch/scratchdirs"
lustrePrefix = "/scratch2"
# Check if the VisIt parallel engine executable exists
if not os.access(execName, os.X_OK):
......@@ -51,18 +51,26 @@ libList = [ execName ] + pluginNameList
# Examine dependencies
for lib in libList:
print "Examining dependencies for " + lib
lddOut = os.popen("ldd %s" % lib)
lddOut = os.popen("env LD_LIBRARY_PATH=%s ldd %s" % (os.environ["LD_LIBRARY_PATH"]+":"+visitExecDir+"/lib", lib))
for line in lddOut.readlines():
if line.strip() != "statically linked":
(libname, sep, libpath, addr) = line.strip().split()
if sep != "=>":
sys.exit("Error: Unexpected separator %s!" % sep)
elif not os.access(libpath, os.R_OK):
sys.exit("Error: File %s is not readable!" % libpath)
if len(line.strip().split()) == 4:
(libname, sep, libpath, addr) = line.strip().split()
if sep != "=>":
sys.exit("Error: Unexpected separator %s!" % sep)
else:
if not libpath in libList:
print "Adding " + libpath + " to library list."
libList.append(libpath)
(libpath, addr) = line.strip().split()
if libpath != "not":
if not os.access(libpath, os.R_OK):
sys.exit("Error: File \"%s\" is not readable!" % libpath)
else:
if not libpath in libList:
print "Adding " + libpath + " to library list."
libList.append(libpath)
else:
print "Couldn't parse library location in ldd output!"
print "Offending line: %s" % (line.strip())
sys.exit()
# Create direcotory for system libraties and copy all
# libraries that are not on Lustre into it. (Note: Copying
......@@ -77,10 +85,17 @@ for lib in libList:
else:
print "Skipping lib " + lib
# Copy env command
print "Copying env command"
os.system("cp /usr/bin/env " + visitExecDir + "/bin/")
# Change permissions
print "Changing permissions"
os.system("chmod -R a+rX " + visitExecDir + "/system_libs/")
os.system("chmod -R a+rX " + visitExecDir + "/bin/env")
# The following is franklin.nersc.gov specific. Make VisIt install
# also writable by TechX
# also writable by USG
os.system("chmod -R g+w " + visitExecDir + "/system_libs/")
os.system("chgrp -R facets " + visitExecDir + "/system_libs/")
os.system("chmod -R g+w " + visitExecDir + "/bin/env")
os.system("chgrp -R usg " + visitExecDir + "/system_libs/")
os.system("chgrp -R usg " + visitExecDir + "/bin/env")
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