[cig-commits] r14061 - in long/3D/SNAC/trunk: Snac/VMake Snac/VMake/Config StGermain/VMake StGermain/VMake/Config VMake VMake/Config
echoi at geodynamics.org
echoi at geodynamics.org
Tue Feb 17 12:46:53 PST 2009
Author: echoi
Date: 2009-02-17 12:46:52 -0800 (Tue, 17 Feb 2009)
New Revision: 14061
Modified:
long/3D/SNAC/trunk/Snac/VMake/Config/StGermain-config.sh
long/3D/SNAC/trunk/Snac/VMake/Config/compiler-config.sh
long/3D/SNAC/trunk/Snac/VMake/Config/mpi-config.sh
long/3D/SNAC/trunk/Snac/VMake/configure.sh
long/3D/SNAC/trunk/StGermain/VMake/Config/StGermain-config.sh
long/3D/SNAC/trunk/StGermain/VMake/Config/compiler-config.sh
long/3D/SNAC/trunk/StGermain/VMake/Config/mpi-config.sh
long/3D/SNAC/trunk/StGermain/VMake/configure.sh
long/3D/SNAC/trunk/VMake/Config/StGermain-config.sh
long/3D/SNAC/trunk/VMake/Config/compiler-config.sh
long/3D/SNAC/trunk/VMake/Config/mpi-config.sh
long/3D/SNAC/trunk/VMake/configure.sh
Log:
Added necessary options for ranger at TACC, UT, Austin. Need to be generalized for the class of systems that requires to use mpicc.
Modified: long/3D/SNAC/trunk/Snac/VMake/Config/StGermain-config.sh
===================================================================
--- long/3D/SNAC/trunk/Snac/VMake/Config/StGermain-config.sh 2009-02-17 04:08:52 UTC (rev 14060)
+++ long/3D/SNAC/trunk/Snac/VMake/Config/StGermain-config.sh 2009-02-17 20:46:52 UTC (rev 14061)
@@ -50,6 +50,8 @@
setValueWithDefault STGERMAIN_RPATH '-R ${STGERMAIN_LIBDIR}';;
ibmxl)
setValueWithDefault STGERMAIN_RPATH '-R ${STGERMAIN_LIBDIR}';;
+ mvapich)
+ setValueWithDefault STGERMAIN_RPATH '-Wl,-rpath,${STGERMAIN_LIBDIR}';;
*)
echo "Warning: STGERMAIN_RPATH for C compiler \"${CC_TYPE}\" unknown";;
esac
Modified: long/3D/SNAC/trunk/Snac/VMake/Config/compiler-config.sh
===================================================================
--- long/3D/SNAC/trunk/Snac/VMake/Config/compiler-config.sh 2009-02-17 04:08:52 UTC (rev 14060)
+++ long/3D/SNAC/trunk/Snac/VMake/Config/compiler-config.sh 2009-02-17 20:46:52 UTC (rev 14061)
@@ -36,6 +36,9 @@
sparc)
setValueWithDefault CC_SYMBOLLEVEL '-g'
setValueWithDefault CC_WARNINGLEVEL '';;
+ mvapich)
+ setValueWithDefault CC_SYMBOLLEVEL '-g'
+ setValueWithDefault CC_WARNINGLEVEL '-Minform=inform';;
*)
echo "Warning: CC_WARNINGLEVEL for C compiler \"${CC_TYPE}\" unknown. Please set."
echo "Warning: CC_SYMBOLLEVEL for C compiler \"${CC_TYPE}\" unknown. Please set.";;
Modified: long/3D/SNAC/trunk/Snac/VMake/Config/mpi-config.sh
===================================================================
--- long/3D/SNAC/trunk/Snac/VMake/Config/mpi-config.sh 2009-02-17 04:08:52 UTC (rev 14060)
+++ long/3D/SNAC/trunk/Snac/VMake/Config/mpi-config.sh 2009-02-17 20:46:52 UTC (rev 14061)
@@ -27,16 +27,21 @@
# Obtain MPI information
case ${SYSTEM} in
Linux|CYGWIN|Darwin|SunOS)
- setValueWithDefault MPI_DIR "/usr/";;
+ setValueWithDefault MPI_DIR "/usr";;
OSF1)
- setValueWithDefault MPI_DIR "/usr/";;
+ setValueWithDefault MPI_DIR "/usr";;
*)
if test "${MPI_DIR}x" = "x" ; then
- echo "Warning: MPI_DIR for system \"${SYSTEM}\" unknown. Set the environment variable."
+ echo "Error: MPI_DIR for system \"${SYSTEM}\" unknown. Set the environment variable."
+ exit 1
fi;;
esac
setValueWithDefault MPI_BINDIR '${MPI_DIR}/bin'
-setValueWithDefault MPI_LIBDIR '${MPI_DIR}/lib'
+if test "${SYSTEM}x" = "rangerx"; then
+ setValueWithDefault MPI_LIBDIR '${MPI_DIR}/lib/shared'
+else
+ setValueWithDefault MPI_LIBDIR '${MPI_DIR}/lib'
+fi
setValueWithDefault MPI_INCDIR '${MPI_DIR}/include'
if test ! "${CC}x" = "mpiccx"; then
setValueWithDefault MPI_INCLUDES '-I${MPI_INCDIR}'
@@ -57,8 +62,8 @@
setValueWithDefault MPI_IMPLEMENTATION open_mpi
elif `grep "MPICH2" ${MPI_INCDIR}/mpi.h > /dev/null 2>&1`; then
setValueWithDefault MPI_IMPLEMENTATION mpich2
-# elif `grep "Argonne National Laboratory" ${MPI_INCDIR}/mpi.h > /dev/null 2>&1`; then
-# setValueWithDefault MPI_IMPLEMENTATION mpich
+ elif `grep "Argonne National Laboratory" ${MPI_INCDIR}/mpi.h > /dev/null 2>&1`; then
+ setValueWithDefault MPI_IMPLEMENTATION mpich
else
setValueWithDefault MPI_IMPLEMENTATION mpich
fi
@@ -150,11 +155,15 @@
setValueWithDefault MPI_RPATH '-R ${MPI_LIBDIR}';;
ibmxl)
setValueWithDefault MPI_RPATH '-R ${MPI_LIBDIR}';;
+ mvapich)
+ setValueWithDefault MPI_RPATH '-Wl,-rpath,${MPI_LIBDIR}';;
*)
echo "Warning: MPI_RPATH for C compiler \"${CC_TYPE}\" unknown";;
esac
case ${SYSTEM} in
+ ranger)
+ setValueWithDefault MPI_LIBS '';;
*)
setValueWithDefault MPI_LIBS '-L${MPI_LIBDIR} ${MPI_LIBFILES}';;
esac
@@ -169,7 +178,7 @@
#fi
case ${SYSTEM} in
- Linux|CYGWIN|Darwin|SunOS)
+ Linux|CYGWIN|Darwin|SunOS|ranger)
setValueWithDefault MPI_RUN_COMMAND 'mpirun';;
OSF1)
setValueWithDefault MPI_RUN_COMMAND 'prun';;
@@ -192,7 +201,7 @@
setValueWithDefault MPI_RUN '${MPI_BINDIR}/${MPI_RUN_COMMAND}'
case ${SYSTEM} in
- Linux|CYGWIN|Darwin|SunOS)
+ Linux|CYGWIN|Darwin|SunOS|ranger)
setValueWithDefault MPI_NPROC '-np';;
OSF1)
setValueWithDefault MPI_NPROC '-n';;
Modified: long/3D/SNAC/trunk/Snac/VMake/configure.sh
===================================================================
--- long/3D/SNAC/trunk/Snac/VMake/configure.sh 2009-02-17 04:08:52 UTC (rev 14060)
+++ long/3D/SNAC/trunk/Snac/VMake/configure.sh 2009-02-17 20:46:52 UTC (rev 14061)
@@ -1090,6 +1090,8 @@
ibmxl)
# theres no good equivalient to -Wall, turn on a few warnings at least
CC_WARNINGLEVEL="-qformat=all -qwarn64";;
+ mvapich)
+ CC_WARNINGLEVEL="-Minform=inform";;
*)
echo "Warning: CC_WARNINGLEVEL for C compiler \"${CC_TYPE}\" unknown. Please set.";;
esac
@@ -1111,6 +1113,8 @@
CC_SYMBOLLEVEL="-g";;
ibmxl)
CC_SYMBOLLEVEL="-g";;
+ mvapich)
+ CC_SYMBOLLEVEL="-g";;
*)
echo "Warning: CC_SYMBOLLEVEL for C compiler \"${CC_TYPE}\" unknown. Please set.";;
esac
Modified: long/3D/SNAC/trunk/StGermain/VMake/Config/StGermain-config.sh
===================================================================
--- long/3D/SNAC/trunk/StGermain/VMake/Config/StGermain-config.sh 2009-02-17 04:08:52 UTC (rev 14060)
+++ long/3D/SNAC/trunk/StGermain/VMake/Config/StGermain-config.sh 2009-02-17 20:46:52 UTC (rev 14061)
@@ -50,6 +50,8 @@
setValueWithDefault STGERMAIN_RPATH '-R ${STGERMAIN_LIBDIR}';;
ibmxl)
setValueWithDefault STGERMAIN_RPATH '-R ${STGERMAIN_LIBDIR}';;
+ mvapich)
+ setValueWithDefault STGERMAIN_RPATH '-Wl,-rpath,${STGERMAIN_LIBDIR}';;
*)
echo "Warning: STGERMAIN_RPATH for C compiler \"${CC_TYPE}\" unknown";;
esac
Modified: long/3D/SNAC/trunk/StGermain/VMake/Config/compiler-config.sh
===================================================================
--- long/3D/SNAC/trunk/StGermain/VMake/Config/compiler-config.sh 2009-02-17 04:08:52 UTC (rev 14060)
+++ long/3D/SNAC/trunk/StGermain/VMake/Config/compiler-config.sh 2009-02-17 20:46:52 UTC (rev 14061)
@@ -36,6 +36,9 @@
sparc)
setValueWithDefault CC_SYMBOLLEVEL '-g'
setValueWithDefault CC_WARNINGLEVEL '';;
+ mvapich)
+ setValueWithDefault CC_SYMBOLLEVEL '-g'
+ setValueWithDefault CC_WARNINGLEVEL '-Minform=inform';;
*)
echo "Warning: CC_WARNINGLEVEL for C compiler \"${CC_TYPE}\" unknown. Please set."
echo "Warning: CC_SYMBOLLEVEL for C compiler \"${CC_TYPE}\" unknown. Please set.";;
Modified: long/3D/SNAC/trunk/StGermain/VMake/Config/mpi-config.sh
===================================================================
--- long/3D/SNAC/trunk/StGermain/VMake/Config/mpi-config.sh 2009-02-17 04:08:52 UTC (rev 14060)
+++ long/3D/SNAC/trunk/StGermain/VMake/Config/mpi-config.sh 2009-02-17 20:46:52 UTC (rev 14061)
@@ -27,16 +27,17 @@
# Obtain MPI information
case ${SYSTEM} in
Linux|CYGWIN|Darwin|SunOS)
- setValueWithDefault MPI_DIR "/usr/";;
+ setValueWithDefault MPI_DIR "/usr";;
OSF1)
- setValueWithDefault MPI_DIR "/usr/";;
+ setValueWithDefault MPI_DIR "/usr";;
*)
if test "${MPI_DIR}x" = "x" ; then
- echo "Warning: MPI_DIR for system \"${SYSTEM}\" unknown. Set the environment variable."
+ echo "Error: MPI_DIR for system \"${SYSTEM}\" unknown. Set the environment variable."
+ exit 1
fi;;
esac
setValueWithDefault MPI_BINDIR '${MPI_DIR}/bin'
-setValueWithDefault MPI_LIBDIR '${MPI_DIR}/lib'
+setValueWithDefault MPI_LIBDIR '${MPI_DIR}/lib/shared'
setValueWithDefault MPI_INCDIR '${MPI_DIR}/include'
if test ! "${CC}x" = "mpiccx"; then
setValueWithDefault MPI_INCLUDES '-I${MPI_INCDIR}'
@@ -57,8 +58,8 @@
setValueWithDefault MPI_IMPLEMENTATION open_mpi
elif `grep "MPICH2" ${MPI_INCDIR}/mpi.h > /dev/null 2>&1`; then
setValueWithDefault MPI_IMPLEMENTATION mpich2
-# elif `grep "Argonne National Laboratory" ${MPI_INCDIR}/mpi.h > /dev/null 2>&1`; then
-# setValueWithDefault MPI_IMPLEMENTATION mpich
+ elif `grep "Argonne National Laboratory" ${MPI_INCDIR}/mpi.h > /dev/null 2>&1`; then
+ setValueWithDefault MPI_IMPLEMENTATION mpich
else
setValueWithDefault MPI_IMPLEMENTATION mpich
fi
@@ -67,7 +68,7 @@
# set depending on system. on most systems, just default to mpich
if test "${MPI_LIBFILES}x" = "x"; then
case ${SYSTEM} in
- Linux|CYGWIN|Darwin|SunOS)
+ Linux|CYGWIN|Darwin|SunOS|ranger)
if test "${MPI_IMPLEMENTATION}" = "mpich2"; then
MPI_LIBFILES='-lmpich'
setValueWithDefault MPI_LIBRARY 'mpich'
@@ -150,6 +151,8 @@
setValueWithDefault MPI_RPATH '-R ${MPI_LIBDIR}';;
ibmxl)
setValueWithDefault MPI_RPATH '-R ${MPI_LIBDIR}';;
+ mvapich)
+ setValueWithDefault MPI_RPATH '-Wl,-rpath,${MPI_LIBDIR}';;
*)
echo "Warning: MPI_RPATH for C compiler \"${CC_TYPE}\" unknown";;
esac
@@ -161,6 +164,8 @@
else
setValueWithDefault MPI_LIBS '-L${STGERMAIN_LIBDIR} -l${MPI_LIBRARY} -L${MPI_LIBDIR} ${MPI_LIBFILES} -L/sw/lib ${CC_FORTRAN_LFLAGS}'
fi;;
+ ranger)
+ setValueWithDefault MPI_LIBS '';;
*)
setValueWithDefault MPI_LIBS '-L${MPI_LIBDIR} ${MPI_LIBFILES}';;
esac
@@ -173,7 +178,7 @@
fi
case ${SYSTEM} in
- Linux|CYGWIN|Darwin|SunOS)
+ Linux|CYGWIN|Darwin|SunOS|ranger)
setValueWithDefault MPI_RUN_COMMAND 'mpirun';;
OSF1)
setValueWithDefault MPI_RUN_COMMAND 'prun';;
@@ -196,7 +201,7 @@
setValueWithDefault MPI_RUN '${MPI_BINDIR}/${MPI_RUN_COMMAND}'
case ${SYSTEM} in
- Linux|CYGWIN|Darwin|SunOS)
+ Linux|CYGWIN|Darwin|SunOS|ranger)
setValueWithDefault MPI_NPROC '-np';;
OSF1)
setValueWithDefault MPI_NPROC '-n';;
Modified: long/3D/SNAC/trunk/StGermain/VMake/configure.sh
===================================================================
--- long/3D/SNAC/trunk/StGermain/VMake/configure.sh 2009-02-17 04:08:52 UTC (rev 14060)
+++ long/3D/SNAC/trunk/StGermain/VMake/configure.sh 2009-02-17 20:46:52 UTC (rev 14061)
@@ -645,7 +645,7 @@
fi
if test "${CXX}x" = "x"; then
- CXX=`${WHICH} cxx 2> /dev/null`
+ CXX=`${WHICH} c++ 2> /dev/null`
if whichFailed "${CXX}"; then
case ${SYSTEM} in
Linux|Darwin|CYGWIN|SunOS)
@@ -882,6 +882,8 @@
SO_CFLAGS="-shared";;
ibmxl)
SO_CFLAGS="-qpic";;
+ mvapich)
+ SO_CFLAGS="-fPIC";;
*)
echo "SO_CFLAGS for C compiler \"${CC_TYPE}\" unknown";
exit ;;
@@ -921,6 +923,9 @@
ibmxl)
SO_EXT="so";
MODULE_EXT='${SO_EXT}';;
+ mvapich)
+ SO_EXT="so";
+ MODULE_EXT='${SO_EXT}';;
*)
echo "Error: SO_EXT/MODULE_EXT for C compiler \"${CC_TYPE}\" unknown";
exit ;;
@@ -952,6 +957,8 @@
SO_LFLAGS="-G";;
ibmxl)
SO_LFLAGS="-qmkshrobj";;
+ mvapich)
+ SO_LFLAGS="-shared";;
*)
echo "Error: SO_LFLAGS for C compiler \"${CC_TYPE}\" unknown";
exit ;;
@@ -983,6 +990,8 @@
MODULE_LFLAGS='${SO_LFLAGS}';;
ibmxl)
MODULE_LFLAGS='${SO_LFLAGS}';;
+ mvapich)
+ MODULE_LFLAGS='${SO_LFLAGS}';;
*)
echo "Error: MODULE_LFLAGS for C compiler \"${CC_TYPE}\" unknown";
exit ;;
@@ -1020,6 +1029,8 @@
ibmxl)
RPATH_FLAG='-R '
;;
+ mvapich)
+ RPATH_FLAG="-Wl,-rpath,";;
*)
echo "Error: RPATH_FLAG for C compiler \"${CC_TYPE}\" unknown";
exit ;;
@@ -1067,6 +1078,8 @@
EXPORT_DYNAMIC_LFLAGS="-B dynamic";;
ibmxl)
EXPORT_DYNAMIC_LFLAGS="-Wl,--export-dynamic";;
+ mvapich)
+ EXPORT_DYNAMIC_LFLAGS="-Bdynamic";;
*)
echo "Error: EXPORT_DYNAMIC_LFLAGS for C compiler \"${CC_TYPE}\" unknown";
exit ;;
@@ -1089,6 +1102,8 @@
ibmxl)
# theres no good equivalient to -Wall, turn on a few warnings at least
CC_WARNINGLEVEL="-qformat=all -qwarn64";;
+ mvapich)
+ CC_WARNINGLEVEL="-Minform=inform";;
*)
echo "Warning: CC_WARNINGLEVEL for C compiler \"${CC_TYPE}\" unknown. Please set.";;
esac
@@ -1110,6 +1125,8 @@
CC_SYMBOLLEVEL="-g";;
ibmxl)
CC_SYMBOLLEVEL="-g";;
+ mvapich)
+ CC_SYMBOLLEVEL="-g";;
*)
echo "Warning: CC_SYMBOLLEVEL for C compiler \"${CC_TYPE}\" unknown. Please set.";;
esac
@@ -1154,7 +1171,7 @@
# Obtain dl information
if test "${DL_DIR}x" = "x"; then
case ${SYSTEM} in
- Linux|CYGWIN|OSF1|SunOS)
+ Linux|CYGWIN|OSF1|SunOS|ranger)
DL_DIR="/usr";;
Darwin)
DL_DIR="/sw";;
@@ -1169,7 +1186,7 @@
fi
if test "${DL_LIBFILES}x" = "x"; then
case $SYSTEM in
- Linux|Darwin|SunOS)
+ Linux|Darwin|SunOS|ranger)
DL_LIBFILES="-ldl";;
# dlcompat package is required for darwin
CYGWIN|OSF1)
Modified: long/3D/SNAC/trunk/VMake/Config/StGermain-config.sh
===================================================================
--- long/3D/SNAC/trunk/VMake/Config/StGermain-config.sh 2009-02-17 04:08:52 UTC (rev 14060)
+++ long/3D/SNAC/trunk/VMake/Config/StGermain-config.sh 2009-02-17 20:46:52 UTC (rev 14061)
@@ -50,6 +50,8 @@
setValueWithDefault STGERMAIN_RPATH '-R ${STGERMAIN_LIBDIR}';;
ibmxl)
setValueWithDefault STGERMAIN_RPATH '-R ${STGERMAIN_LIBDIR}';;
+ mvapich)
+ setValueWithDefault STGERMAIN_RPATH '-Wl,-rpath,${STGERMAIN_LIBDIR}';;
*)
echo "Warning: STGERMAIN_RPATH for C compiler \"${CC_TYPE}\" unknown";;
esac
Modified: long/3D/SNAC/trunk/VMake/Config/compiler-config.sh
===================================================================
--- long/3D/SNAC/trunk/VMake/Config/compiler-config.sh 2009-02-17 04:08:52 UTC (rev 14060)
+++ long/3D/SNAC/trunk/VMake/Config/compiler-config.sh 2009-02-17 20:46:52 UTC (rev 14061)
@@ -36,6 +36,9 @@
sparc)
setValueWithDefault CC_SYMBOLLEVEL '-g'
setValueWithDefault CC_WARNINGLEVEL '';;
+ mvapich)
+ setValueWithDefault CC_SYMBOLLEVEL '-g'
+ setValueWithDefault CC_WARNINGLEVEL '-Minform=inform';;
*)
echo "Warning: CC_WARNINGLEVEL for C compiler \"${CC_TYPE}\" unknown. Please set."
echo "Warning: CC_SYMBOLLEVEL for C compiler \"${CC_TYPE}\" unknown. Please set.";;
Modified: long/3D/SNAC/trunk/VMake/Config/mpi-config.sh
===================================================================
--- long/3D/SNAC/trunk/VMake/Config/mpi-config.sh 2009-02-17 04:08:52 UTC (rev 14060)
+++ long/3D/SNAC/trunk/VMake/Config/mpi-config.sh 2009-02-17 20:46:52 UTC (rev 14061)
@@ -27,12 +27,13 @@
# Obtain MPI information
case ${SYSTEM} in
Linux|CYGWIN|Darwin|SunOS)
- setValueWithDefault MPI_DIR "/usr/";;
+ setValueWithDefault MPI_DIR "/usr";;
OSF1)
- setValueWithDefault MPI_DIR "/usr/";;
+ setValueWithDefault MPI_DIR "/usr";;
*)
if test "${MPI_DIR}x" = "x" ; then
- echo "Warning: MPI_DIR for system \"${SYSTEM}\" unknown. Set the environment variable."
+ echo "Error: MPI_DIR for system \"${SYSTEM}\" unknown. Set the environment variable."
+ exit 1
fi;;
esac
setValueWithDefault MPI_BINDIR '${MPI_DIR}/bin'
@@ -57,8 +58,8 @@
setValueWithDefault MPI_IMPLEMENTATION open_mpi
elif `grep "MPICH2" ${MPI_INCDIR}/mpi.h > /dev/null 2>&1`; then
setValueWithDefault MPI_IMPLEMENTATION mpich2
-# elif `grep "Argonne National Laboratory" ${MPI_INCDIR}/mpi.h > /dev/null 2>&1`; then
-# setValueWithDefault MPI_IMPLEMENTATION mpich
+ elif `grep "Argonne National Laboratory" ${MPI_INCDIR}/mpi.h > /dev/null 2>&1`; then
+ setValueWithDefault MPI_IMPLEMENTATION mpich
else
setValueWithDefault MPI_IMPLEMENTATION mpich
fi
@@ -67,7 +68,7 @@
# set depending on system. on most systems, just default to mpich
if test "${MPI_LIBFILES}x" = "x"; then
case ${SYSTEM} in
- Linux|CYGWIN|Darwin|SunOS)
+ Linux|CYGWIN|Darwin|SunOS|ranger)
if test "${MPI_IMPLEMENTATION}" = "mpich2"; then
MPI_LIBFILES='-lmpich -lpmpich'
setValueWithDefault MPI_LIBRARY 'mpich'
@@ -150,6 +151,8 @@
setValueWithDefault MPI_RPATH '-R ${MPI_LIBDIR}';;
ibmxl)
setValueWithDefault MPI_RPATH '-R ${MPI_LIBDIR}';;
+ mvapich)
+ setValueWithDefault MPI_RPATH '-Wl,-rpath,${MPI_LIBDIR}';;
*)
echo "Warning: MPI_RPATH for C compiler \"${CC_TYPE}\" unknown";;
esac
@@ -173,7 +176,7 @@
fi
case ${SYSTEM} in
- Linux|CYGWIN|Darwin|SunOS)
+ Linux|CYGWIN|Darwin|SunOS|ranger)
setValueWithDefault MPI_RUN_COMMAND 'mpirun';;
OSF1)
setValueWithDefault MPI_RUN_COMMAND 'prun';;
@@ -196,7 +199,7 @@
setValueWithDefault MPI_RUN '${MPI_BINDIR}/${MPI_RUN_COMMAND}'
case ${SYSTEM} in
- Linux|CYGWIN|Darwin|SunOS)
+ Linux|CYGWIN|Darwin|SunOS|ranger)
setValueWithDefault MPI_NPROC '-np';;
OSF1)
setValueWithDefault MPI_NPROC '-n';;
Modified: long/3D/SNAC/trunk/VMake/configure.sh
===================================================================
--- long/3D/SNAC/trunk/VMake/configure.sh 2009-02-17 04:08:52 UTC (rev 14060)
+++ long/3D/SNAC/trunk/VMake/configure.sh 2009-02-17 20:46:52 UTC (rev 14061)
@@ -151,6 +151,32 @@
esac
export SYSTEM
fi
+
+## ${SYSTEM} is set to "linux" on ranger.tacc.utexas.edu.
+## Because the MPI-linking for "Linux" causes a strange run-time error on ranger,
+## we define a new system type, "ranger" such that all the
+## mpi-related variables remain undefined and the system's "mpicc" can
+## take care of everything during compiling and linking.
+##
+## This might be necessary on other systems that use
+## customized MPI libraries such as mpi_gm and mvapich.
+##
+## Choi, 2009/02/17.
+##
+if test "${SYSTEM}x" = "linuxx"; then
+ if test "${UNAME_N}x" = "x"; then
+ UNAME_N="${UNAME} -n"
+ export UNAME_N
+ fi
+ case `$UNAME_N` in
+ *ranger*)
+ SYSTEM=ranger;;
+ *)
+ SYSTEM=Unknown;;
+ esac
+ export SYSTEM
+fi
+
if test "${KERNEL_RELEASE}x" = "x"; then
KERNEL_RELEASE=`${UNAME_R}`
# The kernel release is general more important for macs so give meaningful name
@@ -543,6 +569,11 @@
fi
fi
+## Set CC to mpicc if on ranger
+## Choi, 2009/02/17.
+if test "${SYSTEM}x" = "rangerx"; then
+ CC="mpicc"
+fi
if test "${CC}x" = "x"; then
CC=`${WHICH} cc 2> /dev/null`
if whichFailed "${CC}"; then
@@ -559,6 +590,11 @@
fi
DoCritialConftest ./VMake/SystemTests/C-CompilerType CC_TYPE
+## Set CC_TYPE to mpicc if on ranger
+## Choi, 2009/02/17.
+if test "${SYSTEM}x" = "rangerx"; then
+ CC_TYPE="mvapich"
+fi
if test "${CC_TYPE}x" = "x"; then
echo "Warning: Unknown C compiler type \"${CC_TYPE}\"."
unset CC_TYPE
@@ -578,6 +614,8 @@
CC_PIPE="";;
ibmxl)
CC_PIPE="";;
+ mvapich)
+ CC_PIPE="";;
*)
echo "Warning: CC_PIPE for C compiler \"${CC_TYPE}\" unknown. Please set.";;
esac
@@ -597,6 +635,8 @@
CC_64="";;
ibmxl)
CC_64="-q64";;
+ mvapich)
+ CC_64="";;
*)
echo "Warning: CC_64 for C compiler \"${CC_TYPE}\" unknown. Please set if needed.";;
esac
@@ -648,7 +688,7 @@
CXX=`${WHICH} cxx 2> /dev/null`
if whichFailed "${CXX}"; then
case ${SYSTEM} in
- Linux|Darwin|CYGWIN|SunOS)
+ Linux|Darwin|CYGWIN|SunOS|ranger)
CXX=`${WHICH} g++ 2> /dev/null`
if whichFailed "${CXX}"; then
CXX="/usr/bin/g++";
@@ -669,6 +709,11 @@
echo ${CXX_TEST}
else
DoCritialConftest ./VMake/SystemTests/CXX-CompilerType CXX_TYPE
+ ## Set CC_TYPE to mpicc if on ranger
+ ## Choi, 2009/02/17.
+ if test "${SYSTEM}x" = "rangerx"; then
+ CXX_TYPE="mvapich"
+ fi
if test "${CXX_TYPE}x" = "x"; then
echo "Warning: Unknown C compiler type \"${CXX_TYPE}\"."
unset CXX_TYPE
@@ -711,8 +756,8 @@
ibmxl)
CC_CXX_LFLAGS="-L /usr/local/IBM_compilers/vacpp/7.0/lib64 -lxlopt -lxl -libmc++ -L /usr/lib64 -lstdc++ -R /usr/local/IBM_compilers/vacpp/7.0/lib64";;
*)
- echo "Error: CC_CXX_LFLAGS for C compiler \"${CC_TYPE}\" unknown";
- exit ;;
+ echo "Warning: CC_CXX_LFLAGS for C compiler \"${CC_TYPE}\" unknown";
+# exit ;;
esac
export CC_CXX_LFLAGS
fi
@@ -802,7 +847,7 @@
if test "${EXTRA_FORTRAN_LIBS}x" = "x"; then
case $CC_TYPE in
- gnu)
+ gnu|mvapich)
case $F77_TYPE in
gnu)
EXTRA_FORTRAN_LIBS="-lg2c";;
@@ -834,8 +879,8 @@
ibmxl)
EXTRA_FORTRAN_LIBS="";;
*)
- echo "Error: EXTRA_FORTRAN_LIBS for C compiler \"${CC_TYPE}\" unknown";
- exit ;;
+ echo "Warning: EXTRA_FORTRAN_LIBS for C compiler \"${CC_TYPE}\" unknown";
+# exit ;;
esac
export EXTRA_FORTRAN_LIBS
fi
@@ -882,6 +927,8 @@
SO_CFLAGS="-shared";;
ibmxl)
SO_CFLAGS="-qpic";;
+ mvapich)
+ SO_CFLAGS="-fPIC";;
*)
echo "SO_CFLAGS for C compiler \"${CC_TYPE}\" unknown";
exit ;;
@@ -921,6 +968,9 @@
ibmxl)
SO_EXT="so";
MODULE_EXT='${SO_EXT}';;
+ mvapich)
+ SO_EXT="so";
+ MODULE_EXT='${SO_EXT}';;
*)
echo "Error: SO_EXT/MODULE_EXT for C compiler \"${CC_TYPE}\" unknown";
exit ;;
@@ -952,6 +1002,8 @@
SO_LFLAGS="-G";;
ibmxl)
SO_LFLAGS="-qmkshrobj";;
+ mvapich)
+ SO_LFLAGS="-shared";;
*)
echo "Error: SO_LFLAGS for C compiler \"${CC_TYPE}\" unknown";
exit ;;
@@ -983,6 +1035,8 @@
MODULE_LFLAGS='${SO_LFLAGS}';;
ibmxl)
MODULE_LFLAGS='${SO_LFLAGS}';;
+ mvapich)
+ MODULE_LFLAGS='${SO_LFLAGS}';;
*)
echo "Error: MODULE_LFLAGS for C compiler \"${CC_TYPE}\" unknown";
exit ;;
@@ -1020,6 +1074,9 @@
ibmxl)
RPATH_FLAG='-R '
;;
+ mvapich)
+ RPATH_FLAG="-Wl,-rpath,"
+ ;;
*)
echo "Error: RPATH_FLAG for C compiler \"${CC_TYPE}\" unknown";
exit ;;
@@ -1067,6 +1124,8 @@
EXPORT_DYNAMIC_LFLAGS="-B dynamic";;
ibmxl)
EXPORT_DYNAMIC_LFLAGS="-Wl,--export-dynamic";;
+ mvapich)
+ EXPORT_DYNAMIC_LFLAGS="";;
*)
echo "Error: EXPORT_DYNAMIC_LFLAGS for C compiler \"${CC_TYPE}\" unknown";
exit ;;
@@ -1089,6 +1148,8 @@
ibmxl)
# theres no good equivalient to -Wall, turn on a few warnings at least
CC_WARNINGLEVEL="-qformat=all -qwarn64";;
+ mvapich)
+ CC_WARNINGLEVEL="-Minform=inform";;
*)
echo "Warning: CC_WARNINGLEVEL for C compiler \"${CC_TYPE}\" unknown. Please set.";;
esac
@@ -1110,6 +1171,8 @@
CC_SYMBOLLEVEL="-g";;
ibmxl)
CC_SYMBOLLEVEL="-g";;
+ mvapich)
+ CC_SYMBOLLEVEL="-g";;
*)
echo "Warning: CC_SYMBOLLEVEL for C compiler \"${CC_TYPE}\" unknown. Please set.";;
esac
@@ -1154,7 +1217,7 @@
# Obtain dl information
if test "${DL_DIR}x" = "x"; then
case ${SYSTEM} in
- Linux|CYGWIN|OSF1|SunOS)
+ Linux|CYGWIN|OSF1|SunOS|ranger)
DL_DIR="/usr";;
Darwin)
DL_DIR="/sw";;
@@ -1169,7 +1232,7 @@
fi
if test "${DL_LIBFILES}x" = "x"; then
case $SYSTEM in
- Linux|Darwin|SunOS)
+ Linux|Darwin|SunOS|ranger)
DL_LIBFILES="-ldl";;
# dlcompat package is required for darwin
CYGWIN|OSF1)
More information about the CIG-COMMITS
mailing list