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

Makefile changes

Browse Source
psblas-3.1-maint
Salvatore Filippone 11 years ago
parent 29ef96e999
commit 4d9cb2295d
23 changed files with 73 additions and 66 deletions
Show Stats Download Patch File Download Diff File

1
Make.inc.in
Unescape Escape View File

@ -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=

3
Makefile
Unescape Escape View File

@ -10,6 +10,7 @@ kryld: precd based
libd:
(if test ! -d lib ; then mkdir lib; fi)
(if test ! -d include ; then mkdir include; $(INSTALL_DATA) Make.inc include/Make.inc.psblas; fi)
based:
cd base && $(MAKE) lib
precd:
@ -41,6 +42,8 @@ check: all
cleanlib:
(cd lib; /bin/rm -f *.a *$(.mod) *$(.fh))
(cd include; /bin/rm -f *.a *$(.mod) *$(.fh))
veryclean: cleanlib
cd base && $(MAKE) veryclean
cd prec && $(MAKE) veryclean

3
base/Makefile
Unescape Escape View File

@ -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

3
base/comm/Makefile
Unescape Escape View File

@ -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)

3
base/internals/Makefile
Unescape Escape View File

@ -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)

3
base/psblas/Makefile
Unescape Escape View File

@ -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)

3
base/serial/Makefile
Unescape Escape View File

@ -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)

3
base/serial/aux/Makefile
Unescape Escape View File

@ -22,8 +22,9 @@ OBJS=$(FOBJS)
# 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)$(SPARKERDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR)
#
# No change should be needed below

3
base/serial/f77/Makefile
Unescape Escape View File

@ -14,8 +14,9 @@ OBJS=$(FOBJS)
# 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)$(SPARKERDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR)
#LIBNAME=libsparker.a
#LIBNAME=$(BASELIBNAME)
LIBFILE=$(LIBDIR)/$(LIBNAME)

3
base/serial/impl/Makefile
Unescape Escape View File

@ -16,8 +16,9 @@ OBJS=$(BOBJS) $(SOBJS) $(DOBJS) $(COBJS) $(ZOBJS)
# 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)$(SPARKERDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR)
#LIBNAME=libsparker.a
LIBFILE=$(LIBDIR)/$(LIBNAME)

3
base/tools/Makefile
Unescape Escape View File

@ -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)

10
configure vendored
Unescape Escape View File

@ -651,6 +651,7 @@ FINCLUDES
CINCLUDES
METIS_LIBS
AMD_LIBS
INSTALL_SAMPLESDIR
INSTALL_DOCSDIR
INSTALL_INCLUDEDIR
INSTALL_LIBDIR
@ -2134,8 +2135,12 @@ case $docsdir in
\/* ) eval "INSTALL_DOCSDIR=$docsdir";;
* ) eval "INSTALL_DOCSDIR=$INSTALL_DIR/docs";;
esac
{ $as_echo "$as_me:$LINENO: result: $INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR $INSTALL_DOCSDIR" >&5
$as_echo "$INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR $INSTALL_DOCSDIR" >&6; }
case $samplesdir in
\/* ) eval "INSTALL_SAMPLESDIR=$samplesdir";;
* ) eval "INSTALL_SAMPLESDIR=$INSTALL_DIR/samples";;
esac
{ $as_echo "$as_me:$LINENO: result: $INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR $INSTALL_DOCSDIR $INSTALL_SAMPLESDIR" >&5
$as_echo "$INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR $INSTALL_DOCSDIR $INSTALL_SAMPLESDIR" >&6; }
# Note that the following line won't save from troubles.
ac_ext=${ac_fc_srcext-f}
@ -10305,6 +10310,7 @@ UTILLIBNAME=libpsb_util.a
PSBLASRULES='

7
configure.ac
Unescape Escape View File

@ -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])
@ -777,6 +781,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)

7
krylov/Makefile
Unescape Escape View File

@ -3,6 +3,7 @@ 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 \
@ -24,19 +25,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)

7
prec/Makefile
Unescape Escape View File

@ -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

3
prec/impl/Makefile
Unescape Escape View File

@ -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)

8
test/fileread/Makefile
Unescape Escape View File

@ -1,12 +1,14 @@
include ../../Make.inc
#
# Libraries used
#
LIBDIR=../../lib/
BASEDIR=../..
LIBDIR=$(BASEDIR)/lib/
INCDIR=$(BASEDIR)/include/
include $(INCDIR)/Make.inc.psblas
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

14
test/kernel/Makefile
Unescape Escape View File

@ -1,14 +1,16 @@
include ../../Make.inc
#
# Libraries used
#
LIBDIR=../../lib/
BASEDIR=../..
LIBDIR=$(BASEDIR)/lib/
INCDIR=$(BASEDIR)/include/
include $(INCDIR)/Make.inc.psblas2
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)

11
test/pargen/Makefile
Unescape Escape View File

@ -1,15 +1,16 @@
include ../../Make.inc
#
# Libraries used
#
LIBDIR=../../lib/
BASEDIR=../..
LIBDIR=$(BASEDIR)/lib
INCDIR=$(BASEDIR)/include
include $(INCDIR)/Make.inc.psblas
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
@ -37,7 +38,7 @@ spde2d: spde2d.o
clean:
/bin/rm -f ppde3d.o spde3d.o ppde2d.o spde2d.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)

12
test/pargen/runs/Makefile
Unescape Escape View File

@ -1,12 +0,0 @@
lib:
(cd ..; $(MAKE) lib)
clean:
(cd ..; $(MAKE) clean)
verycleanlib:
(cd ..; $(MAKE) verycleanlib)
ppde90:
(cd ..; $(MAKE) ppde90)
pp2d:
(cd ..; $(MAKE) pp2d)
.PHONY: pp2d ppde90

8
test/pargen/runs/mach
Unescape Escape View File

@ -1,8 +0,0 @@
localhost
localhost
localhost
localhost
localhost
localhost
localhost
localhost

14
test/util/Makefile
Unescape Escape View File

@ -1,16 +1,14 @@
include ../../Make.inc
#
# Libraries used
#
LIBDIR=../../lib/
PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base
BASEDIR=../..
LIBDIR=$(BASEDIR)/lib/
INCDIR=$(BASEDIR)/include/
include $(INCDIR)/Make.inc.psblas
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

7
util/Makefile
Unescape Escape View File

@ -2,6 +2,7 @@ include ../Make.inc
LIBDIR=../lib
INCDIR=../include
HERE=.
@ -22,18 +23,18 @@ COBJS=psb_amd_order.o
OBJS=$(MODOBJS) $(IMPLOBJS) $(COBJS)
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)
$(IMPLOBJS): $(BASEOBJS)

Write Preview
Loading…
Cancel
Save