From a7e74e914ceb0044dcd8d28cadf57c67b764bdd6 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 14 Nov 2013 09:41:25 +0000 Subject: [PATCH] psblas3: Make.inc.in base/Makefile base/comm/Makefile base/internals/Makefile base/psblas/Makefile base/serial/Makefile base/serial/aux/Makefile base/serial/f77/Makefile base/serial/impl/Makefile base/tools/Makefile config/pac.m4 configure.ac configure krylov/Makefile prec/Makefile prec/impl/Makefile test/fileread/Makefile test/kernel/Makefile test/pargen/Makefile test/pargen/runs/ppde.inp test/util/Makefile util/Makefile Updated configry and makefile stuff --- Make.inc.in | 1 + base/Makefile | 3 +- base/comm/Makefile | 3 +- base/internals/Makefile | 3 +- base/psblas/Makefile | 3 +- base/serial/Makefile | 3 +- base/serial/aux/Makefile | 6 ++-- base/serial/f77/Makefile | 6 ++-- base/serial/impl/Makefile | 5 ++- base/tools/Makefile | 3 +- config/pac.m4 | 8 +++++ configure | 65 +++++++++++++++++++++++++++++++++++++-- configure.ac | 7 ++++- krylov/Makefile | 13 ++++---- prec/Makefile | 7 +++-- prec/impl/Makefile | 3 +- test/fileread/Makefile | 8 +++-- test/kernel/Makefile | 14 ++++----- test/pargen/Makefile | 15 ++++----- test/pargen/runs/ppde.inp | 2 +- test/util/Makefile | 14 ++++----- util/Makefile | 9 +++--- 22 files changed, 138 insertions(+), 63 deletions(-) diff --git a/Make.inc.in b/Make.inc.in index bcb496e1..5ff454bf 100755 --- a/Make.inc.in +++ b/Make.inc.in @@ -49,6 +49,7 @@ INSTALL_DIR=@INSTALL_DIR@ INSTALL_LIBDIR=@INSTALL_LIBDIR@ INSTALL_INCLUDEDIR=@INSTALL_INCLUDEDIR@ INSTALL_DOCSDIR=@INSTALL_DOCSDIR@ +INSTALL_SAMPLESDIR=@INSTALL_SAMPLESDIR@ # the following is the flag for /bin/cp which shall copy the file only for updating (timestamp based)--on GNU Linux, '-u' CPUPDFLAG= diff --git a/base/Makefile b/base/Makefile index e40788d8..96bfb8fd 100644 --- a/base/Makefile +++ b/base/Makefile @@ -2,11 +2,12 @@ include ../Make.inc HERE=. LIBDIR=../lib +INCDIR=../include LIBNAME=$(BASELIBNAME) lib: mods sr cm in pb tl /bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR) - /bin/cp -p $(CPUPDFLAG) *$(.mod) $(LIBDIR) + /bin/cp -p $(CPUPDFLAG) *$(.mod) $(INCDIR) sr cm in pb tl: mods diff --git a/base/comm/Makefile b/base/comm/Makefile index 598ab0c2..bbe769c5 100644 --- a/base/comm/Makefile +++ b/base/comm/Makefile @@ -10,8 +10,9 @@ OBJS = psb_dgather.o psb_dhalo.o psb_dovrl.o \ MPFOBJS=psb_dscatter.o psb_zscatter.o psb_iscatter.o psb_cscatter.o psb_sscatter.o\ psb_dspgather.o psb_sspgather.o psb_zspgather.o psb_cspgather.o LIBDIR=.. +INCDIR=.. MODDIR=../modules -FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) lib: mpfobjs $(OBJS) $(AR) $(LIBDIR)/$(LIBNAME) $(MPFOBJS) $(OBJS) diff --git a/base/internals/Makefile b/base/internals/Makefile index d1f37493..3b38f85c 100644 --- a/base/internals/Makefile +++ b/base/internals/Makefile @@ -18,8 +18,9 @@ MPFOBJS = psi_dswapdata.o psi_dswaptran.o\ psi_desc_index.o psi_extrct_dl.o \ psi_fnd_owner.o psb_indx_map_fnd_owner.o LIBDIR=.. +INCDIR=.. MODDIR=../modules -FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) CINCLUDES=-I. lib: mpfobjs $(FOBJS) $(FOBJS2) $(COBJS) $(MPFOBJS2) $(MPFOBJS) diff --git a/base/psblas/Makefile b/base/psblas/Makefile index e1bfd789..44eb67ee 100644 --- a/base/psblas/Makefile +++ b/base/psblas/Makefile @@ -13,8 +13,9 @@ OBJS= psb_ddot.o psb_damax.o psb_dasum.o psb_daxpby.o\ LIBDIR=.. +INCDIR=.. MODDIR=../modules -FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) lib: $(OBJS) diff --git a/base/serial/Makefile b/base/serial/Makefile index 764d481c..e8572326 100644 --- a/base/serial/Makefile +++ b/base/serial/Makefile @@ -12,8 +12,9 @@ FOBJS = psb_lsame.o psi_serial_impl.o psb_sort_impl.o \ psb_sasum_s.o psb_dasum_s.o psb_casum_s.o psb_zasum_s.o LIBDIR=.. +INCDIR=.. MODDIR=../modules -FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) lib: auxd f77d impld lib1 $(FOBJS) $(AR) $(LIBDIR)/$(LIBNAME) $(FOBJS) diff --git a/base/serial/aux/Makefile b/base/serial/aux/Makefile index 134a5782..4379b732 100644 --- a/base/serial/aux/Makefile +++ b/base/serial/aux/Makefile @@ -19,11 +19,11 @@ OBJS=$(FOBJS) # # Where the library should go, and how it is called. -# Note that we are regenerating most of libsparker.a on the fly. -SPARKERDIR=.. +# LIBDIR=../.. +INCDIR=../.. MODDIR=../../modules -FINCLUDES=$(FMFLAG). $(FMFLAG)$(SPARKERDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) # # No change should be needed below diff --git a/base/serial/f77/Makefile b/base/serial/f77/Makefile index a8ae7e70..21f854c0 100644 --- a/base/serial/f77/Makefile +++ b/base/serial/f77/Makefile @@ -12,12 +12,10 @@ OBJS=$(FOBJS) # # Where the library should go, and how it is called. # Note that we are regenerating most of libsparker.a on the fly. -SPARKERDIR=.. LIBDIR=../.. +INCDIR=../.. MODDIR=../../modules -FINCLUDES=$(FMFLAG). $(FMFLAG)$(SPARKERDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) -#LIBNAME=libsparker.a -#LIBNAME=$(BASELIBNAME) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) LIBFILE=$(LIBDIR)/$(LIBNAME) # diff --git a/base/serial/impl/Makefile b/base/serial/impl/Makefile index c8513fcb..efb03657 100644 --- a/base/serial/impl/Makefile +++ b/base/serial/impl/Makefile @@ -14,11 +14,10 @@ OBJS=$(BOBJS) $(SOBJS) $(DOBJS) $(COBJS) $(ZOBJS) # # Where the library should go, and how it is called. # Note that we are regenerating most of libsparker.a on the fly. -SPARKERDIR=.. LIBDIR=../.. +INCDIR=../.. MODDIR=../../modules -FINCLUDES=$(FMFLAG). $(FMFLAG)$(SPARKERDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) -#LIBNAME=libsparker.a +FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) LIBFILE=$(LIBDIR)/$(LIBNAME) # diff --git a/base/tools/Makefile b/base/tools/Makefile index f9d03099..e5e86f3d 100644 --- a/base/tools/Makefile +++ b/base/tools/Makefile @@ -25,8 +25,9 @@ MPFOBJS = psb_icdasb.o psb_ssphalo.o psb_dsphalo.o psb_csphalo.o psb_zsphalo.o psb_dcdbldext.o psb_zcdbldext.o psb_scdbldext.o psb_ccdbldext.o LIBDIR=.. +INCDIR=.. MODDIR=../modules -FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) $(FIFLAG)$(MODDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) $(FIFLAG)$(MODDIR) lib: mpfobjs $(FOBJS) $(AR) $(LIBDIR)/$(LIBNAME) $(MPFOBJS) $(FOBJS) diff --git a/config/pac.m4 b/config/pac.m4 index 64476509..5f636928 100644 --- a/config/pac.m4 +++ b/config/pac.m4 @@ -1832,6 +1832,14 @@ if test "x$pac_metis_header_ok" == "xyes" ; then AC_MSG_RESULT($pac_metis_lib_ok) fi fi +if test "x$pac_metis_lib_ok" == "xyes" ; then + AC_MSG_CHECKING([for METIS_SetDefaultOptions in $LIBS]) + AC_TRY_LINK_FUNC(METIS_SetDefaultOptions, + [psblas_cv_have_metis=yes;pac_metis_lib_ok=yes; ], + [psblas_cv_have_metis=no;pac_metis_lib_ok="no. Unusable METIS version, sorry."; METIS_LIBS=""]) + AC_MSG_RESULT($pac_metis_lib_ok) +fi + LIBS="$SAVE_LIBS"; CPPFLAGS="$SAVE_CPPFLAGS"; ])dnl diff --git a/configure b/configure index d12bd565..839c67a8 100755 --- a/configure +++ b/configure @@ -10109,11 +10109,72 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ $as_echo "$pac_metis_lib_ok" >&6; } fi fi +if test "x$pac_metis_lib_ok" == "xyes" ; then + { $as_echo "$as_me:$LINENO: checking for METIS_SetDefaultOptions in $LIBS" >&5 +$as_echo_n "checking for METIS_SetDefaultOptions in $LIBS... " >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char METIS_SetDefaultOptions (); +int +main () +{ +return METIS_SetDefaultOptions (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + psblas_cv_have_metis=yes;pac_metis_lib_ok=yes; +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + psblas_cv_have_metis=no;pac_metis_lib_ok="no. Unusable METIS version, sorry."; METIS_LIBS="" +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:$LINENO: result: $pac_metis_lib_ok" >&5 +$as_echo "$pac_metis_lib_ok" >&6; } +fi + LIBS="$SAVE_LIBS"; CPPFLAGS="$SAVE_CPPFLAGS"; if test "x$psblas_cv_have_metis" == "xyes" ; then - FDEFINES="$mld_cv_define_prepend-DHAVE_METIS $FDEFINES" + FDEFINES="$psblas_cv_define_prepend-DHAVE_METIS $FDEFINES" CDEFINES="-DHAVE_METIS_ $psblas_cv_metis_includes $CDEFINES" fi @@ -10801,7 +10862,7 @@ LIBS="$SAVE_LIBS"; CPPFLAGS="$SAVE_CPPFLAGS"; if test "x$psblas_cv_have_amd" == "xyes" ; then - FDEFINES="$mld_cv_define_prepend-DHAVE_AMD $FDEFINES" + FDEFINES="$psblas_cv_define_prepend-DHAVE_AMD $FDEFINES" CDEFINES="-DHAVE_AMD_ $psblas_cv_amd_includes $CDEFINES" fi diff --git a/configure.ac b/configure.ac index e3adbc47..dfedf8c7 100755 --- a/configure.ac +++ b/configure.ac @@ -88,7 +88,11 @@ case $docsdir in \/* ) eval "INSTALL_DOCSDIR=$docsdir";; * ) eval "INSTALL_DOCSDIR=$INSTALL_DIR/docs";; esac -AC_MSG_RESULT([$INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR $INSTALL_DOCSDIR]) +case $samplesdir in + \/* ) eval "INSTALL_SAMPLESDIR=$samplesdir";; + * ) eval "INSTALL_SAMPLESDIR=$INSTALL_DIR/samples";; +esac +AC_MSG_RESULT([$INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR $INSTALL_DOCSDIR $INSTALL_SAMPLESDIR]) # Note that the following line won't save from troubles. AC_PROG_FC([ftn xlf2003_r xlf2003 xlf95_r xlf95 xlf90 xlf pgf95 pgf90 ifort ifc nagfor gfortran]) @@ -770,6 +774,7 @@ AC_SUBST(INSTALL_DIR) AC_SUBST(INSTALL_LIBDIR) AC_SUBST(INSTALL_INCLUDEDIR) AC_SUBST(INSTALL_DOCSDIR) +AC_SUBST(INSTALL_SAMPLESDIR) AC_SUBST(BLAS_LIBS) AC_SUBST(AMD_LIBS) diff --git a/krylov/Makefile b/krylov/Makefile index e93f4ed9..8b531066 100644 --- a/krylov/Makefile +++ b/krylov/Makefile @@ -3,12 +3,11 @@ include ../Make.inc HERE=. LIBDIR=../lib +INCDIR=../include -#MODOBJS= psb_base_inner_krylov_mod.o \ -# psb_s_inner_krylov_mod.o psb_c_inner_krylov_mod.o psb_d_inner_krylov_mod.o psb_z_inner_krylov_mod.o \ -# psb_krylov_mod.o MODOBJS= psb_base_krylov_conv_mod.o \ - psb_s_krylov_conv_mod.o psb_c_krylov_conv_mod.o psb_d_krylov_conv_mod.o psb_z_krylov_conv_mod.o \ + psb_s_krylov_conv_mod.o psb_c_krylov_conv_mod.o \ + psb_d_krylov_conv_mod.o psb_z_krylov_conv_mod.o \ psb_krylov_mod.o F90OBJS=psb_dkrylov.o psb_skrylov.o psb_ckrylov.o psb_zkrylov.o \ psb_dcgstab.o psb_dcg.o psb_dcgs.o \ @@ -24,19 +23,19 @@ OBJS=$(F90OBJS) $(MODOBJS) LOCAL_MODS=$(MODOBJS:.o=$(.mod)) LIBNAME=$(METHDLIBNAME) -FINCLUDES=$(FMFLAG). $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(INCDIR) lib: $(OBJS) $(AR) $(HERE)/$(LIBNAME) $(OBJS) $(RANLIB) $(HERE)/$(LIBNAME) /bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR) - /bin/cp -p $(CPUPDFLAG) *$(.mod) $(LIBDIR) + /bin/cp -p $(CPUPDFLAG) *$(.mod) $(INCDIR) psb_s_krylov_conv_mod.o psb_c_krylov_conv_mod.o psb_d_krylov_conv_mod.o psb_z_krylov_conv_mod.o: psb_base_krylov_conv_mod.o psb_krylov_conv_mod.o: psb_s_krylov_conv_mod.o psb_c_krylov_conv_mod.o psb_d_krylov_conv_mod.o psb_z_krylov_conv_mod.o $(F90OBJS): $(MODOBJS) -$(OBJS): $(LIBDIR)/$(PRECMODNAME)$(.mod) $(LIBDIR)/$(BASEMODNAME)$(.mod) +$(OBJS): $(INCDIR)/$(PRECMODNAME)$(.mod) $(INCDIR)/$(BASEMODNAME)$(.mod) veryclean: clean /bin/rm -f $(HERE)/$(LIBNAME) diff --git a/prec/Makefile b/prec/Makefile index ac92049a..2538f522 100644 --- a/prec/Makefile +++ b/prec/Makefile @@ -1,6 +1,7 @@ include ../Make.inc LIBDIR=../lib +INCDIR=../include HERE=. MODOBJS=psb_prec_const_mod.o\ psb_s_prec_type.o psb_d_prec_type.o psb_c_prec_type.o psb_z_prec_type.o \ @@ -15,19 +16,19 @@ MODOBJS=psb_prec_const_mod.o\ LIBNAME=$(PRECLIBNAME) COBJS= -FINCLUDES=$(FMFLAG). $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(INCDIR) OBJS=$(F90OBJS) $(COBJS) $(MPFOBJS) $(MODOBJS) lib: $(OBJS) impld $(AR) $(HERE)/$(LIBNAME) $(OBJS) $(RANLIB) $(HERE)/$(LIBNAME) /bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR) - /bin/cp -p $(CPUPDFLAG) *$(.mod) $(LIBDIR) + /bin/cp -p $(CPUPDFLAG) *$(.mod) $(INCDIR) impld: $(OBJS) cd impl && $(MAKE) -$(OBJS): $(LIBDIR)/$(BASEMODNAME)$(.mod) +$(OBJS): $(INCDIR)/$(BASEMODNAME)$(.mod) psb_s_base_prec_mod.o psb_d_base_prec_mod.o psb_c_base_prec_mod.o psb_z_base_prec_mod.o: psb_prec_const_mod.o diff --git a/prec/impl/Makefile b/prec/impl/Makefile index 4e566fa6..90b51fbb 100644 --- a/prec/impl/Makefile +++ b/prec/impl/Makefile @@ -1,6 +1,7 @@ include ../../Make.inc LIBDIR=../../lib +INCDIR=../../include HERE=.. OBJS=psb_s_prec_type_impl.o psb_d_prec_type_impl.o \ psb_c_prec_type_impl.o psb_z_prec_type_impl.o \ @@ -19,7 +20,7 @@ OBJS=psb_s_prec_type_impl.o psb_d_prec_type_impl.o \ LIBNAME=$(PRECLIBNAME) COBJS= -FINCLUDES=$(FMFLAG).. $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG).. $(FMFLAG)$(INCDIR) lib: $(OBJS) $(AR) $(HERE)/$(LIBNAME) $(OBJS) diff --git a/test/fileread/Makefile b/test/fileread/Makefile index 9987ac49..a5b078f1 100644 --- a/test/fileread/Makefile +++ b/test/fileread/Makefile @@ -1,12 +1,14 @@ -include ../../Make.inc +BASEDIR=../.. +INCDIR=$(BASEDIR)/include/ +include $(INCDIR)/Make.inc.psblas # # Libraries used # -LIBDIR=../../lib/ +LIBDIR=$(BASEDIR)/lib/ PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base LDLIBS=$(PSBLDLIBS) -FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). +FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG). SFOBJS=getp.o sf_sample.o DFOBJS=getp.o df_sample.o diff --git a/test/kernel/Makefile b/test/kernel/Makefile index 50b27000..458c1139 100644 --- a/test/kernel/Makefile +++ b/test/kernel/Makefile @@ -1,14 +1,16 @@ -include ../../Make.inc # # Libraries used # -LIBDIR=../../lib/ +BASEDIR=../.. +INCDIR=$(BASEDIR)/include/ +include $(INCDIR)/Make.inc.psblas +LIBDIR=$(BASEDIR)/lib/ PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base LDLIBS=$(PSBLDLIBS) -FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). +FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG). + -DBOBJS=dpsbench.o DTOBJS=d_file_spmv.o STOBJS=s_file_spmv.o DPGOBJS=pdgenspmv.o @@ -17,10 +19,6 @@ EXEDIR=./runs all: d_file_spmv s_file_spmv pdgenspmv -dpsbench: $(DBOBJS) - $(F90LINK) $(LOPT) $(DBOBJS) -o dpsbench $(PSBLAS_LIB) $(LDLIBS) - /bin/mv dpsbench $(EXEDIR) - d_file_spmv: $(DTOBJS) $(F90LINK) $(LOPT) $(DTOBJS) -o d_file_spmv $(PSBLAS_LIB) $(LDLIBS) /bin/mv d_file_spmv $(EXEDIR) diff --git a/test/pargen/Makefile b/test/pargen/Makefile index 9946b52f..f9f44088 100644 --- a/test/pargen/Makefile +++ b/test/pargen/Makefile @@ -1,15 +1,16 @@ -include ../../Make.inc +BASEDIR=../.. +INCDIR=$(BASEDIR)/include +include $(INCDIR)/Make.inc.psblas # # Libraries used -# -LIBDIR=../../lib/ +LIBDIR=$(BASEDIR)/lib PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base LDLIBS=$(PSBLDLIBS) # # Compilers and such # CCOPT= -g -FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). +FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG). EXEDIR=./runs @@ -21,10 +22,6 @@ ppde3d: ppde3d.o $(F90LINK) ppde3d.o -o ppde3d $(PSBLAS_LIB) $(LDLIBS) /bin/mv ppde3d $(EXEDIR) -ppde3d_ext: ppde3d_ext.o - $(F90LINK) ppde3d_ext.o -o ppde3d_ext $(PSBLAS_LIB) $(LDLIBS) - /bin/mv ppde3d_ext $(EXEDIR) - spde3d: spde3d.o $(F90LINK) spde3d.o -o spde3d $(PSBLAS_LIB) $(LDLIBS) @@ -41,7 +38,7 @@ spde2d: spde2d.o clean: - /bin/rm -f ppde3d.o spde3d.o ppde2d.o spde2d.o ppde3d_ext.o \ + /bin/rm -f ppde3d.o spde3d.o ppde2d.o spde2d.o *$(.mod) \ $(EXEDIR)/ppde3d $(EXEDIR)/spde3d $(EXEDIR)/ppde2d $(EXEDIR)/spde2d verycleanlib: (cd ../..; make veryclean) diff --git a/test/pargen/runs/ppde.inp b/test/pargen/runs/ppde.inp index ad9aac03..d0dc36f5 100644 --- a/test/pargen/runs/ppde.inp +++ b/test/pargen/runs/ppde.inp @@ -5,7 +5,7 @@ CSR Storage format for matrix A: CSR COO JAD 100 Domain size (acutal system is this**3) 2 Stopping criterion 1000 MAXIT -01 ITRACE +-1 ITRACE 002 IRST restart for RGMRES and BiCGSTABL diff --git a/test/util/Makefile b/test/util/Makefile index b17ac9e1..563f8204 100644 --- a/test/util/Makefile +++ b/test/util/Makefile @@ -1,16 +1,14 @@ -include ../../Make.inc +BASEDIR=../.. +INCDIR=$(BASEDIR)/include/ +include $(INCDIR)/Make.inc.psblas # # Libraries used # -LIBDIR=../../lib/ -PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base +LIBDIR=$(BASEDIR)/lib/ +PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base LDLIBS=$(PSBLDLIBS) -# -# We are using the public domain tool METIS from U. Minnesota. To get it -# check URL http://www.cs.umn.edu:~karypis -# -FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). +FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG). ZH2MOBJS=zhb2mm.o DH2MOBJS=dhb2mm.o diff --git a/util/Makefile b/util/Makefile index cef52c09..04d2b1a8 100644 --- a/util/Makefile +++ b/util/Makefile @@ -2,6 +2,7 @@ include ../Make.inc LIBDIR=../lib +INCDIR=../include HERE=. @@ -19,21 +20,21 @@ IMPLOBJS= psb_s_hbio_impl.o psb_d_hbio_impl.o \ psb_d_genpde_impl.o psb_s_genpde_impl.o MODOBJS=psb_util_mod.o $(BASEOBJS) COBJS=metis_int.o psb_amd_order.o -OBJS=$(COBJS) $(MODOBJS) $(IMPLOBJS)# $(COBJS) +OBJS=$(COBJS) $(MODOBJS) $(IMPLOBJS) LOCAL_MODS=$(MODOBJS:.o=$(.mod)) LIBNAME=$(UTILLIBNAME) -FINCLUDES=$(FMFLAG). $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(INCDIR) lib: $(HERE)/$(LIBNAME) /bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR) - /bin/cp -p $(CPUPDFLAG) *$(.mod) $(LIBDIR) + /bin/cp -p $(CPUPDFLAG) *$(.mod) $(INCDIR) $(HERE)/$(LIBNAME): $(OBJS) $(AR) $(HERE)/$(LIBNAME) $(OBJS) $(RANLIB) $(HERE)/$(LIBNAME) -$(OBJS): $(LIBDIR)/$(BASEMODNAME)$(.mod) +$(OBJS): $(INCDIR)/$(BASEMODNAME)$(.mod) psb_util_mod.o: $(BASEOBJS) psb_metispart_mod.o: metis_int.o