diff --git a/base/modules/desc/psb_desc_mod.F90 b/base/modules/desc/psb_desc_mod.F90 index fcb4330a..dca36128 100644 --- a/base/modules/desc/psb_desc_mod.F90 +++ b/base/modules/desc/psb_desc_mod.F90 @@ -286,7 +286,7 @@ module psb_desc_mod module procedure psb_i_cd_set_large_threshold end interface psb_cd_set_large_threshold -#if defined(INT_I4_L8) +#if defined(IPK4) && defined(LPK8) interface psb_cd_set_large_threshold module procedure psb_l_cd_set_large_threshold end interface psb_cd_set_large_threshold diff --git a/base/modules/desc/psb_hash_mod.F90 b/base/modules/desc/psb_hash_mod.F90 index af0182ef..0e6ab3c7 100644 --- a/base/modules/desc/psb_hash_mod.F90 +++ b/base/modules/desc/psb_hash_mod.F90 @@ -86,7 +86,7 @@ module psb_hash_mod module procedure psb_hash_lsearchkey end interface psb_hash_searchkey -#if defined (INT_I4_L8) +#if defined(IPK4) && defined(LPK8) interface psb_hash_init module procedure psb_hash_init_v, psb_hash_init_n end interface diff --git a/base/modules/penv/psi_penv_mod.F90 b/base/modules/penv/psi_penv_mod.F90 index 8f5cbc1f..b4feabb4 100644 --- a/base/modules/penv/psi_penv_mod.F90 +++ b/base/modules/penv/psi_penv_mod.F90 @@ -155,13 +155,13 @@ contains if (info == 0) call mpi_type_create_f90_complex(psb_spk_p_,psb_spk_r_, psb_mpi_c_spk_,info) if (info == 0) call mpi_type_create_f90_complex(psb_dpk_p_,psb_dpk_r_, psb_mpi_c_dpk_,info) #else -#if defined(INT_I4_L4) +#if defined(IPK4) && defined(LPK4) psb_mpi_ipk_ = mpi_integer4 psb_mpi_lpk_ = mpi_integer4 -#elif defined(INT_I4_L8) +#elif defined(IPK4) && defined(LPK8) psb_mpi_ipk_ = mpi_integer4 psb_mpi_lpk_ = mpi_integer8 -#elif defined(INT_I8_L8) +#elif defined(IPK8) && defined(LPK8) psb_mpi_ipk_ = mpi_integer8 psb_mpi_lpk_ = mpi_integer8 #else diff --git a/base/modules/psb_const_mod.F90 b/base/modules/psb_const_mod.F90 index fabf1fc6..d0b169c7 100644 --- a/base/modules/psb_const_mod.F90 +++ b/base/modules/psb_const_mod.F90 @@ -86,13 +86,13 @@ module psb_const_mod ! compiler will later pick up the correct version according ! to what IPK/LPK are mapped onto. ! -#if defined(INT_I4_L4) +#if defined(IPK4) && defined(LPK4) integer, parameter :: psb_ipk_ = psb_mpk_ integer, parameter :: psb_lpk_ = psb_mpk_ -#elif defined(INT_I4_L8) +#elif defined(IPK4) && defined(LPK8) integer, parameter :: psb_ipk_ = psb_mpk_ integer, parameter :: psb_lpk_ = psb_epk_ -#elif defined(INT_I8_L8) +#elif defined(IPK8) && defined(LPK8) integer, parameter :: psb_ipk_ = psb_epk_ integer, parameter :: psb_lpk_ = psb_epk_ #else diff --git a/base/modules/psb_error_impl.F90 b/base/modules/psb_error_impl.F90 index 72bd2aff..1073f24d 100644 --- a/base/modules/psb_error_impl.F90 +++ b/base/modules/psb_error_impl.F90 @@ -9,7 +9,7 @@ subroutine psb_errcomm_i(ictxt, err) end subroutine psb_errcomm_i -#if defined(INT_I8_L8) +#if defined(IPK8) subroutine psb_errcomm_m(ictxt, err) use psb_error_mod, psb_protect_name => psb_errcomm diff --git a/base/modules/psb_error_mod.F90 b/base/modules/psb_error_mod.F90 index f2cd301c..71552564 100644 --- a/base/modules/psb_error_mod.F90 +++ b/base/modules/psb_error_mod.F90 @@ -99,7 +99,7 @@ module psb_error_mod end interface interface psb_errcomm -#if defined(INT_I8_L8) +#if defined(IPK8) subroutine psb_errcomm_m(ictxt, err) import :: psb_ipk_, psb_mpk_ integer(psb_mpk_), intent(in) :: ictxt diff --git a/base/modules/serial/psb_c_mat_mod.F90 b/base/modules/serial/psb_c_mat_mod.F90 index 426fe4a3..f2700d7c 100644 --- a/base/modules/serial/psb_c_mat_mod.F90 +++ b/base/modules/serial/psb_c_mat_mod.F90 @@ -128,7 +128,7 @@ module psb_c_mat_mod procedure, pass(a) :: csgetrow => psb_c_csgetrow procedure, pass(a) :: csgetblk => psb_c_csgetblk generic, public :: csget => csgetptn, csgetrow, csgetblk -#if defined(INT_I4_L8) +#if defined(IPK4) && defined(LPK8) procedure, pass(a) :: lcsgetptn => psb_c_lcsgetptn procedure, pass(a) :: lcsgetrow => psb_c_lcsgetrow generic, public :: csget => lcsgetptn, lcsgetrow @@ -1297,7 +1297,7 @@ contains end subroutine psb_c_clean_zeros -#if defined(INT_I4_L8) +#if defined(IPK4) && defined(LPK8) subroutine psb_c_lcsgetptn(imin,imax,a,nz,ia,ja,info,& & jmin,jmax,iren,append,nzin,rscale,cscale) implicit none diff --git a/base/modules/serial/psb_d_mat_mod.F90 b/base/modules/serial/psb_d_mat_mod.F90 index 264a868f..cfca7fff 100644 --- a/base/modules/serial/psb_d_mat_mod.F90 +++ b/base/modules/serial/psb_d_mat_mod.F90 @@ -128,7 +128,7 @@ module psb_d_mat_mod procedure, pass(a) :: csgetrow => psb_d_csgetrow procedure, pass(a) :: csgetblk => psb_d_csgetblk generic, public :: csget => csgetptn, csgetrow, csgetblk -#if defined(INT_I4_L8) +#if defined(IPK4) && defined(LPK8) procedure, pass(a) :: lcsgetptn => psb_d_lcsgetptn procedure, pass(a) :: lcsgetrow => psb_d_lcsgetrow generic, public :: csget => lcsgetptn, lcsgetrow @@ -1297,7 +1297,7 @@ contains end subroutine psb_d_clean_zeros -#if defined(INT_I4_L8) +#if defined(IPK4) && defined(LPK8) subroutine psb_d_lcsgetptn(imin,imax,a,nz,ia,ja,info,& & jmin,jmax,iren,append,nzin,rscale,cscale) implicit none diff --git a/base/modules/serial/psb_s_mat_mod.F90 b/base/modules/serial/psb_s_mat_mod.F90 index 791d6fbb..0444ea81 100644 --- a/base/modules/serial/psb_s_mat_mod.F90 +++ b/base/modules/serial/psb_s_mat_mod.F90 @@ -128,7 +128,7 @@ module psb_s_mat_mod procedure, pass(a) :: csgetrow => psb_s_csgetrow procedure, pass(a) :: csgetblk => psb_s_csgetblk generic, public :: csget => csgetptn, csgetrow, csgetblk -#if defined(INT_I4_L8) +#if defined(IPK4) && defined(LPK8) procedure, pass(a) :: lcsgetptn => psb_s_lcsgetptn procedure, pass(a) :: lcsgetrow => psb_s_lcsgetrow generic, public :: csget => lcsgetptn, lcsgetrow @@ -1297,7 +1297,7 @@ contains end subroutine psb_s_clean_zeros -#if defined(INT_I4_L8) +#if defined(IPK4) && defined(LPK8) subroutine psb_s_lcsgetptn(imin,imax,a,nz,ia,ja,info,& & jmin,jmax,iren,append,nzin,rscale,cscale) implicit none diff --git a/base/modules/serial/psb_z_mat_mod.F90 b/base/modules/serial/psb_z_mat_mod.F90 index e13e1498..83a19482 100644 --- a/base/modules/serial/psb_z_mat_mod.F90 +++ b/base/modules/serial/psb_z_mat_mod.F90 @@ -128,7 +128,7 @@ module psb_z_mat_mod procedure, pass(a) :: csgetrow => psb_z_csgetrow procedure, pass(a) :: csgetblk => psb_z_csgetblk generic, public :: csget => csgetptn, csgetrow, csgetblk -#if defined(INT_I4_L8) +#if defined(IPK4) && defined(LPK8) procedure, pass(a) :: lcsgetptn => psb_z_lcsgetptn procedure, pass(a) :: lcsgetrow => psb_z_lcsgetrow generic, public :: csget => lcsgetptn, lcsgetrow @@ -1297,7 +1297,7 @@ contains end subroutine psb_z_clean_zeros -#if defined(INT_I4_L8) +#if defined(IPK4) && defined(LPK8) subroutine psb_z_lcsgetptn(imin,imax,a,nz,ia,ja,info,& & jmin,jmax,iren,append,nzin,rscale,cscale) implicit none diff --git a/base/tools/psb_csphalo.F90 b/base/tools/psb_csphalo.F90 index 41f25a65..aeac2a3e 100644 --- a/base/tools/psb_csphalo.F90 +++ b/base/tools/psb_csphalo.F90 @@ -84,8 +84,8 @@ Subroutine psb_csphalo(a,desc_a,blk,info,rowcnv,colcnv,& integer(psb_mpk_) :: icomm, minfo integer(psb_mpk_), allocatable :: brvindx(:), & & rvsz(:), bsdindx(:),sdsz(:) -#if defined(INT_I4_L8) - ! If globals are 8 bytes but locals are not, things get tricky +#if defined(IPK4) && defined(LPK8) + ! If globals are 8 bytes but locals are 4, things get tricky integer(psb_ipk_), allocatable :: liasnd(:), ljasnd(:) integer(psb_lpk_), allocatable :: iasnd(:), jasnd(:), iarcv(:), jarcv(:) #else @@ -239,7 +239,7 @@ Subroutine psb_csphalo(a,desc_a,blk,info,rowcnv,colcnv,& if (info == psb_success_) call psb_ensure_size(max(iszs,1),iasnd,info) if (info == psb_success_) call psb_ensure_size(max(iszs,1),jasnd,info) if (info == psb_success_) call psb_ensure_size(max(iszs,1),valsnd,info) -#if defined(INT_I4_L8) +#if defined(IPK4) && defined(LPK8) ! If globals are 8 bytes but locals are not, things get tricky if (info == psb_success_) call psb_ensure_size(max(iszs,1),liasnd,info) if (info == psb_success_) call psb_ensure_size(max(iszs,1),ljasnd,info) diff --git a/base/tools/psb_dsphalo.F90 b/base/tools/psb_dsphalo.F90 index f60ced48..e8254569 100644 --- a/base/tools/psb_dsphalo.F90 +++ b/base/tools/psb_dsphalo.F90 @@ -84,8 +84,8 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rowcnv,colcnv,& integer(psb_mpk_) :: icomm, minfo integer(psb_mpk_), allocatable :: brvindx(:), & & rvsz(:), bsdindx(:),sdsz(:) -#if defined(INT_I4_L8) - ! If globals are 8 bytes but locals are not, things get tricky +#if defined(IPK4) && defined(LPK8) + ! If globals are 8 bytes but locals are 4, things get tricky integer(psb_ipk_), allocatable :: liasnd(:), ljasnd(:) integer(psb_lpk_), allocatable :: iasnd(:), jasnd(:), iarcv(:), jarcv(:) #else @@ -239,7 +239,7 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rowcnv,colcnv,& if (info == psb_success_) call psb_ensure_size(max(iszs,1),iasnd,info) if (info == psb_success_) call psb_ensure_size(max(iszs,1),jasnd,info) if (info == psb_success_) call psb_ensure_size(max(iszs,1),valsnd,info) -#if defined(INT_I4_L8) +#if defined(IPK4) && defined(LPK8) ! If globals are 8 bytes but locals are not, things get tricky if (info == psb_success_) call psb_ensure_size(max(iszs,1),liasnd,info) if (info == psb_success_) call psb_ensure_size(max(iszs,1),ljasnd,info) diff --git a/base/tools/psb_ssphalo.F90 b/base/tools/psb_ssphalo.F90 index 00e683d7..1576ff3e 100644 --- a/base/tools/psb_ssphalo.F90 +++ b/base/tools/psb_ssphalo.F90 @@ -84,8 +84,8 @@ Subroutine psb_ssphalo(a,desc_a,blk,info,rowcnv,colcnv,& integer(psb_mpk_) :: icomm, minfo integer(psb_mpk_), allocatable :: brvindx(:), & & rvsz(:), bsdindx(:),sdsz(:) -#if defined(INT_I4_L8) - ! If globals are 8 bytes but locals are not, things get tricky +#if defined(IPK4) && defined(LPK8) + ! If globals are 8 bytes but locals are 4, things get tricky integer(psb_ipk_), allocatable :: liasnd(:), ljasnd(:) integer(psb_lpk_), allocatable :: iasnd(:), jasnd(:), iarcv(:), jarcv(:) #else @@ -239,7 +239,7 @@ Subroutine psb_ssphalo(a,desc_a,blk,info,rowcnv,colcnv,& if (info == psb_success_) call psb_ensure_size(max(iszs,1),iasnd,info) if (info == psb_success_) call psb_ensure_size(max(iszs,1),jasnd,info) if (info == psb_success_) call psb_ensure_size(max(iszs,1),valsnd,info) -#if defined(INT_I4_L8) +#if defined(IPK4) && defined(LPK8) ! If globals are 8 bytes but locals are not, things get tricky if (info == psb_success_) call psb_ensure_size(max(iszs,1),liasnd,info) if (info == psb_success_) call psb_ensure_size(max(iszs,1),ljasnd,info) diff --git a/base/tools/psb_zsphalo.F90 b/base/tools/psb_zsphalo.F90 index cb38ab76..f38a76d8 100644 --- a/base/tools/psb_zsphalo.F90 +++ b/base/tools/psb_zsphalo.F90 @@ -84,8 +84,8 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rowcnv,colcnv,& integer(psb_mpk_) :: icomm, minfo integer(psb_mpk_), allocatable :: brvindx(:), & & rvsz(:), bsdindx(:),sdsz(:) -#if defined(INT_I4_L8) - ! If globals are 8 bytes but locals are not, things get tricky +#if defined(IPK4) && defined(LPK8) + ! If globals are 8 bytes but locals are 4, things get tricky integer(psb_ipk_), allocatable :: liasnd(:), ljasnd(:) integer(psb_lpk_), allocatable :: iasnd(:), jasnd(:), iarcv(:), jarcv(:) #else @@ -239,7 +239,7 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rowcnv,colcnv,& if (info == psb_success_) call psb_ensure_size(max(iszs,1),iasnd,info) if (info == psb_success_) call psb_ensure_size(max(iszs,1),jasnd,info) if (info == psb_success_) call psb_ensure_size(max(iszs,1),valsnd,info) -#if defined(INT_I4_L8) +#if defined(IPK4) && defined(LPK8) ! If globals are 8 bytes but locals are not, things get tricky if (info == psb_success_) call psb_ensure_size(max(iszs,1),liasnd,info) if (info == psb_success_) call psb_ensure_size(max(iszs,1),ljasnd,info) diff --git a/configure b/configure index d501f6a6..4da2e9cc 100755 --- a/configure +++ b/configure @@ -6883,10 +6883,8 @@ $as_echo "$as_me: Invalid combination of size specs IPK ${pac_cv_ipk_size} LPK $ $as_echo "$as_me: Forcing equal values" >&6;} pac_cv_lpk_size=$pac_cv_ipk_size; fi -FDEFINES="$psblas_cv_define_prepend-DINT_I${pac_cv_ipk_size}_L${pac_cv_lpk_size} $FDEFINES"; FDEFINES="$psblas_cv_define_prepend-DIPK${pac_cv_ipk_size} $FDEFINES"; FDEFINES="$psblas_cv_define_prepend-DLPK${pac_cv_lpk_size} $FDEFINES"; -CDEFINES="-DINT_I${pac_cv_ipk_size}_L${pac_cv_lpk_size} $CDEFINES" CDEFINES="-DIPK${pac_cv_ipk_size} -DLPK${pac_cv_lpk_size} $CDEFINES" diff --git a/configure.ac b/configure.ac index 47c4cecf..90241abe 100755 --- a/configure.ac +++ b/configure.ac @@ -499,10 +499,8 @@ if (( $pac_cv_lpk_size < $pac_cv_ipk_size )); then AC_MSG_NOTICE([[Forcing equal values]]) pac_cv_lpk_size=$pac_cv_ipk_size; fi -FDEFINES="$psblas_cv_define_prepend-DINT_I${pac_cv_ipk_size}_L${pac_cv_lpk_size} $FDEFINES"; FDEFINES="$psblas_cv_define_prepend-DIPK${pac_cv_ipk_size} $FDEFINES"; FDEFINES="$psblas_cv_define_prepend-DLPK${pac_cv_lpk_size} $FDEFINES"; -CDEFINES="-DINT_I${pac_cv_ipk_size}_L${pac_cv_lpk_size} $CDEFINES" CDEFINES="-DIPK${pac_cv_ipk_size} -DLPK${pac_cv_lpk_size} $CDEFINES" diff --git a/util/psb_c_renum_impl.F90 b/util/psb_c_renum_impl.F90 index 8d9b0060..4a1cf220 100644 --- a/util/psb_c_renum_impl.F90 +++ b/util/psb_c_renum_impl.F90 @@ -267,7 +267,7 @@ contains name = 'mat_renum_amd' call psb_erractionsave(err_act) -#if defined(HAVE_AMD) && !defined(INT_I8_L8) +#if defined(HAVE_AMD) && defined(IPK4) info = psb_success_ nr = a%get_nrows() diff --git a/util/psb_d_renum_impl.F90 b/util/psb_d_renum_impl.F90 index 5c32bd05..bd4664d8 100644 --- a/util/psb_d_renum_impl.F90 +++ b/util/psb_d_renum_impl.F90 @@ -267,7 +267,7 @@ contains name = 'mat_renum_amd' call psb_erractionsave(err_act) -#if defined(HAVE_AMD) && !defined(INT_I8_L8) +#if defined(HAVE_AMD) && defined(IPK4) info = psb_success_ nr = a%get_nrows() diff --git a/util/psb_metispart_mod.F90 b/util/psb_metispart_mod.F90 index 12e4c34c..71ac4db5 100644 --- a/util/psb_metispart_mod.F90 +++ b/util/psb_metispart_mod.F90 @@ -316,7 +316,7 @@ contains integer(psb_ipk_), allocatable :: irpl(:),jal(:),gvl(:) real(psb_spk_),allocatable :: wgh_(:) -#if defined(HAVE_METIS) && !defined(INT_I8_L8) +#if defined(HAVE_METIS) && defined(IPK4) interface ! subroutine METIS_PartGraphKway(n,ixadj,iadj,ivwg,iajw,& ! & wgflag,numflag,nparts,weights,iopt,nedc,part) bind(c) diff --git a/util/psb_s_renum_impl.F90 b/util/psb_s_renum_impl.F90 index 05a7794c..008bbbb0 100644 --- a/util/psb_s_renum_impl.F90 +++ b/util/psb_s_renum_impl.F90 @@ -268,7 +268,7 @@ contains name = 'mat_renum_amd' call psb_erractionsave(err_act) -#if defined(HAVE_AMD) && !defined(INT_I8_L8) +#if defined(HAVE_AMD) && defined(IPK4) info = psb_success_ nr = a%get_nrows() diff --git a/util/psb_z_renum_impl.F90 b/util/psb_z_renum_impl.F90 index 4a98093a..aa8f6b72 100644 --- a/util/psb_z_renum_impl.F90 +++ b/util/psb_z_renum_impl.F90 @@ -267,7 +267,7 @@ contains name = 'mat_renum_amd' call psb_erractionsave(err_act) -#if defined(HAVE_AMD) && !defined(INT_I8_L8) +#if defined(HAVE_AMD) && defined(IPK4) info = psb_success_ nr = a%get_nrows()