Merged changes from svn dev version.

This commit is contained in:
Salvatore Filippone
2017-10-02 12:04:14 +01:00
parent 13d6f8c8a7
commit bbba6a670e
47 changed files with 814 additions and 138 deletions
+2 -1
View File
@@ -1,5 +1,6 @@
INSTALLDIR=../..
INCDIR=$(INSTALLDIR)/include/
MODDIR=$(INSTALLDIR)/modules/
include $(INCDIR)/Make.inc.psblas
#
# Libraries used
@@ -8,7 +9,7 @@ LIBDIR=$(INSTALLDIR)/lib/
PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base
LDLIBS=$(PSBLDLIBS)
FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG).
FINCLUDES=$(FMFLAG)$(MODDIR) $(FMFLAG).
SFOBJS=getp.o psb_sf_sample.o
DFOBJS=getp.o psb_df_sample.o
+2 -1
View File
@@ -1,5 +1,6 @@
BASEDIR=../..
INCDIR=$(BASEDIR)/include
MODDIR=$(INSTALLDIR)/modules/
include $(INCDIR)/Make.inc.psblas
#
# Libraries used
@@ -10,7 +11,7 @@ LDLIBS=$(PSBLDLIBS)
# Compilers and such
#
CCOPT= -g
FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG).
FINCLUDES=$(FMFLAG)$(MODDIR) $(FMFLAG).
EXEDIR=./runs
+2 -1
View File
@@ -3,12 +3,13 @@
#
INSTALLDIR=../..
INCDIR=$(INSTALLDIR)/include/
MODDIR=$(INSTALLDIR)/modules/
include $(INCDIR)/Make.inc.psblas
LIBDIR=$(INSTALLDIR)/lib/
PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base
LDLIBS=$(PSBLDLIBS)
FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG).
FINCLUDES=$(FMFLAG)$(MODDIR) $(FMFLAG).
DTOBJS=d_file_spmv.o
+2 -1
View File
@@ -1,5 +1,6 @@
INSTALLDIR=../..
INCDIR=$(INSTALLDIR)/include
MODDIR=$(INSTALLDIR)/modules/
include $(INCDIR)/Make.inc.psblas
#
# Libraries used
@@ -10,7 +11,7 @@ LDLIBS=$(PSBLDLIBS)
# Compilers and such
#
CCOPT= -g
FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG).
FINCLUDES=$(FMFLAG)$(MODDIR) $(FMFLAG).
EXEDIR=./runs
+2 -1
View File
@@ -3,12 +3,13 @@
#
BASEDIR=../..
INCDIR=$(BASEDIR)/include/
MODDIR=$(INSTALLDIR)/modules/
include $(INCDIR)/Make.inc.psblas
LIBDIR=$(BASEDIR)/lib/
PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base
LDLIBS=$(PSBLDLIBS)
FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG).
FINCLUDES=$(FMFLAG)$(MODDIR) $(FMFLAG).
EXEDIR=./runs
+2 -1
View File
@@ -1,11 +1,12 @@
BASEDIR=../..
INCDIR=$(BASEDIR)/include/
MODDIR=$(INSTALLDIR)/modules/
include $(INCDIR)/Make.inc.psblas
LIBDIR=$(BASEDIR)/lib/
PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base
LDLIBS=$(PSBLDLIBS)
CCOPT= -g
FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG).
FINCLUDES=$(FMFLAG)$(MODDIR) $(FMFLAG).
PSBTOBJS=psbtf.o psb_mvsv_tester.o \
psb_s_mvsv_tester.o psb_d_mvsv_tester.o psb_c_mvsv_tester.o \
+2 -1
View File
@@ -1,5 +1,6 @@
BASEDIR=../..
INCDIR=$(BASEDIR)/include/
MODDIR=$(INSTALLDIR)/modules/
include $(INCDIR)/Make.inc.psblas
#
# Libraries used
@@ -8,7 +9,7 @@ LIBDIR=$(BASEDIR)/lib/
PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base
LDLIBS=$(PSBLDLIBS)
FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG).
FINCLUDES=$(FMFLAG)$(MODDIR) $(FMFLAG).
ZH2MOBJS=zhb2mm.o
DH2MOBJS=dhb2mm.o