fdurastante
/
amg4psblas
mirror of https://github.com/sfilippone/amg4psblas.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes for new cbind-version of psblas 3.5.0

Browse Source
stopcriterion
Salvatore Filippone 7 years ago
parent 58ec101e16
commit fc7ed00981
15 changed files with 6155 additions and 2929 deletions
Show Stats Download Patch File Download Diff File

2
Make.inc.in
Unescape Escape View File

@ -11,6 +11,7 @@
########################################################## ##########################################################
PSBLASDIR=@PSBLAS_DIR@ PSBLASDIR=@PSBLAS_DIR@
PSBLAS_INCDIR=@PSBLAS_INCDIR@ PSBLAS_INCDIR=@PSBLAS_INCDIR@
PSBLAS_MODDIR=@PSBLAS_MODDIR@
@PSBLAS_INSTALL_MAKEINC@ @PSBLAS_INSTALL_MAKEINC@
PSBLAS_INCLUDES=@PSBLAS_INCLUDES@ PSBLAS_INCLUDES=@PSBLAS_INCLUDES@
PSBLAS_LIBS=@PSBLAS_LIBS@ PSBLAS_LIBS=@PSBLAS_LIBS@
@ -23,6 +24,7 @@ INSTALL_DATA=@INSTALL_DATA@
INSTALL_DIR=@INSTALL_DIR@ INSTALL_DIR=@INSTALL_DIR@
INSTALL_LIBDIR=@INSTALL_LIBDIR@ INSTALL_LIBDIR=@INSTALL_LIBDIR@
INSTALL_INCLUDEDIR=@INSTALL_INCLUDEDIR@ INSTALL_INCLUDEDIR=@INSTALL_INCLUDEDIR@
INSTALL_MODULESDIR=@INSTALL_MODULESDIR@
INSTALL_DOCSDIR=@INSTALL_DOCSDIR@ INSTALL_DOCSDIR=@INSTALL_DOCSDIR@
INSTALL_SAMPLESDIR=@INSTALL_SAMPLESDIR@ INSTALL_SAMPLESDIR=@INSTALL_SAMPLESDIR@

5
Makefile
Unescape Escape View File

@ -8,6 +8,7 @@ library: libdir mlp
libdir: libdir:
(if test ! -d lib ; then mkdir lib; fi) (if test ! -d lib ; then mkdir lib; fi)
(if test ! -d include ; then mkdir include; fi) (if test ! -d include ; then mkdir include; fi)
(if test ! -d modules ; then mkdir modules; fi;)
($(INSTALL_DATA) Make.inc include/Make.inc.mld2p4) ($(INSTALL_DATA) Make.inc include/Make.inc.mld2p4)
@ -19,12 +20,12 @@ install: all
$(INSTALL_DATA) Make.inc $(INSTALL_DIR)/Make.inc.MLD2P4) $(INSTALL_DATA) Make.inc $(INSTALL_DIR)/Make.inc.MLD2P4)
(./mkdir.sh $(INSTALL_LIBDIR) &&\ (./mkdir.sh $(INSTALL_LIBDIR) &&\
$(INSTALL_DATA) lib/*.a $(INSTALL_LIBDIR)) $(INSTALL_DATA) lib/*.a $(INSTALL_LIBDIR))
(./mkdir.sh $(INSTALL_INCLUDEDIR) && \
$(INSTALL_DATA) include/*$(.mod) $(INSTALL_INCLUDEDIR))
(./mkdir.sh $(INSTALL_INCLUDEDIR) &&\ (./mkdir.sh $(INSTALL_INCLUDEDIR) &&\
$(INSTALL_DATA) Make.inc $(INSTALL_INCLUDEDIR)/Make.inc.mld2p4) $(INSTALL_DATA) Make.inc $(INSTALL_INCLUDEDIR)/Make.inc.mld2p4)
(./mkdir.sh $(INSTALL_INCLUDEDIR) && \ (./mkdir.sh $(INSTALL_INCLUDEDIR) && \
$(INSTALL_DATA) include/*.h $(INSTALL_INCLUDEDIR)) $(INSTALL_DATA) include/*.h $(INSTALL_INCLUDEDIR))
(./mkdir.sh $(INSTALL_MODULESDIR) && \
$(INSTALL_DATA) modules/*$(.mod) $(INSTALL_MODULESDIR))
(./mkdir.sh $(INSTALL_DOCSDIR) && \ (./mkdir.sh $(INSTALL_DOCSDIR) && \
/bin/cp -fr docs/*pdf docs/html $(INSTALL_DOCSDIR)) /bin/cp -fr docs/*pdf docs/html $(INSTALL_DOCSDIR))
(./mkdir.sh $(INSTALL_DOCSDIR) && \ (./mkdir.sh $(INSTALL_DOCSDIR) && \

15
config/pac.m4
Unescape Escape View File

@ -314,15 +314,21 @@ AC_HELP_STRING([--with-psblas=DIR], [The install directory for PSBLAS, for examp
--with-psblas=/opt/packages/psblas-3.5]), --with-psblas=/opt/packages/psblas-3.5]),
[pac_cv_psblas_dir=$withval], [pac_cv_psblas_dir=$withval],
[pac_cv_psblas_dir='']) [pac_cv_psblas_dir=''])
AC_ARG_WITH(psblas-incdir, AC_HELP_STRING([--with-psblas-incdir=DIR], [Specify the directory for PSBLAS includes.]), AC_ARG_WITH(psblas-incdir, AC_HELP_STRING([--with-psblas-incdir=DIR], [Specify the directory for PSBLAS C includes.]),
[pac_cv_psblas_incdir=$withval], [pac_cv_psblas_incdir=$withval],
[pac_cv_psblas_incdir='']) [pac_cv_psblas_incdir=''])
AC_ARG_WITH(psblas-moddir, AC_HELP_STRING([--with-psblas-moddir=DIR], [Specify the directory for PSBLAS Fortran modules.]),
[pac_cv_psblas_moddir=$withval],
[pac_cv_psblas_moddir=''])
AC_ARG_WITH(psblas-libdir, AC_HELP_STRING([--with-psblas-libdir=DIR], [Specify the directory for PSBLAS library.]), AC_ARG_WITH(psblas-libdir, AC_HELP_STRING([--with-psblas-libdir=DIR], [Specify the directory for PSBLAS library.]),
[pac_cv_psblas_libdir=$withval], [pac_cv_psblas_libdir=$withval],
[pac_cv_psblas_libdir='']) [pac_cv_psblas_libdir=''])
if test x"$pac_cv_psblas_incdir" == "x" ; then if test x"$pac_cv_psblas_incdir" == "x" ; then
pac_cv_psblas_incdir="$pac_cv_psblas_dir/include"; pac_cv_psblas_incdir="$pac_cv_psblas_dir/include";
fi fi
if test x"$pac_cv_psblas_moddir" == "x" ; then
pac_cv_psblas_moddir="$pac_cv_psblas_dir/modules";
fi
if test x"$pac_cv_psblas_libdir" == "x" ; then if test x"$pac_cv_psblas_libdir" == "x" ; then
pac_cv_psblas_libdir="$pac_cv_psblas_dir/lib"; pac_cv_psblas_libdir="$pac_cv_psblas_dir/lib";
fi fi
@ -356,6 +362,13 @@ dnl AC_MSG_NOTICE([psblas include dir $pac_cv_psblas_incdir])
elif test "x$pac_cv_psblas_dir" != "x"; then elif test "x$pac_cv_psblas_dir" != "x"; then
dnl AC_MSG_NOTICE([psblas dir $pac_cv_psblas_dir]) dnl AC_MSG_NOTICE([psblas dir $pac_cv_psblas_dir])
PSBLAS_INCLUDES="$FMFLAG$pac_cv_psblas_dir/include" PSBLAS_INCLUDES="$FMFLAG$pac_cv_psblas_dir/include"
fi
if test "x$pac_cv_psblas_moddir" != "x"; then
dnl AC_MSG_NOTICE([psblas modules dir $pac_cv_psblas_moddir])
PSBLAS_INCLUDES="$FMFLAG$pac_cv_psblas_moddir $PSBLAS_INCLUDES"
elif test "x$pac_cv_psblas_dir" != "x"; then
dnl AC_MSG_NOTICE([psblas dir $pac_cv_psblas_dir])
PSBLAS_INCLUDES="$FMFLAG$pac_cv_psblas_dir/modules $PSBLAS_INCLUDES"
fi fi
FCFLAGS=" $PSBLAS_INCLUDES $save_FCFLAGS" FCFLAGS=" $PSBLAS_INCLUDES $save_FCFLAGS"
AC_COMPILE_IFELSE([ AC_COMPILE_IFELSE([

9023
configure vendored
View File

File diff suppressed because it is too large Load Diff

6
configure.ac
Unescape Escape View File

@ -64,6 +64,7 @@ dnl NOTE : no spaces before the comma, and no brackets before the second argumen
PAC_ARG_WITH_PSBLAS PAC_ARG_WITH_PSBLAS
PSBLAS_DIR="$pac_cv_psblas_dir"; PSBLAS_DIR="$pac_cv_psblas_dir";
PSBLAS_INCDIR="$pac_cv_psblas_incdir"; PSBLAS_INCDIR="$pac_cv_psblas_incdir";
PSBLAS_MODDIR="$pac_cv_psblas_moddir";
PSBLAS_LIBDIR="$pac_cv_psblas_libdir"; PSBLAS_LIBDIR="$pac_cv_psblas_libdir";
AC_MSG_CHECKING([for PSBLAS install dir]) AC_MSG_CHECKING([for PSBLAS install dir])
if test "X$PSBLAS_DIR" != "X" ; then if test "X$PSBLAS_DIR" != "X" ; then
@ -109,6 +110,7 @@ case $includedir in
\/* ) eval "INSTALL_INCLUDEDIR=$includedir";; \/* ) eval "INSTALL_INCLUDEDIR=$includedir";;
* ) eval "INSTALL_INCLUDEDIR=$INSTALL_DIR/include";; * ) eval "INSTALL_INCLUDEDIR=$INSTALL_DIR/include";;
esac esac
INSTALL_MODULESDIR=$INSTALL_DIR/modules
case $docsdir in case $docsdir in
\/* ) eval "INSTALL_DOCSDIR=$docsdir";; \/* ) eval "INSTALL_DOCSDIR=$docsdir";;
* ) eval "INSTALL_DOCSDIR=$INSTALL_DIR/docs";; * ) eval "INSTALL_DOCSDIR=$INSTALL_DIR/docs";;
@ -117,7 +119,7 @@ case $samplesdir in
\/* ) eval "INSTALL_SAMPLESDIR=$samplesdir";; \/* ) eval "INSTALL_SAMPLESDIR=$samplesdir";;
* ) eval "INSTALL_SAMPLESDIR=$INSTALL_DIR/samples";; * ) eval "INSTALL_SAMPLESDIR=$INSTALL_DIR/samples";;
esac esac
AC_MSG_RESULT([$INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR $INSTALL_DOCSDIR $INSTALL_SAMPLESDIR]) AC_MSG_RESULT([$INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_MODULESDIR $INSTALL_LIBDIR $INSTALL_DOCSDIR $INSTALL_SAMPLESDIR])
dnl dnl
dnl We set our own FC flags, ignore those from AC_PROG_FC but not those from the dnl We set our own FC flags, ignore those from AC_PROG_FC but not those from the
@ -719,6 +721,7 @@ fi
AC_SUBST(PSBLAS_DIR) AC_SUBST(PSBLAS_DIR)
AC_SUBST(PSBLAS_INCDIR) AC_SUBST(PSBLAS_INCDIR)
AC_SUBST(PSBLAS_MODDIR)
AC_SUBST(PSBLAS_INCLUDES) AC_SUBST(PSBLAS_INCLUDES)
AC_SUBST(PSBLAS_INSTALL_MAKEINC) AC_SUBST(PSBLAS_INSTALL_MAKEINC)
AC_SUBST(PSBLAS_LIBS) AC_SUBST(PSBLAS_LIBS)
@ -728,6 +731,7 @@ AC_SUBST(INSTALL_DATA)
AC_SUBST(INSTALL_DIR) AC_SUBST(INSTALL_DIR)
AC_SUBST(INSTALL_LIBDIR) AC_SUBST(INSTALL_LIBDIR)
AC_SUBST(INSTALL_INCLUDEDIR) AC_SUBST(INSTALL_INCLUDEDIR)
AC_SUBST(INSTALL_MODULESDIR)
AC_SUBST(INSTALL_DOCSDIR) AC_SUBST(INSTALL_DOCSDIR)
AC_SUBST(INSTALL_SAMPLESDIR) AC_SUBST(INSTALL_SAMPLESDIR)

3
examples/fileread/Makefile
Unescape Escape View File

@ -1,9 +1,10 @@
MLDDIR=../.. MLDDIR=../..
MLDINCDIR=$(MLDDIR)/include MLDINCDIR=$(MLDDIR)/include
include $(MLDINCDIR)/Make.inc.mld2p4 include $(MLDINCDIR)/Make.inc.mld2p4
MLDMODDIR=$(MLDDIR)/modules
MLDLIBDIR=$(MLDDIR)/lib MLDLIBDIR=$(MLDDIR)/lib
MLD_LIBS=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec MLD_LIBS=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec
FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG). FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDMODDIR) $(FMFLAG)$(MLDINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG).
LINKOPT= LINKOPT=
DMOBJS=mld_dexample_ml.o data_input.o DMOBJS=mld_dexample_ml.o data_input.o

3
examples/pdegen/Makefile
Unescape Escape View File

@ -1,9 +1,10 @@
MLDDIR=../.. MLDDIR=../..
MLDINCDIR=$(MLDDIR)/include MLDINCDIR=$(MLDDIR)/include
include $(MLDINCDIR)/Make.inc.mld2p4 include $(MLDINCDIR)/Make.inc.mld2p4
MLDMODDIR=$(MLDDIR)/modules
MLDLIBDIR=$(MLDDIR)/lib MLDLIBDIR=$(MLDDIR)/lib
MLD_LIBS=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec MLD_LIBS=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec
FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG). FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDMODDIR) $(FMFLAG)$(MLDINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG).
LINKOPT= LINKOPT=
DMOBJS=mld_dexample_ml.o data_input.o mld_dpde_mod.o DMOBJS=mld_dexample_ml.o data_input.o mld_dpde_mod.o

6
mlprec/Makefile
Unescape Escape View File

@ -1,6 +1,7 @@
include ../Make.inc include ../Make.inc
LIBDIR=../lib LIBDIR=../lib
INCDIR=../include INCDIR=../include
MODDIR=../modules
HERE=. HERE=.
FINCLUDES=$(FMFLAG)$(HERE) $(FMFLAG)$(INCDIR) $(PSBLAS_INCLUDES) FINCLUDES=$(FMFLAG)$(HERE) $(FMFLAG)$(INCDIR) $(PSBLAS_INCLUDES)
@ -51,10 +52,11 @@ lib: $(OBJS) impld
$(AR) $(HERE)/$(LIBNAME) $(OBJS) $(AR) $(HERE)/$(LIBNAME) $(OBJS)
$(RANLIB) $(HERE)/$(LIBNAME) $(RANLIB) $(HERE)/$(LIBNAME)
/bin/cp -p $(HERE)/$(LIBNAME) $(LIBDIR) /bin/cp -p $(HERE)/$(LIBNAME) $(LIBDIR)
/bin/cp -p *$(.mod) mld_const.h $(INCDIR) /bin/cp -p mld_const.h $(INCDIR)
/bin/cp -p *$(.mod) $(MODDIR)
$(MODOBJS): $(PSBLAS_INCDIR)/$(BASEMODNAME)$(.mod) $(MODOBJS): $(PSBLAS_MODDIR)/$(BASEMODNAME)$(.mod)
mld_base_prec_type.o: mld_const.h mld_base_prec_type.o: mld_const.h
mld_s_prec_type.o mld_d_prec_type.o mld_c_prec_type.o mld_z_prec_type.o : mld_base_prec_type.o mld_s_prec_type.o mld_d_prec_type.o mld_c_prec_type.o mld_z_prec_type.o : mld_base_prec_type.o

3
mlprec/impl/Makefile
Unescape Escape View File

@ -1,9 +1,10 @@
include ../../Make.inc include ../../Make.inc
LIBDIR=../../lib LIBDIR=../../lib
INCDIR=../../include INCDIR=../../include
MODDIR=../../modules
HERE=.. HERE=..
FINCLUDES=$(FMFLAG)$(HERE) $(FMFLAG)$(INCDIR) $(PSBLAS_INCLUDES) FINCLUDES=$(FMFLAG)$(HERE) $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) $(PSBLAS_INCLUDES)

3
mlprec/impl/level/Makefile
Unescape Escape View File

@ -1,9 +1,10 @@
include ../../../Make.inc include ../../../Make.inc
LIBDIR=../../../lib LIBDIR=../../../lib
INCDIR=../../../include INCDIR=../../../include
MODDIR=../../../modules
HERE=../.. HERE=../..
FINCLUDES=$(FMFLAG)$(HERE) $(FMFLAG)$(INCDIR) $(PSBLAS_INCLUDES) FINCLUDES=$(FMFLAG)$(HERE) $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) $(PSBLAS_INCLUDES)

3
mlprec/impl/smoother/Makefile
Unescape Escape View File

@ -1,8 +1,9 @@
include ../../../Make.inc include ../../../Make.inc
LIBDIR=../../../lib LIBDIR=../../../lib
INCDIR=../../../include INCDIR=../../../include
MODDIR=../../../modules
HERE=../.. HERE=../..
FINCLUDES=$(FMFLAG)$(HERE) $(FMFLAG)$(INCDIR) $(PSBLAS_INCLUDES) FINCLUDES=$(FMFLAG)$(HERE) $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) $(PSBLAS_INCLUDES)

3
mlprec/impl/solver/Makefile
Unescape Escape View File

@ -1,8 +1,9 @@
include ../../../Make.inc include ../../../Make.inc
LIBDIR=../../../lib LIBDIR=../../../lib
INCDIR=../../../include INCDIR=../../../include
MODDIR=../../../modules
HERE=../.. HERE=../..
FINCLUDES=$(FMFLAG)$(HERE) $(FMFLAG)$(INCDIR) $(PSBLAS_INCLUDES) FINCLUDES=$(FMFLAG)$(HERE) $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) $(PSBLAS_INCLUDES)

3
tests/fileread/Makefile
Unescape Escape View File

@ -1,9 +1,10 @@
MLDDIR=../.. MLDDIR=../..
MLDINCDIR=$(MLDDIR)/include MLDINCDIR=$(MLDDIR)/include
include $(MLDINCDIR)/Make.inc.mld2p4 include $(MLDINCDIR)/Make.inc.mld2p4
MLDMODDIR=$(MLDDIR)/modules
MLDLIBDIR=$(MLDDIR)/lib MLDLIBDIR=$(MLDDIR)/lib
MLD_LIBS=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec MLD_LIBS=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec
FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG). FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDMODDIR) $(FMFLAG)$(MLDINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG).
DFSOBJS=mld_df_sample.o data_input.o DFSOBJS=mld_df_sample.o data_input.o
SFSOBJS=mld_sf_sample.o data_input.o SFSOBJS=mld_sf_sample.o data_input.o

3
tests/newslv/Makefile
Unescape Escape View File

@ -1,9 +1,10 @@
MLDDIR=../.. MLDDIR=../..
MLDINCDIR=$(MLDDIR)/include MLDINCDIR=$(MLDDIR)/include
include $(MLDINCDIR)/Make.inc.mld2p4 include $(MLDINCDIR)/Make.inc.mld2p4
MLDMODDIR=$(MLDDIR)/modules
MLDLIBDIR=$(MLDDIR)/lib MLDLIBDIR=$(MLDDIR)/lib
MLD_LIBS=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec MLD_LIBS=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec
FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG). FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDMODDIR) $(FMFLAG)$(MLDINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG).
PD3DOBJS=mld_pde3d_newslv.o data_input.o mld_d_tlu_solver.o mld_d_tlu_solver_impl.o PD3DOBJS=mld_pde3d_newslv.o data_input.o mld_d_tlu_solver.o mld_d_tlu_solver_impl.o
PSOBJS=spde.o data_input.o PSOBJS=spde.o data_input.o

3
tests/pdegen/Makefile
Unescape Escape View File

@ -1,9 +1,10 @@
MLDDIR=../.. MLDDIR=../..
MLDINCDIR=$(MLDDIR)/include MLDINCDIR=$(MLDDIR)/include
include $(MLDINCDIR)/Make.inc.mld2p4 include $(MLDINCDIR)/Make.inc.mld2p4
MLDMODDIR=$(MLDDIR)/modules
MLDLIBDIR=$(MLDDIR)/lib MLDLIBDIR=$(MLDDIR)/lib
MLD_LIBS=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec MLD_LIBS=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec
FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG). FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDMODDIR) $(FMFLAG)$(MLDINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG).
LINKOPT= LINKOPT=
EXEDIR=./runs EXEDIR=./runs

Write Preview
Loading…
Cancel
Save