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

psblas3:

Browse Source 
Make.inc.in
 base/modules/psb_c_base_mat_mod.f03
 base/modules/psb_d_base_mat_mod.f03
 base/modules/psb_desc_type.f90
 base/modules/psb_s_base_mat_mod.f03
 base/modules/psb_z_base_mat_mod.f03
 configure.ac
 configure

Fixes for XLF:
1. Make.inc/configure
2. Intent(INOUT) on A in base version of SCAL
psblas3-type-indexed
Salvatore Filippone 15 years ago
parent d4cf5acc20
commit 431c342fdc
8 changed files with 46 additions and 35 deletions
Show Stats Download Patch File Download Diff File

2
Make.inc.in
Unescape Escape View File

@ -10,7 +10,7 @@
# The following ones are the variables used by the PSBLAS make scripts. # The following ones are the variables used by the PSBLAS make scripts.
F03=@F90@ F03=@F03@
F90=@F90@ F90=@F90@
FC=@FC@ FC=@FC@
CC=@CC@ CC=@CC@

4
base/modules/psb_c_base_mat_mod.f03
Unescape Escape View File

@ -1353,7 +1353,7 @@ contains
subroutine c_scals(d,a,info) subroutine c_scals(d,a,info)
use psb_error_mod use psb_error_mod
implicit none implicit none
class(psb_c_base_sparse_mat), intent(in) :: a class(psb_c_base_sparse_mat), intent(inout) :: a
complex(psb_spk_), intent(in) :: d complex(psb_spk_), intent(in) :: d
integer, intent(out) :: info integer, intent(out) :: info
@ -1379,7 +1379,7 @@ contains
subroutine c_scal(d,a,info) subroutine c_scal(d,a,info)
use psb_error_mod use psb_error_mod
implicit none implicit none
class(psb_c_base_sparse_mat), intent(in) :: a class(psb_c_base_sparse_mat), intent(inout) :: a
complex(psb_spk_), intent(in) :: d(:) complex(psb_spk_), intent(in) :: d(:)
integer, intent(out) :: info integer, intent(out) :: info

4
base/modules/psb_d_base_mat_mod.f03
Unescape Escape View File

@ -1325,7 +1325,7 @@ contains
subroutine d_scals(d,a,info) subroutine d_scals(d,a,info)
use psb_error_mod use psb_error_mod
implicit none implicit none
class(psb_d_base_sparse_mat), intent(in) :: a class(psb_d_base_sparse_mat), intent(inout) :: a
real(psb_dpk_), intent(in) :: d real(psb_dpk_), intent(in) :: d
integer, intent(out) :: info integer, intent(out) :: info
@ -1351,7 +1351,7 @@ contains
subroutine d_scal(d,a,info) subroutine d_scal(d,a,info)
use psb_error_mod use psb_error_mod
implicit none implicit none
class(psb_d_base_sparse_mat), intent(in) :: a class(psb_d_base_sparse_mat), intent(inout) :: a
real(psb_dpk_), intent(in) :: d(:) real(psb_dpk_), intent(in) :: d(:)
integer, intent(out) :: info integer, intent(out) :: info

24
base/modules/psb_desc_type.f90
Unescape Escape View File

@ -708,12 +708,14 @@ contains
integer, intent(out) :: totxch,idxr,idxs,info integer, intent(out) :: totxch,idxr,idxs,info
!locals !locals
integer :: np,me,ictxt,err_act integer :: np,me,ictxt,err_act, debug_level,debug_unit
logical, parameter :: debug=.false.,debugprt=.false. logical, parameter :: debug=.false.,debugprt=.false.
character(len=20), parameter :: name='psb_cd_get_list' character(len=20), parameter :: name='psb_cd_get_list'
info = 0 info = 0
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level()
ictxt = psb_cd_get_context(desc) ictxt = psb_cd_get_context(desc)
@ -726,15 +728,17 @@ contains
ipnt => desc%ovrlap_index ipnt => desc%ovrlap_index
case(psb_comm_ext_) case(psb_comm_ext_)
ipnt => desc%ext_index ipnt => desc%ext_index
if (.not.associated(desc%base_desc)) then if (debug_level >= psb_debug_ext_) then
write(0,*) trim(name),& if (.not.associated(desc%base_desc)) then
& ': Warning: trying to get ext_index on a descriptor ',& write(debug_unit,*) trim(name),&
& 'which does not have a base_desc!' & ': Warning: trying to get ext_index on a descriptor ',&
end if & 'which does not have a base_desc!'
if (.not.psb_is_ovl_desc(desc)) then end if
write(0,*) trim(name),& if (.not.psb_is_ovl_desc(desc)) then
& ': Warning: trying to get ext_index on a descriptor ',& write(debug_unit,*) trim(name),&
& 'which is not overlap-extended!' & ': Warning: trying to get ext_index on a descriptor ',&
& 'which is not overlap-extended!'
end if
end if end if
case(psb_comm_mov_) case(psb_comm_mov_)
ipnt => desc%ovr_mst_idx ipnt => desc%ovr_mst_idx

4
base/modules/psb_s_base_mat_mod.f03
Unescape Escape View File

@ -1295,7 +1295,7 @@ contains
subroutine s_scals(d,a,info) subroutine s_scals(d,a,info)
use psb_error_mod use psb_error_mod
implicit none implicit none
class(psb_s_base_sparse_mat), intent(in) :: a class(psb_s_base_sparse_mat), intent(inout) :: a
real(psb_spk_), intent(in) :: d real(psb_spk_), intent(in) :: d
integer, intent(out) :: info integer, intent(out) :: info
@ -1321,7 +1321,7 @@ contains
subroutine s_scal(d,a,info) subroutine s_scal(d,a,info)
use psb_error_mod use psb_error_mod
implicit none implicit none
class(psb_s_base_sparse_mat), intent(in) :: a class(psb_s_base_sparse_mat), intent(inout) :: a
real(psb_spk_), intent(in) :: d(:) real(psb_spk_), intent(in) :: d(:)
integer, intent(out) :: info integer, intent(out) :: info

4
base/modules/psb_z_base_mat_mod.f03
Unescape Escape View File

@ -1354,7 +1354,7 @@ contains
subroutine z_scals(d,a,info) subroutine z_scals(d,a,info)
use psb_error_mod use psb_error_mod
implicit none implicit none
class(psb_z_base_sparse_mat), intent(in) :: a class(psb_z_base_sparse_mat), intent(inout) :: a
complex(psb_dpk_), intent(in) :: d complex(psb_dpk_), intent(in) :: d
integer, intent(out) :: info integer, intent(out) :: info
@ -1380,7 +1380,7 @@ contains
subroutine z_scal(d,a,info) subroutine z_scal(d,a,info)
use psb_error_mod use psb_error_mod
implicit none implicit none
class(psb_z_base_sparse_mat), intent(in) :: a class(psb_z_base_sparse_mat), intent(inout) :: a
complex(psb_dpk_), intent(in) :: d(:) complex(psb_dpk_), intent(in) :: d(:)
integer, intent(out) :: info integer, intent(out) :: info

20
configure vendored
Unescape Escape View File

@ -670,6 +670,7 @@ MPCC
MPF77 MPF77
MPF90 MPF90
F03COPT F03COPT
F03
F90COPT F90COPT
F90 F90
BASELIBNAME BASELIBNAME
@ -7170,6 +7171,7 @@ if test "X$psblas_cv_fc" == X"xlf" ; then
# - if called from some script, xlf could behave strangely # - if called from some script, xlf could behave strangely
# - it is not said that mpxlf95 gets chosen by the configure script. # - it is not said that mpxlf95 gets chosen by the configure script.
F90="xlf95 -qsuffix=f=f90:cpp=F90" F90="xlf95 -qsuffix=f=f90:cpp=F90"
F03="xlf2003 -qsuffix=f=f03:cpp=F03"
# F90="xlf95" # F90="xlf95"
# FC="xlf" # FC="xlf"
@ -7198,6 +7200,7 @@ else
# If the user wishes to, she should specify MPICC, MPIF77 after ./configure. # If the user wishes to, she should specify MPICC, MPIF77 after ./configure.
# Note: this behavious should be documented. # Note: this behavious should be documented.
F90=${FC} F90=${FC}
F03=${FC}
MPF90=${MPIFC} MPF90=${MPIFC}
FC=${FC} FC=${FC}
MPF77=${MPIFC} MPF77=${MPIFC}
@ -10965,6 +10968,7 @@ UTILLIBNAME=libpsb_util.a
if test "X$psblas_make_gnumake" == "Xyes" ; then if test "X$psblas_make_gnumake" == "Xyes" ; then
@ -10996,13 +11000,13 @@ $(.mod).o:
$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $< $(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
%.o: %.f03 %.o: %.f03
$(F90) $(F90COPT) $(FINCLUDES) -c $< $(F03) $(F03COPT) $(FINCLUDES) -c $<
%$(.mod): %.f03 %$(.mod): %.f03
$(F90) $(F90COPT) $(FINCLUDES) -c $< $(F03) $(F03COPT) $(FINCLUDES) -c $<
%.o: %.F03 %.o: %.F03
$(F90) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $< $(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<
%$(.mod): %.F03 %$(.mod): %.F03
$(F90) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<' $(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<'
else else
@ -11034,13 +11038,13 @@ $(.mod).o:
.F90$(.mod): .F90$(.mod):
$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $< $(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
.f03$(.mod): .f03$(.mod):
$(F90) $(F90COPT) $(FINCLUDES) -c $< $(F03) $(F03COPT) $(FINCLUDES) -c $<
.f03.o: .f03.o:
$(F90) $(F90COPT) $(FINCLUDES) -c $< $(F03) $(F03COPT) $(FINCLUDES) -c $<
.F03.o: .F03.o:
$(F90) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $< $(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<
.F03$(.mod): .F03$(.mod):
$(F90) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<' $(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<'
fi fi

19
configure.ac
Unescape Escape View File

@ -452,6 +452,7 @@ if test "X$psblas_cv_fc" == X"xlf" ; then
# - if called from some script, xlf could behave strangely # - if called from some script, xlf could behave strangely
# - it is not said that mpxlf95 gets chosen by the configure script. # - it is not said that mpxlf95 gets chosen by the configure script.
F90="xlf95 -qsuffix=f=f90:cpp=F90" F90="xlf95 -qsuffix=f=f90:cpp=F90"
F03="xlf2003 -qsuffix=f=f03:cpp=F03"
# F90="xlf95" # F90="xlf95"
# FC="xlf" # FC="xlf"
@ -480,6 +481,7 @@ else
# If the user wishes to, she should specify MPICC, MPIF77 after ./configure. # If the user wishes to, she should specify MPICC, MPIF77 after ./configure.
# Note: this behavious should be documented. # Note: this behavious should be documented.
F90=${FC} F90=${FC}
F03=${FC}
MPF90=${MPIFC} MPF90=${MPIFC}
FC=${FC} FC=${FC}
MPF77=${MPIFC} MPF77=${MPIFC}
@ -668,6 +670,7 @@ AC_SUBST(CDEFINES)
AC_SUBST(BASELIBNAME) AC_SUBST(BASELIBNAME)
AC_SUBST(F90) AC_SUBST(F90)
AC_SUBST(F90COPT) AC_SUBST(F90COPT)
AC_SUBST(F03)
AC_SUBST(F03COPT) AC_SUBST(F03COPT)
AC_SUBST(MPF90) AC_SUBST(MPF90)
AC_SUBST(MPF77) AC_SUBST(MPF77)
@ -732,13 +735,13 @@ $(.mod).o:
$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $< $(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
%.o: %.f03 %.o: %.f03
$(F90) $(F90COPT) $(FINCLUDES) -c $< $(F03) $(F03COPT) $(FINCLUDES) -c $<
%$(.mod): %.f03 %$(.mod): %.f03
$(F90) $(F90COPT) $(FINCLUDES) -c $< $(F03) $(F03COPT) $(FINCLUDES) -c $<
%.o: %.F03 %.o: %.F03
$(F90) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $< $(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<
%$(.mod): %.F03 %$(.mod): %.F03
$(F90) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<' $(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<'
else else
@ -770,13 +773,13 @@ $(.mod).o:
.F90$(.mod): .F90$(.mod):
$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $< $(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
.f03$(.mod): .f03$(.mod):
$(F90) $(F90COPT) $(FINCLUDES) -c $< $(F03) $(F03COPT) $(FINCLUDES) -c $<
.f03.o: .f03.o:
$(F90) $(F90COPT) $(FINCLUDES) -c $< $(F03) $(F03COPT) $(FINCLUDES) -c $<
.F03.o: .F03.o:
$(F90) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $< $(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<
.F03$(.mod): .F03$(.mod):
$(F90) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<' $(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<'
fi fi
AC_SUBST(PSBLASRULES) AC_SUBST(PSBLASRULES)

Write Preview
Loading…
Cancel
Save