[cig-commits] r14099 - 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
Wed Feb 18 08:39:02 PST 2009
Author: echoi
Date: 2009-02-18 08:39:02 -0800 (Wed, 18 Feb 2009)
New Revision: 14099
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:
Changed mvapich to pgi because mvapich is not really a compiler type.
Modified: long/3D/SNAC/trunk/Snac/VMake/Config/StGermain-config.sh
===================================================================
--- long/3D/SNAC/trunk/Snac/VMake/Config/StGermain-config.sh 2009-02-18 16:17:50 UTC (rev 14098)
+++ long/3D/SNAC/trunk/Snac/VMake/Config/StGermain-config.sh 2009-02-18 16:39:02 UTC (rev 14099)
@@ -50,7 +50,7 @@
setValueWithDefault STGERMAIN_RPATH '-R ${STGERMAIN_LIBDIR}';;
ibmxl)
setValueWithDefault STGERMAIN_RPATH '-R ${STGERMAIN_LIBDIR}';;
- mvapich)
+ pgi)
setValueWithDefault STGERMAIN_RPATH '-Wl,-rpath,${STGERMAIN_LIBDIR}';;
*)
echo "Warning: STGERMAIN_RPATH for C compiler \"${CC_TYPE}\" unknown";;
Modified: long/3D/SNAC/trunk/Snac/VMake/Config/compiler-config.sh
===================================================================
--- long/3D/SNAC/trunk/Snac/VMake/Config/compiler-config.sh 2009-02-18 16:17:50 UTC (rev 14098)
+++ long/3D/SNAC/trunk/Snac/VMake/Config/compiler-config.sh 2009-02-18 16:39:02 UTC (rev 14099)
@@ -36,7 +36,7 @@
sparc)
setValueWithDefault CC_SYMBOLLEVEL '-g'
setValueWithDefault CC_WARNINGLEVEL '';;
- mvapich)
+ pgi)
setValueWithDefault CC_SYMBOLLEVEL '-g'
setValueWithDefault CC_WARNINGLEVEL '-Minform=inform';;
*)
Modified: long/3D/SNAC/trunk/Snac/VMake/Config/mpi-config.sh
===================================================================
--- long/3D/SNAC/trunk/Snac/VMake/Config/mpi-config.sh 2009-02-18 16:17:50 UTC (rev 14098)
+++ long/3D/SNAC/trunk/Snac/VMake/Config/mpi-config.sh 2009-02-18 16:39:02 UTC (rev 14099)
@@ -155,7 +155,7 @@
setValueWithDefault MPI_RPATH '-R ${MPI_LIBDIR}';;
ibmxl)
setValueWithDefault MPI_RPATH '-R ${MPI_LIBDIR}';;
- mvapich)
+ pgi)
setValueWithDefault MPI_RPATH '-Wl,-rpath,${MPI_LIBDIR}';;
*)
echo "Warning: MPI_RPATH for C compiler \"${CC_TYPE}\" unknown";;
Modified: long/3D/SNAC/trunk/Snac/VMake/configure.sh
===================================================================
--- long/3D/SNAC/trunk/Snac/VMake/configure.sh 2009-02-18 16:17:50 UTC (rev 14098)
+++ long/3D/SNAC/trunk/Snac/VMake/configure.sh 2009-02-18 16:39:02 UTC (rev 14099)
@@ -1090,7 +1090,7 @@
ibmxl)
# theres no good equivalient to -Wall, turn on a few warnings at least
CC_WARNINGLEVEL="-qformat=all -qwarn64";;
- mvapich)
+ pgi)
CC_WARNINGLEVEL="-Minform=inform";;
*)
echo "Warning: CC_WARNINGLEVEL for C compiler \"${CC_TYPE}\" unknown. Please set.";;
@@ -1113,7 +1113,7 @@
CC_SYMBOLLEVEL="-g";;
ibmxl)
CC_SYMBOLLEVEL="-g";;
- mvapich)
+ pgi)
CC_SYMBOLLEVEL="-g";;
*)
echo "Warning: CC_SYMBOLLEVEL for C compiler \"${CC_TYPE}\" unknown. Please set.";;
@@ -1133,7 +1133,11 @@
i686)
CC_OPTIMISATIONLEVEL="-O3 -march=i686 -fomit-frame-pointer -funroll-loops";; #-fmove-all-movables";;
x86_64)
- CC_OPTIMISATIONLEVEL="-O3 -march=athlon64";; #-fomit-frame-pointer -funroll-loops";;
+ if test "${CC_TYPE}x" = "pgix"; then
+ CC_OPTIMISATIONLEVEL="-O3 -tp amd64e" #-fomit-frame-pointer -funroll-loops";;
+ else
+ CC_OPTIMISATIONLEVEL="-O3 -march=athlon64" #-fomit-frame-pointer -funroll-loops";;
+ fi;;
ia64)
CC_OPTIMISATIONLEVEL=" ";;
alpha)
Modified: long/3D/SNAC/trunk/StGermain/VMake/Config/StGermain-config.sh
===================================================================
--- long/3D/SNAC/trunk/StGermain/VMake/Config/StGermain-config.sh 2009-02-18 16:17:50 UTC (rev 14098)
+++ long/3D/SNAC/trunk/StGermain/VMake/Config/StGermain-config.sh 2009-02-18 16:39:02 UTC (rev 14099)
@@ -50,7 +50,7 @@
setValueWithDefault STGERMAIN_RPATH '-R ${STGERMAIN_LIBDIR}';;
ibmxl)
setValueWithDefault STGERMAIN_RPATH '-R ${STGERMAIN_LIBDIR}';;
- mvapich)
+ pgi)
setValueWithDefault STGERMAIN_RPATH '-Wl,-rpath,${STGERMAIN_LIBDIR}';;
*)
echo "Warning: STGERMAIN_RPATH for C compiler \"${CC_TYPE}\" unknown";;
Modified: long/3D/SNAC/trunk/StGermain/VMake/Config/compiler-config.sh
===================================================================
--- long/3D/SNAC/trunk/StGermain/VMake/Config/compiler-config.sh 2009-02-18 16:17:50 UTC (rev 14098)
+++ long/3D/SNAC/trunk/StGermain/VMake/Config/compiler-config.sh 2009-02-18 16:39:02 UTC (rev 14099)
@@ -36,7 +36,7 @@
sparc)
setValueWithDefault CC_SYMBOLLEVEL '-g'
setValueWithDefault CC_WARNINGLEVEL '';;
- mvapich)
+ pgi)
setValueWithDefault CC_SYMBOLLEVEL '-g'
setValueWithDefault CC_WARNINGLEVEL '-Minform=inform';;
*)
Modified: long/3D/SNAC/trunk/StGermain/VMake/Config/mpi-config.sh
===================================================================
--- long/3D/SNAC/trunk/StGermain/VMake/Config/mpi-config.sh 2009-02-18 16:17:50 UTC (rev 14098)
+++ long/3D/SNAC/trunk/StGermain/VMake/Config/mpi-config.sh 2009-02-18 16:39:02 UTC (rev 14099)
@@ -151,7 +151,7 @@
setValueWithDefault MPI_RPATH '-R ${MPI_LIBDIR}';;
ibmxl)
setValueWithDefault MPI_RPATH '-R ${MPI_LIBDIR}';;
- mvapich)
+ pgi)
setValueWithDefault MPI_RPATH '-Wl,-rpath,${MPI_LIBDIR}';;
*)
echo "Warning: MPI_RPATH for C compiler \"${CC_TYPE}\" unknown";;
Modified: long/3D/SNAC/trunk/StGermain/VMake/configure.sh
===================================================================
--- long/3D/SNAC/trunk/StGermain/VMake/configure.sh 2009-02-18 16:17:50 UTC (rev 14098)
+++ long/3D/SNAC/trunk/StGermain/VMake/configure.sh 2009-02-18 16:39:02 UTC (rev 14099)
@@ -882,7 +882,7 @@
SO_CFLAGS="-shared";;
ibmxl)
SO_CFLAGS="-qpic";;
- mvapich)
+ pgi)
SO_CFLAGS="-fPIC";;
*)
echo "SO_CFLAGS for C compiler \"${CC_TYPE}\" unknown";
@@ -923,7 +923,7 @@
ibmxl)
SO_EXT="so";
MODULE_EXT='${SO_EXT}';;
- mvapich)
+ pgi)
SO_EXT="so";
MODULE_EXT='${SO_EXT}';;
*)
@@ -957,7 +957,7 @@
SO_LFLAGS="-G";;
ibmxl)
SO_LFLAGS="-qmkshrobj";;
- mvapich)
+ pgi)
SO_LFLAGS="-shared";;
*)
echo "Error: SO_LFLAGS for C compiler \"${CC_TYPE}\" unknown";
@@ -990,7 +990,7 @@
MODULE_LFLAGS='${SO_LFLAGS}';;
ibmxl)
MODULE_LFLAGS='${SO_LFLAGS}';;
- mvapich)
+ pgi)
MODULE_LFLAGS='${SO_LFLAGS}';;
*)
echo "Error: MODULE_LFLAGS for C compiler \"${CC_TYPE}\" unknown";
@@ -1029,7 +1029,7 @@
ibmxl)
RPATH_FLAG='-R '
;;
- mvapich)
+ pgi)
RPATH_FLAG="-Wl,-rpath,";;
*)
echo "Error: RPATH_FLAG for C compiler \"${CC_TYPE}\" unknown";
@@ -1078,7 +1078,7 @@
EXPORT_DYNAMIC_LFLAGS="-B dynamic";;
ibmxl)
EXPORT_DYNAMIC_LFLAGS="-Wl,--export-dynamic";;
- mvapich)
+ pgi)
EXPORT_DYNAMIC_LFLAGS="-Bdynamic";;
*)
echo "Error: EXPORT_DYNAMIC_LFLAGS for C compiler \"${CC_TYPE}\" unknown";
@@ -1102,7 +1102,7 @@
ibmxl)
# theres no good equivalient to -Wall, turn on a few warnings at least
CC_WARNINGLEVEL="-qformat=all -qwarn64";;
- mvapich)
+ pgi)
CC_WARNINGLEVEL="-Minform=inform";;
*)
echo "Warning: CC_WARNINGLEVEL for C compiler \"${CC_TYPE}\" unknown. Please set.";;
@@ -1125,7 +1125,7 @@
CC_SYMBOLLEVEL="-g";;
ibmxl)
CC_SYMBOLLEVEL="-g";;
- mvapich)
+ pgi)
CC_SYMBOLLEVEL="-g";;
*)
echo "Warning: CC_SYMBOLLEVEL for C compiler \"${CC_TYPE}\" unknown. Please set.";;
@@ -1145,7 +1145,11 @@
i686)
CC_OPTIMISATIONLEVEL="-O3 -march=i686 -fomit-frame-pointer -funroll-loops";; #-fmove-all-movables";;
x86_64)
- CC_OPTIMISATIONLEVEL="-O3 -march=athlon64";; #-fomit-frame-pointer -funroll-loops";;
+ if test "${CC_TYPE}x" = "pgix"; then
+ CC_OPTIMISATIONLEVEL="-O3 -tp amd64e" #-fomit-frame-pointer -funroll-loops";;
+ else
+ CC_OPTIMISATIONLEVEL="-O3 -march=athlon64" #-fomit-frame-pointer -funroll-loops";;
+ fi;;
ia64)
CC_OPTIMISATIONLEVEL=" ";;
alpha)
Modified: long/3D/SNAC/trunk/VMake/Config/StGermain-config.sh
===================================================================
--- long/3D/SNAC/trunk/VMake/Config/StGermain-config.sh 2009-02-18 16:17:50 UTC (rev 14098)
+++ long/3D/SNAC/trunk/VMake/Config/StGermain-config.sh 2009-02-18 16:39:02 UTC (rev 14099)
@@ -50,7 +50,7 @@
setValueWithDefault STGERMAIN_RPATH '-R ${STGERMAIN_LIBDIR}';;
ibmxl)
setValueWithDefault STGERMAIN_RPATH '-R ${STGERMAIN_LIBDIR}';;
- mvapich)
+ pgi)
setValueWithDefault STGERMAIN_RPATH '-Wl,-rpath,${STGERMAIN_LIBDIR}';;
*)
echo "Warning: STGERMAIN_RPATH for C compiler \"${CC_TYPE}\" unknown";;
Modified: long/3D/SNAC/trunk/VMake/Config/compiler-config.sh
===================================================================
--- long/3D/SNAC/trunk/VMake/Config/compiler-config.sh 2009-02-18 16:17:50 UTC (rev 14098)
+++ long/3D/SNAC/trunk/VMake/Config/compiler-config.sh 2009-02-18 16:39:02 UTC (rev 14099)
@@ -36,7 +36,7 @@
sparc)
setValueWithDefault CC_SYMBOLLEVEL '-g'
setValueWithDefault CC_WARNINGLEVEL '';;
- mvapich)
+ pgi)
setValueWithDefault CC_SYMBOLLEVEL '-g'
setValueWithDefault CC_WARNINGLEVEL '-Minform=inform';;
*)
Modified: long/3D/SNAC/trunk/VMake/Config/mpi-config.sh
===================================================================
--- long/3D/SNAC/trunk/VMake/Config/mpi-config.sh 2009-02-18 16:17:50 UTC (rev 14098)
+++ long/3D/SNAC/trunk/VMake/Config/mpi-config.sh 2009-02-18 16:39:02 UTC (rev 14099)
@@ -151,7 +151,7 @@
setValueWithDefault MPI_RPATH '-R ${MPI_LIBDIR}';;
ibmxl)
setValueWithDefault MPI_RPATH '-R ${MPI_LIBDIR}';;
- mvapich)
+ pgi)
setValueWithDefault MPI_RPATH '-Wl,-rpath,${MPI_LIBDIR}';;
*)
echo "Warning: MPI_RPATH for C compiler \"${CC_TYPE}\" unknown";;
Modified: long/3D/SNAC/trunk/VMake/configure.sh
===================================================================
--- long/3D/SNAC/trunk/VMake/configure.sh 2009-02-18 16:17:50 UTC (rev 14098)
+++ long/3D/SNAC/trunk/VMake/configure.sh 2009-02-18 16:39:02 UTC (rev 14099)
@@ -593,7 +593,7 @@
## Set CC_TYPE to mpicc if on ranger
## Choi, 2009/02/17.
if test "${SYSTEM}x" = "rangerx"; then
- CC_TYPE="mvapich"
+ CC_TYPE="pgi"
fi
if test "${CC_TYPE}x" = "x"; then
echo "Warning: Unknown C compiler type \"${CC_TYPE}\"."
@@ -614,7 +614,7 @@
CC_PIPE="";;
ibmxl)
CC_PIPE="";;
- mvapich)
+ pgi)
CC_PIPE="";;
*)
echo "Warning: CC_PIPE for C compiler \"${CC_TYPE}\" unknown. Please set.";;
@@ -635,7 +635,7 @@
CC_64="";;
ibmxl)
CC_64="-q64";;
- mvapich)
+ pgi)
CC_64="";;
*)
echo "Warning: CC_64 for C compiler \"${CC_TYPE}\" unknown. Please set if needed.";;
@@ -712,7 +712,7 @@
## Set CC_TYPE to mpicc if on ranger
## Choi, 2009/02/17.
if test "${SYSTEM}x" = "rangerx"; then
- CXX_TYPE="mvapich"
+ CXX_TYPE="pgi"
fi
if test "${CXX_TYPE}x" = "x"; then
echo "Warning: Unknown C compiler type \"${CXX_TYPE}\"."
@@ -847,7 +847,7 @@
if test "${EXTRA_FORTRAN_LIBS}x" = "x"; then
case $CC_TYPE in
- gnu|mvapich)
+ gnu|pgi)
case $F77_TYPE in
gnu)
EXTRA_FORTRAN_LIBS="-lg2c";;
@@ -927,7 +927,7 @@
SO_CFLAGS="-shared";;
ibmxl)
SO_CFLAGS="-qpic";;
- mvapich)
+ pgi)
SO_CFLAGS="-fPIC";;
*)
echo "SO_CFLAGS for C compiler \"${CC_TYPE}\" unknown";
@@ -968,7 +968,7 @@
ibmxl)
SO_EXT="so";
MODULE_EXT='${SO_EXT}';;
- mvapich)
+ pgi)
SO_EXT="so";
MODULE_EXT='${SO_EXT}';;
*)
@@ -1002,7 +1002,7 @@
SO_LFLAGS="-G";;
ibmxl)
SO_LFLAGS="-qmkshrobj";;
- mvapich)
+ pgi)
SO_LFLAGS="-shared";;
*)
echo "Error: SO_LFLAGS for C compiler \"${CC_TYPE}\" unknown";
@@ -1035,7 +1035,7 @@
MODULE_LFLAGS='${SO_LFLAGS}';;
ibmxl)
MODULE_LFLAGS='${SO_LFLAGS}';;
- mvapich)
+ pgi)
MODULE_LFLAGS='${SO_LFLAGS}';;
*)
echo "Error: MODULE_LFLAGS for C compiler \"${CC_TYPE}\" unknown";
@@ -1074,7 +1074,7 @@
ibmxl)
RPATH_FLAG='-R '
;;
- mvapich)
+ pgi)
RPATH_FLAG="-Wl,-rpath,"
;;
*)
@@ -1124,7 +1124,7 @@
EXPORT_DYNAMIC_LFLAGS="-B dynamic";;
ibmxl)
EXPORT_DYNAMIC_LFLAGS="-Wl,--export-dynamic";;
- mvapich)
+ pgi)
EXPORT_DYNAMIC_LFLAGS="";;
*)
echo "Error: EXPORT_DYNAMIC_LFLAGS for C compiler \"${CC_TYPE}\" unknown";
@@ -1148,7 +1148,7 @@
ibmxl)
# theres no good equivalient to -Wall, turn on a few warnings at least
CC_WARNINGLEVEL="-qformat=all -qwarn64";;
- mvapich)
+ pgi)
CC_WARNINGLEVEL="-Minform=inform";;
*)
echo "Warning: CC_WARNINGLEVEL for C compiler \"${CC_TYPE}\" unknown. Please set.";;
@@ -1171,7 +1171,7 @@
CC_SYMBOLLEVEL="-g";;
ibmxl)
CC_SYMBOLLEVEL="-g";;
- mvapich)
+ pgi)
CC_SYMBOLLEVEL="-g";;
*)
echo "Warning: CC_SYMBOLLEVEL for C compiler \"${CC_TYPE}\" unknown. Please set.";;
@@ -1191,7 +1191,11 @@
i686)
CC_OPTIMISATIONLEVEL="-O3 -march=i686 -fomit-frame-pointer -funroll-loops";; #-fmove-all-movables";;
x86_64)
- CC_OPTIMISATIONLEVEL="-O3 -march=athlon64";; #-fomit-frame-pointer -funroll-loops";;
+ if test "${CC_TYPE}x" = "pgix"; then
+ CC_OPTIMISATIONLEVEL="-O3 -tp amd64e" #-fomit-frame-pointer -funroll-loops";;
+ else
+ CC_OPTIMISATIONLEVEL="-O3 -march=athlon64" #-fomit-frame-pointer -funroll-loops";;
+ fi;;
ia64)
CC_OPTIMISATIONLEVEL=" ";;
alpha)
More information about the CIG-COMMITS
mailing list