removed make beta, test/make beta++, and test/make beta77
This commit is contained in:
treadway
parent
e388b149b8
commit
b760f76b96
17
Makefile.in
17
Makefile.in
@ -77,23 +77,6 @@ all: krylov struct sstruct IJ fei
|
||||
(cd test; $(MAKE) veryclean; $(MAKE)); \
|
||||
echo ""
|
||||
|
||||
beta: all
|
||||
@ \
|
||||
HYPRE_INSTALL_DIR=`pwd`/hypre; \
|
||||
export HYPRE_INSTALL_DIR; \
|
||||
for i in ${HYPRE_EXTRA_DIRS}; \
|
||||
do \
|
||||
if [ -d $$i ]; \
|
||||
then \
|
||||
echo "Making $$i ..."; \
|
||||
(cd $$i; $(MAKE) install); \
|
||||
echo ""; \
|
||||
fi; \
|
||||
done; \
|
||||
echo "Making beta test drivers ..."; \
|
||||
(cd test; $(MAKE) beta); \
|
||||
echo ""
|
||||
|
||||
krylov: base
|
||||
@ \
|
||||
HYPRE_INSTALL_DIR=`pwd`/hypre; \
|
||||
|
||||
@ -165,7 +165,7 @@ do
|
||||
HYPRE_COMPILE_MACHINE="achilles"
|
||||
HYPRE_RUN_MACHINE="achilles"
|
||||
HYPRE_REMOTE_DIR="/usr/casc/hypre/sparc-sun-solaris2.8/AUTOTEST"
|
||||
HYPRE_MACHINE_COMMANDS="-mn -a 2 -dcxfy"
|
||||
HYPRE_MACHINE_COMMANDS="-mn -a 2 -dcf"
|
||||
HYPRE_MESSAGE='SECONDARY[cc-5.3]'
|
||||
perform_test
|
||||
shift;;
|
||||
@ -204,7 +204,7 @@ do
|
||||
HYPRE_COMPILE_MACHINE="poincare"
|
||||
HYPRE_RUN_MACHINE="poincare"
|
||||
HYPRE_REMOTE_DIR="/usr/casc/hypre/sparc-sun-solaris2.7/AUTOTEST"
|
||||
HYPRE_MACHINE_COMMANDS="-mns -a 2 -dcxfy"
|
||||
HYPRE_MACHINE_COMMANDS="-mns -a 2 -dcf"
|
||||
HYPRE_MESSAGE='SECONDARY[cc-5.0]'
|
||||
### print_header
|
||||
### ./autotest_test $HYPRE_MACHINE_COMMANDS
|
||||
@ -250,7 +250,7 @@ do
|
||||
HYPRE_COMPILE_MACHINE="ilx"
|
||||
HYPRE_RUN_MACHINE="ilx"
|
||||
HYPRE_REMOTE_DIR="/usr/casc/hypre/i686-pc-linux-gnu-ilx/AUTOTEST"
|
||||
HYPRE_MACHINE_COMMANDS="-mnsa 2 -dcxfy"
|
||||
HYPRE_MACHINE_COMMANDS="-mnsa 2 -dcf"
|
||||
HYPRE_MESSAGE='OTHER[gcc-2.96]'
|
||||
perform_test
|
||||
shift;;
|
||||
@ -259,7 +259,7 @@ do
|
||||
HYPRE_COMPILE_MACHINE="tux83"
|
||||
HYPRE_RUN_MACHINE="tux83"
|
||||
HYPRE_REMOTE_DIR="/usr/casc/hypre/i686-pc-linux-gnu/AUTOTEST"
|
||||
HYPRE_MACHINE_COMMANDS="-mnsa 1 -dcxfy -i 2"
|
||||
HYPRE_MACHINE_COMMANDS="-mnsa 1 -dcf -i 2"
|
||||
HYPRE_MESSAGE='PRIMARY[insure++]'
|
||||
HYPRE_MACHINE_COMMANDS="$HYPRE_MACHINE_COMMANDS -v $HYPRE_MESSAGE"
|
||||
print_header
|
||||
@ -271,7 +271,7 @@ do
|
||||
HYPRE_COMPILE_MACHINE="pengra"
|
||||
HYPRE_RUN_MACHINE="pengra"
|
||||
HYPRE_REMOTE_DIR="/usr/casc/hypre/i686-pc-linux-gnu-pengra/AUTOTEST"
|
||||
HYPRE_MACHINE_COMMANDS="-mna 2 -dcxfy"
|
||||
HYPRE_MACHINE_COMMANDS="-mna 2 -dcf"
|
||||
HYPRE_MESSAGE='OTHER[icc-6.0]'
|
||||
perform_test
|
||||
shift;;
|
||||
@ -280,7 +280,7 @@ do
|
||||
HYPRE_COMPILE_MACHINE="poincare"
|
||||
HYPRE_RUN_MACHINE="poincare"
|
||||
HYPRE_REMOTE_DIR="/usr/casc/hypre/sparc-sun-solaris2.7/AUTOTEST"
|
||||
HYPRE_MACHINE_COMMANDS="-mnsa 1 -dcxfy -q 2"
|
||||
HYPRE_MACHINE_COMMANDS="-mnsa 1 -dcf -q 2"
|
||||
HYPRE_MESSAGE='SECONDARY[purify]'
|
||||
### print_header
|
||||
### ./autotest_test $HYPRE_MACHINE_COMMANDS -v $HYPRE_MESSAGE
|
||||
@ -336,7 +336,7 @@ do
|
||||
HYPRE_COMPILE_MACHINE="tux83"
|
||||
HYPRE_RUN_MACHINE="tux83"
|
||||
HYPRE_REMOTE_DIR="/usr/casc/hypre/i686-pc-linux-gnu/AUTOTEST"
|
||||
HYPRE_MACHINE_COMMANDS="-mns -a 2 -dcxfy"
|
||||
HYPRE_MACHINE_COMMANDS="-mns -a 2 -dcf"
|
||||
HYPRE_MESSAGE='PRIMARY[gcc-2.96]'
|
||||
print_header
|
||||
./autotest_test $HYPRE_MACHINE_COMMANDS -v $HYPRE_MESSAGE
|
||||
@ -347,7 +347,7 @@ do
|
||||
HYPRE_COMPILE_MACHINE="tux71"
|
||||
HYPRE_RUN_MACHINE="tux71"
|
||||
HYPRE_REMOTE_DIR="/usr/casc/hypre/i686-pc-linux-gnu-gcc3.x/AUTOTEST"
|
||||
HYPRE_MACHINE_COMMANDS="-mn -a 2 -dcxfy"
|
||||
HYPRE_MACHINE_COMMANDS="-mn -a 2 -dcf"
|
||||
HYPRE_MESSAGE='SECONDARY[gcc-3.1.1]'
|
||||
perform_test
|
||||
shift;;
|
||||
@ -356,7 +356,7 @@ do
|
||||
HYPRE_COMPILE_MACHINE="tux83"
|
||||
HYPRE_RUN_MACHINE="tux83"
|
||||
HYPRE_REMOTE_DIR="/usr/casc/hypre/i686-pc-linux-gnu-pgi3.3/AUTOTEST"
|
||||
HYPRE_MACHINE_COMMANDS="-mns -a 2 -dcxfy"
|
||||
HYPRE_MACHINE_COMMANDS="-mns -a 2 -dcf"
|
||||
HYPRE_MESSAGE='SECONDARY[pgi-3.3]'
|
||||
print_header
|
||||
./autotest_test $HYPRE_MACHINE_COMMANDS -v $HYPRE_MESSAGE
|
||||
|
||||
@ -108,7 +108,6 @@ parse_arguments () {
|
||||
argcur=$arg
|
||||
case $arg in
|
||||
a) confbuildtest $OPTARG " " "default" 1 1 1 1 1 1 1;;
|
||||
b) confbuildtest $OPTARG " " "beta" 0 0 0 0 0 1 1;;
|
||||
c) build $Build "all++" "all++" "test";;
|
||||
D) DEBUG_MODE="yes";;
|
||||
d) build $Build "all" "docs" "docs";;
|
||||
@ -130,8 +129,6 @@ parse_arguments () {
|
||||
s) confbuildtest $Build "--with-strict-checking" \
|
||||
"strict_checking" 1 1 1 1 1 1 0;;
|
||||
v) HYPRE_MESSAGE=$OPTARG;;
|
||||
x) build $Build "beta++" "beta++" "test";;
|
||||
y) build $Build "beta77" "beta77" "test";;
|
||||
:) echo "$0: \"$argcur\" requires a value"; exit 2;;
|
||||
\?) echo "$0: INVALID option \"$argcur\" at $OPTIND"; exit 2;;
|
||||
esac
|
||||
@ -156,10 +153,8 @@ usage () {
|
||||
printf " 2=configure, make and run.\n"
|
||||
printf "\n"
|
||||
printf "%s\n" "-a opt All; the (default) configure, make, and execute. Also"
|
||||
printf " performs make struct, IJ, fei, all, beta, nofei, and\n"
|
||||
printf " performs make struct, IJ, fei, all, nofei, and\n"
|
||||
printf " fei++, followed by the runtest script (when opt=2).\n"
|
||||
printf "%s\n" "-b opt Beta; perform the (default) configure, make beta,"
|
||||
printf " nofei, fei++, followed by the runtest script (when opt=2).\n"
|
||||
printf "%s\n" "-c C++; make all++ (no configure, or execute)."
|
||||
printf "%s\n" "-D Turn on debug messages."
|
||||
printf "%s\n" "-d Docs; make the documentation directory."
|
||||
@ -171,17 +166,15 @@ usage () {
|
||||
printf "%s\n" "-m Mail; mail error summary to developers."
|
||||
printf "%s\n" "+m Mail+; mail error logs to developers."
|
||||
printf "%s\n" "-n NoMPI; configure --without-MPI, make struct, IJ,"
|
||||
printf " all, and beta (no execute option).\n"
|
||||
printf "%s\n" "-o opt openMP; configure --with-openmp, make beta."
|
||||
printf " and all (no execute option).\n"
|
||||
printf "%s\n" "-o opt openMP; configure --with-openmp, make."
|
||||
printf "%s\n" "-q opt Purify; perform configure --with-purify-to-file."
|
||||
printf " Output is appended to a file called purify.log.\n"
|
||||
printf "%s\n" "+q opt Purify; no file output option (interactive)."
|
||||
printf "%s\n" "-r host Remote; remote exection is performed on "host"."
|
||||
printf "%s\n" "-s Strict; configure --with-strict-checking,"
|
||||
printf " followed by make struct, IJ, all, beta(no execute option).\n"
|
||||
printf " followed by make struct, IJ, all(no execute option).\n"
|
||||
printf "%s\n" "-v text Additional test to prefix to email subject line."
|
||||
printf "%s\n" "-x BetaC++; make beta++ (no configure, or execute)."
|
||||
printf "%s\n" "-y BetaF77; make beta77 (no configure, or execute)."
|
||||
}
|
||||
|
||||
#=============================================================================
|
||||
@ -247,14 +240,14 @@ mail_summary () {
|
||||
printf "Directory: %s\n" ${HYPRE_AUTOTEST_DIR} >> $SUMFILE
|
||||
printf "%s\n" "--------------------------------------------" >> $SUMFILE
|
||||
printf "Compile summary: Status: Warnings: Errors\n" >> $SUMFILE
|
||||
for ConfOpt in default beta no_mpi openmp petac \
|
||||
pthreads insure purify strict_checking \
|
||||
docs all++ all77 beta++ beta77
|
||||
for ConfOpt in default no_mpi openmp \
|
||||
insure purify strict_checking \
|
||||
docs all++ all77
|
||||
do
|
||||
printf "%-15s: " $ConfOpt >> $SUMFILE
|
||||
TestCaseSuccessCount=0; TestCaseFailedCount=0;
|
||||
DWRNCNT=0; DERRCNT=0;
|
||||
for MakeOpt in "" all beta configure IJ fei++ \
|
||||
for MakeOpt in "" all configure IJ fei++ \
|
||||
fei nofei sstruct struct
|
||||
do
|
||||
FILE=autotest.$ConfOpt.$MakeOpt
|
||||
@ -545,9 +538,6 @@ if [ ${BuildOpt} -ne $Skip ] ; then
|
||||
makeit "all" $MessageStr "$HYPRE_DEFAULT_EMAIL"
|
||||
fi
|
||||
|
||||
if [ $BetaOpt -ne $Skip ] ; then
|
||||
makeit "beta" $MessageStr "$HYPRE_DEFAULT_EMAIL"
|
||||
fi
|
||||
fi
|
||||
if [ ${BuildOpt} -eq $Run ] ; then
|
||||
echo "Autotest starting execution of $MessageStr"
|
||||
|
||||
@ -65,53 +65,6 @@ LFLAGS =\
|
||||
${BLASLIBFLAGS} \
|
||||
${MPILIBFLAGS} ${LIBFLAGS} ${LDLIBFLAGS}
|
||||
|
||||
###########################################
|
||||
# Beta definitions
|
||||
###########################################
|
||||
|
||||
BETA_CFLAGS = ${CFLAGS}
|
||||
|
||||
BETA_LFLAGS =\
|
||||
${LD_LINK_FLAGS}\
|
||||
-L../hypre/lib\
|
||||
-lHYPRE_sstruct_ls\
|
||||
-lHYPRE_sstruct_mv\
|
||||
-lHYPRE_struct_ls\
|
||||
-lHYPRE_struct_mv\
|
||||
-lHYPRE_parcsr_ls\
|
||||
-lHYPRE_DistributedMatrixPilutSolver \
|
||||
-lHYPRE_ParaSails \
|
||||
-lHYPRE_Euclid \
|
||||
-lHYPRE_MatrixMatrix \
|
||||
-lHYPRE_DistributedMatrix \
|
||||
-lHYPRE_IJ_mv\
|
||||
-lHYPRE_parcsr_mv\
|
||||
-lHYPRE_seq_mv\
|
||||
-lHYPRE_krylov\
|
||||
-lHYPRE_utilities\
|
||||
${BLASLIBFLAGS} \
|
||||
${MPILIBFLAGS} ${LIBFLAGS} ${LDLIBFLAGS}
|
||||
|
||||
BETA77_LFLAGS =\
|
||||
${LD_LINK_FLAGS}\
|
||||
-L.\
|
||||
-L../hypre/lib\
|
||||
-lHYPRE_parcsr_ls\
|
||||
-lHYPRE_DistributedMatrixPilutSolver \
|
||||
-lHYPRE_ParaSails \
|
||||
-lHYPRE_Euclid \
|
||||
-lHYPRE_MatrixMatrix \
|
||||
-lHYPRE_DistributedMatrix \
|
||||
-lHYPRE_IJ_mv\
|
||||
-lHYPRE_parcsr_mv\
|
||||
-lHYPRE_seq_mv\
|
||||
-lHYPRE_struct_ls\
|
||||
-lHYPRE_struct_mv\
|
||||
-lHYPRE_utilities\
|
||||
-lHYPRE_krylov\
|
||||
${BLASLIBFLAGS} \
|
||||
${MPILIBFLAGS} ${LIBFLAGS} ${LDLIBFLAGS}
|
||||
|
||||
STRUCT_LFLAGS =\
|
||||
${LD_LINK_FLAGS}\
|
||||
-L../hypre/lib\
|
||||
@ -211,10 +164,6 @@ HYPRE_BABEL_DRIVERS_CXX =
|
||||
HYPRE_BABEL_DRIVERS_F77 =\
|
||||
f77_ij_b.f
|
||||
|
||||
HYPRE_BETA_DRIVERS =
|
||||
|
||||
HYPRE_BETA_DRIVERS_F77 =
|
||||
|
||||
#ifndef is gmake only, can't be used...
|
||||
#ifndef BABELLIBFLAGS
|
||||
HYPRE_DRIVERS = ${HYPRE_STANDARD_DRIVERS}
|
||||
@ -227,15 +176,11 @@ HYPRE_BETA_DRIVERS_F77 =
|
||||
HYPRE_DRIVER_OBJS=${HYPRE_DRIVERS:.c=.o}
|
||||
HYPRE_DRIVER_CXX_OBJS=${HYPRE_DRIVERS_CXX:.C=.o}
|
||||
HYPRE_DRIVER_F77_OBJS=${HYPRE_DRIVERS_F77:.f=.o}
|
||||
HYPRE_BETA_DRIVER_OBJS=${HYPRE_BETA_DRIVERS:.c=.o}
|
||||
HYPRE_BETA_DRIVER_F77_OBJS=${HYPRE_BETA_DRIVERS_F77:.f=.o}
|
||||
HYPRE_FEI_DRIVER_CXX_OBJS=${HYPRE_FEI_DRIVERS_CXX:.C=.o}
|
||||
|
||||
HYPRE_DRIVER_EXECS=${HYPRE_DRIVERS:.c=}
|
||||
HYPRE_DRIVER_CXX_EXECS=${HYPRE_DRIVERS_CXX:.C=}
|
||||
HYPRE_DRIVER_F77_EXECS=${HYPRE_DRIVERS_F77:.f=}
|
||||
HYPRE_BETA_DRIVER_EXECS=${HYPRE_BETA_DRIVERS:.c=}
|
||||
HYPRE_BETA_DRIVER_F77_EXECS=${HYPRE_BETA_DRIVERS_F77:.f=}
|
||||
HYPRE_FEI_DRIVER_CXX_EXECS=${HYPRE_FEI_DRIVERS_CXX:.C=}
|
||||
|
||||
HYPRE_BABEL_DRIVER_OBJS=${HYPRE_BABEL_DRIVERS:.c=.o}
|
||||
@ -252,14 +197,8 @@ all++: ${HYPRE_DRIVER_CXX_EXECS}
|
||||
|
||||
all77: ${HYPRE_DRIVER_F77_EXECS}
|
||||
|
||||
beta: all ${HYPRE_BETA_DRIVER_EXECS}
|
||||
|
||||
beta++: all++
|
||||
|
||||
fei++: ${HYPRE_FEI_DRIVER_CXX_EXECS}
|
||||
|
||||
beta77: all77 ${HYPRE_BETA_DRIVER_F77_EXECS}
|
||||
|
||||
babel: ${HYPRE_BABEL_DRIVER_EXECS} ${HYPRE_BABEL_DRIVER_F77_EXECS}
|
||||
|
||||
install:
|
||||
@ -274,8 +213,6 @@ veryclean: clean
|
||||
@rm -f ${HYPRE_BABEL_DRIVER_EXECS}
|
||||
@rm -f ${HYPRE_BABEL_DRIVER_CXX_EXECS}
|
||||
@rm -f ${HYPRE_BABEL_DRIVER_F77_EXECS}
|
||||
@rm -f ${HYPRE_BETA_DRIVER_EXECS}
|
||||
@rm -f ${HYPRE_BETA_DRIVER_F77_EXECS}
|
||||
@rm -f ${HYPRE_FEI_DRIVER_CXX_EXECS}
|
||||
|
||||
##################################################################
|
||||
@ -367,18 +304,6 @@ ${HYPRE_BABEL_DRIVER_F77_EXECS}: ${HYPRE_BABEL_DRIVER_F77_OBJS}
|
||||
@echo "Building" $@ "... "
|
||||
${F77} -o $@ $@.o ${FFLAGS} ${BABELLIBFLAGS} ${LFLAGS}
|
||||
|
||||
##################################################################
|
||||
# Beta rules
|
||||
##################################################################
|
||||
|
||||
#${HYPRE_BETA_DRIVER_EXECS}: ${HYPRE_BETA_DRIVER_OBJS}
|
||||
# @echo "Building" $@ "... "
|
||||
# ${CC} -o $@ $@.o ${BETA_CFLAGS} ${BETA_LFLAGS}
|
||||
|
||||
#${HYPRE_BETA_DRIVER_F77_EXECS}: ${HYPRE_BETA_DRIVER_F77_OBJS}
|
||||
# @echo "Building" $@ "... "
|
||||
# ${F77} -o $@ $@.o ${FFLAGS} ${BETA77_LFLAGS}
|
||||
|
||||
##################################################################
|
||||
# Generic rules
|
||||
##################################################################
|
||||
|
||||
Loading…
Reference in New Issue
Block a user