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

mld2p4-2:

Browse Source 
Makefile
 examples/fileread/Makefile
 examples/pdegen/Makefile
 mlprec/Makefile
 mlprec/impl/Makefile
 mlprec/impl/level/Makefile
 mlprec/impl/smoother/Makefile
 mlprec/impl/solver/Makefile
 tests/fileread/Makefile
 tests/fileread/df_sample.f90
 tests/newslv/Makefile
 tests/pdegen/Makefile

Fix INCDIR.
stopcriterion
Salvatore Filippone 11 years ago
parent c9de38bbce
commit 357d80553f
12 changed files with 43 additions and 25 deletions
Show Stats Download Patch File Download Diff File

11
Makefile
Unescape Escape View File

@ -6,6 +6,9 @@ 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)
($(INSTALL_DATA) Make.inc include/Make.inc.mld2p4)
mlp: mlp:
cd mlprec && $(MAKE) all cd mlprec && $(MAKE) all
@ -15,11 +18,15 @@ install: all
(./mkdir.sh $(INSTALL_LIBDIR) &&\ (./mkdir.sh $(INSTALL_LIBDIR) &&\
$(INSTALL_DATA) lib/*.a $(INSTALL_LIBDIR)) $(INSTALL_DATA) lib/*.a $(INSTALL_LIBDIR))
(./mkdir.sh $(INSTALL_INCLUDEDIR) && \ (./mkdir.sh $(INSTALL_INCLUDEDIR) && \
$(INSTALL_DATA) lib/*$(.mod) $(INSTALL_INCLUDEDIR)) $(INSTALL_DATA) include/*$(.mod) $(INSTALL_INCLUDEDIR))
(./mkdir.sh $(INSTALL_INCLUDEDIR) &&\
$(INSTALL_DATA) Make.inc $(INSTALL_INCLUDEDIR)/Make.inc.mld2p4)
(./mkdir.sh $(INSTALL_INCLUDEDIR) && \ (./mkdir.sh $(INSTALL_INCLUDEDIR) && \
$(INSTALL_DATA) lib/*.h $(INSTALL_INCLUDEDIR)) $(INSTALL_DATA) include/*.h $(INSTALL_INCLUDEDIR))
(./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) && \
$(INSTALL_DATA) README LICENSE $(INSTALL_DOCSDIR))
veryclean: veryclean:
(cd mlprec; make veryclean) (cd mlprec; make veryclean)
(cd lib; /bin/rm -f *.a *$(.mod)) (cd lib; /bin/rm -f *.a *$(.mod))

5
examples/fileread/Makefile
Unescape Escape View File

@ -1,11 +1,12 @@
MLDDIR=../.. MLDDIR=../..
include $(MLDDIR)/Make.inc MLDINCDIR=$(MLDDIR)/include
include $(MLDINCDIR)/Make.inc.mld2p4
PSBLIBDIR=$(PSBLASDIR)/lib/ PSBLIBDIR=$(PSBLASDIR)/lib/
PSBINCDIR=$(PSBLASDIR)/include PSBINCDIR=$(PSBLASDIR)/include
MLDLIBDIR=$(MLDDIR)/lib MLDLIBDIR=$(MLDDIR)/lib
MLD_LIB=-L$(MLDLIBDIR) -lmld_prec MLD_LIB=-L$(MLDLIBDIR) -lmld_prec
PSBLAS_LIB= -L$(PSBLIBDIR) -lpsb_krylov -lpsb_prec -lpsb_util -lpsb_base PSBLAS_LIB= -L$(PSBLIBDIR) -lpsb_krylov -lpsb_prec -lpsb_util -lpsb_base
FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDLIBDIR) $(FMFLAG)$(PSBINCDIR) $(FIFLAG). FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDINCDIR) $(FMFLAG)$(PSBINCDIR) $(FIFLAG).
DMOBJS=mld_dexample_ml.o data_input.o DMOBJS=mld_dexample_ml.o data_input.o
D1OBJS=mld_dexample_1lev.o data_input.o D1OBJS=mld_dexample_1lev.o data_input.o

5
examples/pdegen/Makefile
Unescape Escape View File

@ -1,11 +1,12 @@
MLDDIR=../.. MLDDIR=../..
include $(MLDDIR)/Make.inc MLDINCDIR=$(MLDDIR)/include
include $(MLDINCDIR)/Make.inc.mld2p4
PSBLIBDIR=$(PSBLASDIR)/lib/ PSBLIBDIR=$(PSBLASDIR)/lib/
PSBINCDIR=$(PSBLASDIR)/include PSBINCDIR=$(PSBLASDIR)/include
MLDLIBDIR=$(MLDDIR)/lib MLDLIBDIR=$(MLDDIR)/lib
MLD_LIB=-L$(MLDLIBDIR) -lmld_prec MLD_LIB=-L$(MLDLIBDIR) -lmld_prec
PSBLAS_LIB= -L$(PSBLIBDIR) -lpsb_krylov -lpsb_prec -lpsb_util -lpsb_base PSBLAS_LIB= -L$(PSBLIBDIR) -lpsb_krylov -lpsb_prec -lpsb_util -lpsb_base
FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDLIBDIR) $(FMFLAG)$(PSBINCDIR) $(FIFLAG). FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDINCDIR) $(FMFLAG)$(PSBINCDIR) $(FIFLAG).
DMOBJS=mld_dexample_ml.o data_input.o DMOBJS=mld_dexample_ml.o data_input.o
D1OBJS=mld_dexample_1lev.o data_input.o D1OBJS=mld_dexample_1lev.o data_input.o

4
mlprec/Makefile
Unescape Escape View File

@ -1,5 +1,6 @@
include ../Make.inc include ../Make.inc
LIBDIR=../lib LIBDIR=../lib
INCDIR=../include
PSBLIBDIR=$(PSBLASDIR)/lib PSBLIBDIR=$(PSBLASDIR)/lib
PSBINCDIR=$(PSBLASDIR)/include PSBINCDIR=$(PSBLASDIR)/include
HERE=. HERE=.
@ -36,7 +37,6 @@ MODOBJS=mld_base_prec_type.o mld_prec_type.o mld_prec_mod.o \
OBJS=$(MODOBJS) OBJS=$(MODOBJS)
#LIBMOD=mld_prec_mod$(.mod)
LOCAL_MODS=$(MODOBJS:.o=$(.mod)) LOCAL_MODS=$(MODOBJS:.o=$(.mod))
LIBNAME=libmld_prec.a LIBNAME=libmld_prec.a
@ -49,7 +49,7 @@ 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 $(LIBDIR) /bin/cp -p *$(.mod) mld_const.h $(INCDIR)
$(MODOBJS): $(PSBINCDIR)/$(BASEMODNAME)$(.mod) $(MODOBJS): $(PSBINCDIR)/$(BASEMODNAME)$(.mod)

3
mlprec/impl/Makefile
Unescape Escape View File

@ -1,10 +1,11 @@
include ../../Make.inc include ../../Make.inc
LIBDIR=../../lib LIBDIR=../../lib
INCDIR=../../include
PSBLIBDIR=$(PSBLASDIR)/lib PSBLIBDIR=$(PSBLASDIR)/lib
PSBINCDIR=$(PSBLASDIR)/include PSBINCDIR=$(PSBLASDIR)/include
HERE=.. HERE=..
FINCLUDES=$(FMFLAG).. $(FMFLAG)$(LIBDIR) $(FMFLAG)$(PSBINCDIR) $(FMFLAG)$(PSBLIBDIR) FINCLUDES=$(FMFLAG).. $(FMFLAG)$(INCDIR) $(FMFLAG)$(PSBINCDIR) $(FMFLAG)$(PSBLIBDIR)
DMPFOBJS=mld_daggrmat_nosmth_asb.o mld_daggrmat_smth_asb.o mld_daggrmat_minnrg_asb.o mld_daggrmat_biz_asb.o DMPFOBJS=mld_daggrmat_nosmth_asb.o mld_daggrmat_smth_asb.o mld_daggrmat_minnrg_asb.o mld_daggrmat_biz_asb.o

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

@ -1,10 +1,11 @@
include ../../../Make.inc include ../../../Make.inc
LIBDIR=../../../lib LIBDIR=../../../lib
INCDIR=../../../include
PSBLIBDIR=$(PSBLASDIR)/lib PSBLIBDIR=$(PSBLASDIR)/lib
PSBINCDIR=$(PSBLASDIR)/include PSBINCDIR=$(PSBLASDIR)/include
HERE=../.. HERE=../..
FINCLUDES=$(FMFLAG)../.. $(FMFLAG)$(LIBDIR) $(FMFLAG)$(PSBINCDIR) $(FMFLAG)$(PSBLIBDIR) FINCLUDES=$(FMFLAG)../.. $(FMFLAG)$(INCDIR) $(FMFLAG)$(PSBINCDIR) $(FMFLAG)$(PSBLIBDIR)
OBJS=mld_c_base_onelev_check.o \ OBJS=mld_c_base_onelev_check.o \

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

@ -1,10 +1,11 @@
include ../../../Make.inc include ../../../Make.inc
LIBDIR=../../../lib LIBDIR=../../../lib
INCDIR=../../../include
PSBLIBDIR=$(PSBLASDIR)/lib PSBLIBDIR=$(PSBLASDIR)/lib
PSBINCDIR=$(PSBLASDIR)/include PSBINCDIR=$(PSBLASDIR)/include
HERE=../.. HERE=../..
FINCLUDES=$(FMFLAG)../.. $(FMFLAG)$(LIBDIR) $(FMFLAG)$(PSBINCDIR) $(FMFLAG)$(PSBLIBDIR) FINCLUDES=$(FMFLAG)../.. $(FMFLAG)$(INCDIR) $(FMFLAG)$(PSBINCDIR) $(FMFLAG)$(PSBLIBDIR)
OBJS=mld_c_as_smoother_apply.o \ OBJS=mld_c_as_smoother_apply.o \

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

@ -1,10 +1,11 @@
include ../../../Make.inc include ../../../Make.inc
LIBDIR=../../../lib LIBDIR=../../../lib
INCDIR=../../../include
PSBLIBDIR=$(PSBLASDIR)/lib PSBLIBDIR=$(PSBLASDIR)/lib
PSBINCDIR=$(PSBLASDIR)/include PSBINCDIR=$(PSBLASDIR)/include
HERE=../.. HERE=../..
FINCLUDES=$(FMFLAG)../.. $(FMFLAG)$(LIBDIR) $(FMFLAG)$(PSBINCDIR) $(FMFLAG)$(PSBLIBDIR) FINCLUDES=$(FMFLAG)../.. $(FMFLAG)$(INCDIR) $(FMFLAG)$(PSBINCDIR) $(FMFLAG)$(PSBLIBDIR)
OBJS=mld_c_base_solver_apply.o \ OBJS=mld_c_base_solver_apply.o \

5
tests/fileread/Makefile
Unescape Escape View File

@ -1,11 +1,12 @@
MLDDIR=../.. MLDDIR=../..
include $(MLDDIR)/Make.inc MLDINCDIR=$(MLDDIR)/include
include $(MLDINCDIR)/Make.inc.mld2p4
PSBLIBDIR=$(PSBLASDIR)/lib/ PSBLIBDIR=$(PSBLASDIR)/lib/
PSBINCDIR=$(PSBLASDIR)/include PSBINCDIR=$(PSBLASDIR)/include
MLDLIBDIR=$(MLDDIR)/lib MLDLIBDIR=$(MLDDIR)/lib
MLD_LIB=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec MLD_LIB=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec
PSBLAS_LIB= -L$(PSBLIBDIR) -lpsb_util -lpsb_base PSBLAS_LIB= -L$(PSBLIBDIR) -lpsb_util -lpsb_base
FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDLIBDIR) $(FMFLAG)$(PSBINCDIR) $(FIFLAG). FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDINCDIR) $(FMFLAG)$(PSBINCDIR) $(FIFLAG).
DFSOBJS=df_sample.o data_input.o DFSOBJS=df_sample.o data_input.o
SFSOBJS=sf_sample.o data_input.o SFSOBJS=sf_sample.o data_input.o

2
tests/fileread/df_sample.f90
Unescape Escape View File

@ -276,6 +276,7 @@ program df_sample
else else
nlv = 1 nlv = 1
call mld_precinit(prec,prec_choice%prec,info) call mld_precinit(prec,prec_choice%prec,info)
if (psb_toupper(prec_choice%prec) /= 'NONE') then
call mld_precset(prec,mld_smoother_sweeps_, prec_choice%jsweeps, info) call mld_precset(prec,mld_smoother_sweeps_, prec_choice%jsweeps, info)
call mld_precset(prec,mld_sub_ovr_, prec_choice%novr, info) call mld_precset(prec,mld_sub_ovr_, prec_choice%novr, info)
call mld_precset(prec,mld_sub_restr_, prec_choice%restr, info) call mld_precset(prec,mld_sub_restr_, prec_choice%restr, info)
@ -284,6 +285,7 @@ program df_sample
call mld_precset(prec,mld_sub_fillin_, prec_choice%fill, info) call mld_precset(prec,mld_sub_fillin_, prec_choice%fill, info)
call mld_precset(prec,mld_sub_iluthrs_, prec_choice%thr, info) call mld_precset(prec,mld_sub_iluthrs_, prec_choice%thr, info)
end if end if
end if
! building the preconditioner ! building the preconditioner
t1 = psb_wtime() t1 = psb_wtime()

5
tests/newslv/Makefile
Unescape Escape View File

@ -1,11 +1,12 @@
MLDDIR=../.. MLDDIR=../..
include $(MLDDIR)/Make.inc MLDINCDIR=$(MLDDIR)/include
include $(MLDINCDIR)/Make.inc.mld2p4
PSBLIBDIR=$(PSBLASDIR)/lib/ PSBLIBDIR=$(PSBLASDIR)/lib/
PSBINCDIR=$(PSBLASDIR)/include PSBINCDIR=$(PSBLASDIR)/include
MLDLIBDIR=$(MLDDIR)/lib MLDLIBDIR=$(MLDDIR)/lib
MLD_LIB=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec MLD_LIB=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec
PSBLAS_LIB= -L$(PSBLIBDIR) -lpsb_util -lpsb_base PSBLAS_LIB= -L$(PSBLIBDIR) -lpsb_util -lpsb_base
FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDLIBDIR) $(FMFLAG)$(PSBINCDIR) $(FIFLAG). FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDINCDIR) $(FMFLAG)$(PSBINCDIR) $(FIFLAG).
PD3DOBJS=ppde3d.o data_input.o mld_d_tlu_solver.o mld_d_tlu_solver_impl.o PD3DOBJS=ppde3d.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

5
tests/pdegen/Makefile
Unescape Escape View File

@ -1,11 +1,12 @@
MLDDIR=../.. MLDDIR=../..
include $(MLDDIR)/Make.inc MLDINCDIR=$(MLDDIR)/include
include $(MLDINCDIR)/Make.inc.mld2p4
PSBLIBDIR=$(PSBLASDIR)/lib/ PSBLIBDIR=$(PSBLASDIR)/lib/
PSBINCDIR=$(PSBLASDIR)/include PSBINCDIR=$(PSBLASDIR)/include
MLDLIBDIR=$(MLDDIR)/lib MLDLIBDIR=$(MLDDIR)/lib
MLD_LIB=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec MLD_LIB=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec
PSBLAS_LIB= -L$(PSBLIBDIR) -lpsb_util -lpsb_base PSBLAS_LIB= -L$(PSBLIBDIR) -lpsb_util -lpsb_base
FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDLIBDIR) $(FMFLAG)$(PSBINCDIR) $(FIFLAG). FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDINCDIR) $(FMFLAG)$(PSBINCDIR) $(FIFLAG).
EXEDIR=./runs EXEDIR=./runs

Write Preview
Loading…
Cancel
Save