fdurastante/psblas3
1
0
Fork 0
mirror of https://github.com/sfilippone/psblas3.git synced 2026-10-06 22:55:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

psblas3:

Browse Source 
Makefile
 base/Makefile
 base/modules/Makefile
 base/serial/Makefile
 prec/Makefile
 util/Makefile

Fixes to allow make -j2
This commit is contained in:
Salvatore Filippone
2011-11-11 09:18:05 +00:00
parent e727c597bd
commit d7cb940f68
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+5 -5
View File
@@ -12,15 +12,15 @@ kryld: precd based
libd:
(if test ! -d lib ; then mkdir lib; fi)
based:
(cd base; $(MAKE) lib)
cd base && $(MAKE) lib
precd:
(cd prec; $(MAKE) lib )
cd prec && $(MAKE) lib
kryld:
(cd krylov; $(MAKE) lib)
cd krylov && $(MAKE) lib
utild:
(cd util; $(MAKE) lib )
cd util&& $(MAKE) lib
install:
install: all
(./mkdir.sh $(INSTALL_DIR) &&\
$(INSTALL_DATA) Make.inc $(INSTALL_DIR))
(./mkdir.sh $(INSTALL_LIBDIR) &&\
base/Makefile
+6 -6
View File
@@ -11,17 +11,17 @@ lib: mods sr cm in pb tl
sr cm in pb tl: mods
mods:
(cd modules; $(MAKE) lib LIBNAME=$(BASELIBNAME) F90="$(MPF90)" F90COPT="$(F90COPT) $(MPI_OPT)")
cd modules && $(MAKE) lib LIBNAME=$(BASELIBNAME) F90="$(MPF90)" F90COPT="$(F90COPT) $(MPI_OPT)"
sr:
(cd serial; $(MAKE) lib LIBNAME=$(BASELIBNAME))
cd serial && $(MAKE) lib LIBNAME=$(BASELIBNAME)
cm:
(cd comm; $(MAKE) lib LIBNAME=$(BASELIBNAME))
cd comm && $(MAKE) lib LIBNAME=$(BASELIBNAME)
in:
(cd internals; $(MAKE) lib LIBNAME=$(BASELIBNAME))
cd internals && $(MAKE) lib LIBNAME=$(BASELIBNAME)
pb:
(cd psblas; $(MAKE) lib LIBNAME=$(BASELIBNAME))
cd psblas && $(MAKE) lib LIBNAME=$(BASELIBNAME)
tl:
(cd tools; $(MAKE) lib LIBNAME=$(BASELIBNAME))
cd tools && $(MAKE) lib LIBNAME=$(BASELIBNAME)
clean:
(cd modules; $(MAKE) clean)
base/modules/Makefile
+7 -5
View File
@@ -40,7 +40,7 @@ CINCLUDES=-I.
FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). $(FIFLAG).
lib: penvmod $(UTIL_MODS) $(OBJS) $(LIBDIR)/$(LIBNAME)
lib: psb_penv_mod.o $(UTIL_MODS) $(OBJS) $(LIBDIR)/$(LIBNAME)
/bin/cp -p $(CPUPDFLAG) $(LIBMOD) $(LIBDIR)
/bin/cp -p $(CPUPDFLAG) *$(.mod) $(LIBDIR)
@@ -54,6 +54,7 @@ psb_realloc_mod.o: psb_error_mod.o
$(UTILS_MODS): $(BASIC_MODS)
psi_comm_buffers_mod.o: psb_const_mod.o
psi_penv_mod.o: psi_comm_buffers_mod.o
psi_bcast_mod.o psi_reduce_mod.o psi_p2p_mod.o: psi_penv_mod.o
psb_penv_mod.o: psi_bcast_mod.o psi_reduce_mod.o psi_p2p_mod.o
@@ -64,7 +65,7 @@ psb_s_base_mat_mod.o: psb_s_base_vect_mod.o
psb_d_base_mat_mod.o: psb_d_base_vect_mod.o
psb_c_base_mat_mod.o: psb_c_base_vect_mod.o
psb_z_base_mat_mod.o: psb_z_base_vect_mod.o
psb_c_base_vect_mod.o psb_s_base_vect_mod.o psb_d_base_vect_mod.o psb_z_base_vect_mod.o: psi_serial_mod.o
psb_c_base_vect_mod.o psb_s_base_vect_mod.o psb_d_base_vect_mod.o psb_z_base_vect_mod.o: psi_serial_mod.o psb_realloc_mod.o
psb_s_mat_mod.o: psb_s_base_mat_mod.o psb_s_csr_mat_mod.o psb_s_csc_mat_mod.o psb_s_vect_mod.o
psb_d_mat_mod.o: psb_d_base_mat_mod.o psb_d_csr_mat_mod.o psb_d_csc_mat_mod.o psb_d_vect_mod.o
psb_c_mat_mod.o: psb_c_base_mat_mod.o psb_c_csr_mat_mod.o psb_c_csc_mat_mod.o psb_c_vect_mod.o
@@ -88,12 +89,13 @@ psb_desc_type.o: psb_penv_mod.o psb_realloc_mod.o\
psb_hash_mod.o psb_hash_map_mod.o psb_list_map_mod.o \
psb_repl_map_mod.o psb_gen_block_map_mod.o psb_desc_const_mod.o\
psb_indx_map_mod.o
psb_indx_map_mod.o: psb_desc_const_mod.o
psb_indx_map_mod.o: psb_desc_const_mod.o psb_error_mod.o psb_penv_mod.o
psb_hash_map_mod.o psb_list_map_mod.o psb_repl_map_mod.o psb_gen_block_map_mod.o:\
psb_indx_map_mod.o psb_desc_const_mod.o \
psb_sort_mod.o psb_penv_mod.o
psb_glist_map_mod.o: psb_list_map_mod.o
psb_hash_map_mod.o: psb_hash_mod.o psb_sort_mod.o
psb_hash_mod.o: psb_realloc_mod.o psb_const_mod.o
psb_linmap_mod.o: psb_s_linmap_mod.o psb_d_linmap_mod.o psb_c_linmap_mod.o psb_z_linmap_mod.o
psb_s_linmap_mod.o: psb_linmap_type_mod.o psb_mat_mod.o psb_s_vect_mod.o
psb_d_linmap_mod.o: psb_linmap_type_mod.o psb_mat_mod.o psb_d_vect_mod.o
@@ -131,8 +133,8 @@ psb_z_comm_mod.o: psb_z_vect_mod.o psb_desc_type.o psb_mat_mod.o
psb_base_mod.o: $(MODULES)
penvmod: $(BASIC_MODS)
($(MAKE) psb_penv_mod.o F90COPT="$(F90COPT) $(EXTRA_OPT)")
psb_penv_mod.o: $(BASIC_MODS) psb_penv_mod.F90
$(F90) -c psb_penv_mod.F90 $(FINCLUDES) $(FDEFINES) $(F90COPT) $(EXTRA_OPT)
base/serial/Makefile
+3 -3
View File
@@ -23,12 +23,12 @@ lib1: $(FOBJS)
auxd:
(cd aux; $(MAKE) lib)
cd aux && $(MAKE) lib
f77d:
(cd f77; $(MAKE) lib)
cd f77 && $(MAKE) lib
impld:
(cd impl; $(MAKE) lib)
cd impl && $(MAKE) lib
clean:
/bin/rm -f $(FOBJS) *$(.mod)
prec/Makefile
+4 -4
View File
@@ -44,10 +44,10 @@ psb_s_prec_type.o: psb_s_base_prec_mod.o
psb_d_prec_type.o: psb_d_base_prec_mod.o
psb_c_prec_type.o: psb_c_base_prec_mod.o
psb_z_prec_type.o: psb_z_base_prec_mod.o
psb_s_prec_mod.o: psb_s_prec_type.o
psb_d_prec_mod.o: psb_d_prec_type.o
psb_c_prec_mod.o: psb_c_prec_type.o
psb_z_prec_mod.o: psb_z_prec_type.o
psb_s_prec_mod.o: psb_prec_type.o
psb_d_prec_mod.o: psb_prec_type.o
psb_c_prec_mod.o: psb_prec_type.o
psb_z_prec_mod.o: psb_prec_type.o
psb_prec_type.o: psb_s_prec_type.o psb_d_prec_type.o psb_c_prec_type.o psb_z_prec_type.o
psb_prec_mod.o: psb_s_prec_mod.o psb_d_prec_mod.o psb_c_prec_mod.o psb_z_prec_mod.o
psb_s_bjacprec.o psb_s_diagprec.o psb_s_nullprec.o: psb_prec_mod.o psb_s_base_prec_mod.o
util/Makefile
+1 -3
View File
@@ -24,12 +24,10 @@ LIBNAME=$(UTILLIBNAME)
FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG).
lib: $(LIBDIR)/$(LIBNAME) $(LIBDIR)/$(LIBMOD)
lib: $(LIBDIR)/$(LIBNAME)
$(LIBDIR)/$(LIBNAME): $(HERE)/$(LIBNAME)
/bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR)
$(LIBDIR)/$(LIBMOD): $(LIBMOD)
/bin/cp -p $(CPUPDFLAG) $(LIBMOD) $(LOCAL_MODS) $(LIBDIR)
$(HERE)/$(LIBNAME): $(OBJS)