Rename krylov into linsolve where needed, step 1.

repack-newsolve
sfilippone 2 months ago
parent 029903dbad
commit ceac2faad0

@ -1,6 +1,6 @@
include Make.inc include Make.inc
all: dirs based precd kryld utild cbindd extd $(CUDAD) $(OACCD) libd all: dirs based precd linslvd utild cbindd extd $(CUDAD) $(OACCD) libd
@echo "=====================================" @echo "====================================="
@echo "PSBLAS libraries Compilation Successful." @echo "PSBLAS libraries Compilation Successful."
@ -11,16 +11,16 @@ dirs:
precd: based precd: based
utild: based utild: based
kryld: precd linslvd: precd
extd: based extd: based
cudad: extd cudad: extd
oaccd: extd oaccd: extd
cbindd: based precd kryld utild cbindd: based precd linslvd utild
libd: based precd kryld utild cbindd extd $(CUDALD) $(OACCLD) libd: based precd linslvd utild cbindd extd $(CUDALD) $(OACCLD)
$(MAKE) -C base lib $(MAKE) -C base lib
$(MAKE) -C prec lib $(MAKE) -C prec lib
$(MAKE) -C krylov lib $(MAKE) -C linsolve lib
$(MAKE) -C util lib $(MAKE) -C util lib
$(MAKE) -C cbind lib $(MAKE) -C cbind lib
$(MAKE) -C ext lib $(MAKE) -C ext lib
@ -34,8 +34,8 @@ based:
$(MAKE) -C base objs $(MAKE) -C base objs
precd: precd:
$(MAKE) -C prec objs $(MAKE) -C prec objs
kryld: linslvd:
$(MAKE) -C krylov objs $(MAKE) -C linsolve objs
utild: utild:
$(MAKE) -C util objs $(MAKE) -C util objs
cbindd: cbindd:
@ -67,7 +67,7 @@ install: all
clean: clean:
$(MAKE) -C base clean $(MAKE) -C base clean
$(MAKE) -C prec clean $(MAKE) -C prec clean
$(MAKE) -C krylov clean $(MAKE) -C linsolve clean
$(MAKE) -C util clean $(MAKE) -C util clean
$(MAKE) -C cbind clean $(MAKE) -C cbind clean
$(MAKE) -C ext clean $(MAKE) -C ext clean
@ -85,7 +85,7 @@ cleanlib:
veryclean: cleanlib veryclean: cleanlib
cd base && $(MAKE) veryclean cd base && $(MAKE) veryclean
cd prec && $(MAKE) veryclean cd prec && $(MAKE) veryclean
cd krylov && $(MAKE) veryclean cd linsolve && $(MAKE) veryclean
cd util && $(MAKE) veryclean cd util && $(MAKE) veryclean
cd cbind && $(MAKE) veryclean cd cbind && $(MAKE) veryclean
cd ext && $(MAKE) veryclean cd ext && $(MAKE) veryclean

@ -6,9 +6,9 @@ LIBDIR=../lib
INCDIR=../include INCDIR=../include
MODDIR=../modules MODDIR=../modules
MODOBJS= psb_base_krylov_conv_mod.o \ MODOBJS= psb_base_linsolve_conv_mod.o \
psb_s_krylov_conv_mod.o psb_c_krylov_conv_mod.o \ psb_s_linsolve_conv_mod.o psb_c_linsolve_conv_mod.o \
psb_d_krylov_conv_mod.o psb_z_krylov_conv_mod.o \ psb_d_linsolve_conv_mod.o psb_z_linsolve_conv_mod.o \
psb_krylov_mod.o psb_krylov_mod.o
F90OBJS=psb_dkrylov.o psb_skrylov.o psb_ckrylov.o psb_zkrylov.o \ F90OBJS=psb_dkrylov.o psb_skrylov.o psb_ckrylov.o psb_zkrylov.o \
psb_drichardson.o psb_srichardson.o psb_crichardson.o psb_zrichardson.o \ psb_drichardson.o psb_srichardson.o psb_crichardson.o psb_zrichardson.o \
@ -36,8 +36,8 @@ lib: objs
/bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR) /bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR)
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_s_linsolve_conv_mod.o psb_c_linsolve_conv_mod.o psb_d_linsolve_conv_mod.o psb_z_linsolve_conv_mod.o: psb_base_linsolve_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 psb_linsolve_conv_mod.o: psb_s_linsolve_conv_mod.o psb_c_linsolve_conv_mod.o psb_d_linsolve_conv_mod.o psb_z_linsolve_conv_mod.o
$(F90OBJS): $(MODOBJS) $(F90OBJS): $(MODOBJS)
$(OBJS): $(MODDIR)/$(PRECMODNAME)$(.mod) $(MODDIR)/$(BASEMODNAME)$(.mod) $(OBJS): $(MODDIR)/$(PRECMODNAME)$(.mod) $(MODDIR)/$(BASEMODNAME)$(.mod)

@ -30,10 +30,10 @@
! !
! !
! !
! File: psb_krylov_mod.f90 ! File: psb_base_linsolve_mod.f90
! Interfaces for Krylov subspace iterative methods. ! Interfaces for linear solvers' convergence handling.
! !
Module psb_base_krylov_conv_mod Module psb_base_linsolve_conv_mod
use psb_const_mod use psb_const_mod
@ -166,4 +166,4 @@ contains
end subroutine psb_d_end_conv end subroutine psb_d_end_conv
end module psb_base_krylov_conv_mod end module psb_base_linsolve_conv_mod

@ -30,12 +30,12 @@
! !
! !
! !
! File: psb_krylov_conv_mod.f90 ! File: psb_linsolve_conv_mod.f90
! Interfaces for Krylov subspace iterative methods. ! Interfaces for Krylov subspace iterative methods.
! !
Module psb_c_krylov_conv_mod Module psb_c_linsolve_conv_mod
use psb_base_krylov_conv_mod use psb_base_linsolve_conv_mod
interface psb_init_conv interface psb_init_conv
module procedure psb_c_init_conv, psb_c_init_conv_vect module procedure psb_c_init_conv, psb_c_init_conv_vect
@ -355,4 +355,4 @@ contains
end function psb_c_check_conv_vect end function psb_c_check_conv_vect
end module psb_c_krylov_conv_mod end module psb_c_linsolve_conv_mod

@ -30,12 +30,12 @@
! !
! !
! !
! File: psb_krylov_conv_mod.f90 ! File: psb_linsolve_conv_mod.f90
! Interfaces for Krylov subspace iterative methods. ! Interfaces for Krylov subspace iterative methods.
! !
Module psb_d_krylov_conv_mod Module psb_d_linsolve_conv_mod
use psb_base_krylov_conv_mod use psb_base_linsolve_conv_mod
interface psb_init_conv interface psb_init_conv
module procedure psb_d_init_conv, psb_d_init_conv_vect module procedure psb_d_init_conv, psb_d_init_conv_vect
@ -355,4 +355,4 @@ contains
end function psb_d_check_conv_vect end function psb_d_check_conv_vect
end module psb_d_krylov_conv_mod end module psb_d_linsolve_conv_mod

@ -30,12 +30,12 @@
! !
! !
! !
! File: psb_krylov_mod.f90 ! File: psb_linsolve_conv_mod.f90
! Interfaces for Krylov subspace iterative methods. ! Interfaces for linear solvers' convergence handling.
! !
module psb_krylov_conv_mod module psb_linsolve_conv_mod
use psb_s_krylov_conv_mod use psb_s_linsolve_conv_mod
use psb_d_krylov_conv_mod use psb_d_linsolve_conv_mod
use psb_c_krylov_conv_mod use psb_c_linsolve_conv_mod
use psb_z_krylov_conv_mod use psb_z_linsolve_conv_mod
end module psb_krylov_conv_mod end module psb_linsolve_conv_mod

@ -30,12 +30,12 @@
! !
! !
! !
! File: psb_krylov_conv_mod.f90 ! File: psb_linsolve_conv_mod.f90
! Interfaces for Krylov subspace iterative methods. ! Interfaces for Krylov subspace iterative methods.
! !
Module psb_s_krylov_conv_mod Module psb_s_linsolve_conv_mod
use psb_base_krylov_conv_mod use psb_base_linsolve_conv_mod
interface psb_init_conv interface psb_init_conv
module procedure psb_s_init_conv, psb_s_init_conv_vect module procedure psb_s_init_conv, psb_s_init_conv_vect
@ -355,4 +355,4 @@ contains
end function psb_s_check_conv_vect end function psb_s_check_conv_vect
end module psb_s_krylov_conv_mod end module psb_s_linsolve_conv_mod

@ -30,12 +30,12 @@
! !
! !
! !
! File: psb_krylov_conv_mod.f90 ! File: psb_linsolve_conv_mod.f90
! Interfaces for Krylov subspace iterative methods. ! Interfaces for linear solvers.
! !
Module psb_z_krylov_conv_mod Module psb_z_linsolve_conv_mod
use psb_base_krylov_conv_mod use psb_base_linsolve_conv_mod
interface psb_init_conv interface psb_init_conv
module procedure psb_z_init_conv, psb_z_init_conv_vect module procedure psb_z_init_conv, psb_z_init_conv_vect
@ -355,4 +355,4 @@ contains
end function psb_z_check_conv_vect end function psb_z_check_conv_vect
end module psb_z_krylov_conv_mod end module psb_z_linsolve_conv_mod
Loading…
Cancel
Save