From 97c5475d2816035cd4c84ddbe8e299abd61ea530 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Wed, 11 Jun 2014 11:49:46 +0000 Subject: [PATCH] psblas3: test/kernel/d_file_spmv.f90 test/kernel/s_file_spmv.f90 util/psb_mmio_mod.F90 util/psb_mmio_mod.f90 ifdef for workaround for Intel generics bug. --- test/kernel/d_file_spmv.f90 | 2 +- test/kernel/s_file_spmv.f90 | 2 +- util/{psb_mmio_mod.f90 => psb_mmio_mod.F90} | 13 +++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) rename util/{psb_mmio_mod.f90 => psb_mmio_mod.F90} (98%) diff --git a/test/kernel/d_file_spmv.f90 b/test/kernel/d_file_spmv.f90 index 30bcb3bb..4db2d0a6 100644 --- a/test/kernel/d_file_spmv.f90 +++ b/test/kernel/d_file_spmv.f90 @@ -117,7 +117,7 @@ program d_file_spmv call mm_mat_read(aux_a,info,iunit=iunit,filename=mtrx_file) if (info == psb_success_) then if (rhs_file /= 'NONE') then - call mm_vet_read(aux_b,info,iunit=iunit,filename=rhs_file) + call mm_array_read(aux_b,info,iunit=iunit,filename=rhs_file) end if end if diff --git a/test/kernel/s_file_spmv.f90 b/test/kernel/s_file_spmv.f90 index d747b533..51e1e523 100644 --- a/test/kernel/s_file_spmv.f90 +++ b/test/kernel/s_file_spmv.f90 @@ -117,7 +117,7 @@ program s_file_spmv call mm_mat_read(aux_a,info,iunit=iunit,filename=mtrx_file) if (info == psb_success_) then if (rhs_file /= 'NONE') then - call mm_vet_read(aux_b,info,iunit=iunit,filename=rhs_file) + call mm_array_read(aux_b,info,iunit=iunit,filename=rhs_file) end if end if diff --git a/util/psb_mmio_mod.f90 b/util/psb_mmio_mod.F90 similarity index 98% rename from util/psb_mmio_mod.f90 rename to util/psb_mmio_mod.F90 index 06aaab33..5c4ff3d8 100644 --- a/util/psb_mmio_mod.f90 +++ b/util/psb_mmio_mod.F90 @@ -36,8 +36,11 @@ module psb_mmio_mod & psb_sspmat_type, psb_cspmat_type, & & psb_dspmat_type, psb_zspmat_type - public mm_mat_read, mm_mat_write, mm_vet_read, mm_vet_write,& - & mm_array_read, mm_array_write + public mm_mat_read, mm_mat_write, mm_array_read, mm_array_write + +#if ! defined(BAD_GENERICS) + public mm_vet_read, mm_vet_write +#endif interface mm_array_read subroutine mm_svet_read(b, info, iunit, filename) @@ -107,11 +110,13 @@ module psb_mmio_mod end interface +#if ! defined(BAD_GENERICS) interface mm_vet_read procedure mm_svet_read, mm_dvet_read, mm_cvet_read,& & mm_zvet_read, mm_svet2_read, mm_dvet2_read, & & mm_cvet2_read, mm_zvet2_read end interface +#endif interface mm_array_write @@ -189,13 +194,13 @@ module psb_mmio_mod end subroutine mm_zvet1_write end interface +#if ! defined(BAD_GENERICS) interface mm_vet_write procedure mm_svet1_write, mm_dvet1_write, mm_cvet1_write,& & mm_zvet1_write, mm_svet2_write, mm_dvet2_write, & & mm_cvet2_write, mm_zvet2_write end interface - - +#endif interface mm_mat_read subroutine smm_mat_read(a, info, iunit, filename)