psblas3:

base/modules/psb_c_psblas_mod.F90 base/modules/psb_d_psblas_mod.F90 base/modules/psb_s_psblas_mod.F90 base/modules/psb_z_psblas_mod.F90 ifdef for workaround for Intel generics bug.
11 years ago · cfaa9995ed
parent 5a3f711513
commit cfaa9995ed
4 changed files with 40 additions and 4 deletions
--- a/base/modules/psb_c_psblas_mod.F90
+++ b/base/modules/psb_c_psblas_mod.F90
@ -144,12 +144,14 @@ module psb_c_psblas_mod
    end function psb_camax_vect
  end interface

+#if ! defined(BAD_GENERICS)
  interface psb_genrmi
    procedure psb_camax, psb_camaxv, psb_camax_vect
  end interface 
  interface psb_normi
    procedure psb_camax, psb_camaxv, psb_camax_vect
  end interface 
+#endif

  interface psb_geamaxs
    subroutine  psb_camaxvs(res,x,desc_a,info)
@ -218,13 +220,14 @@ module psb_c_psblas_mod
    end subroutine psb_cmasum
  end interface

+#if ! defined(BAD_GENERICS)
  interface psb_genrm1
    procedure psb_casum, psb_casumv, psb_casum_vect
  end interface 
  interface psb_norm1
    procedure psb_casum, psb_casumv, psb_casum_vect
  end interface 
-
+#endif

  interface psb_genrm2
    function psb_cnrm2(x, desc_a, info, jx)
@ -254,9 +257,11 @@ module psb_c_psblas_mod
    end function psb_cnrm2_vect
  end interface

+#if ! defined(BAD_GENERICS)
  interface psb_norm2
    procedure psb_cnrm2, psb_cnrm2v, psb_cnrm2_vect
  end interface 
+#endif

  interface psb_genrm2s
    subroutine  psb_cnrm2vs(res,x,desc_a,info)
@ -281,9 +286,11 @@ module psb_c_psblas_mod
    end function psb_cnrmi
  end interface

+#if ! defined(BAD_GENERICS)
  interface psb_normi
    procedure psb_cnrmi
  end interface 
+#endif

  interface psb_spnrm1
    function psb_cspnrm1(a, desc_a,info)
@ -296,9 +303,11 @@ module psb_c_psblas_mod
    end function psb_cspnrm1
  end interface
  
+#if ! defined(BAD_GENERICS)
  interface psb_norm1
    procedure psb_cspnrm1
  end interface 
+#endif

  interface psb_spmm
    subroutine psb_cspmm(alpha, a, x, beta, y, desc_a, info,&
--- a/base/modules/psb_d_psblas_mod.F90
+++ b/base/modules/psb_d_psblas_mod.F90
@ -144,12 +144,14 @@ module psb_d_psblas_mod
    end function psb_damax_vect
  end interface

+#if ! defined(BAD_GENERICS)
  interface psb_genrmi
    procedure psb_damax, psb_damaxv, psb_damax_vect
  end interface 
  interface psb_normi
    procedure psb_damax, psb_damaxv, psb_damax_vect
  end interface 
+#endif

  interface psb_geamaxs
    subroutine  psb_damaxvs(res,x,desc_a,info)
@ -218,13 +220,14 @@ module psb_d_psblas_mod
    end subroutine psb_dmasum
  end interface

+#if ! defined(BAD_GENERICS)
  interface psb_genrm1
    procedure psb_dasum, psb_dasumv, psb_dasum_vect
  end interface 
  interface psb_norm1
    procedure psb_dasum, psb_dasumv, psb_dasum_vect
  end interface 
-
+#endif

  interface psb_genrm2
    function psb_dnrm2(x, desc_a, info, jx)
@ -254,9 +257,11 @@ module psb_d_psblas_mod
    end function psb_dnrm2_vect
  end interface

+#if ! defined(BAD_GENERICS)
  interface psb_norm2
    procedure psb_dnrm2, psb_dnrm2v, psb_dnrm2_vect
  end interface 
+#endif

  interface psb_genrm2s
    subroutine  psb_dnrm2vs(res,x,desc_a,info)
@ -281,9 +286,11 @@ module psb_d_psblas_mod
    end function psb_dnrmi
  end interface

+#if ! defined(BAD_GENERICS)
  interface psb_normi
    procedure psb_dnrmi
  end interface 
+#endif

  interface psb_spnrm1
    function psb_dspnrm1(a, desc_a,info)
@ -296,9 +303,11 @@ module psb_d_psblas_mod
    end function psb_dspnrm1
  end interface
  
+#if ! defined(BAD_GENERICS)
  interface psb_norm1
    procedure psb_dspnrm1
  end interface 
+#endif

  interface psb_spmm
    subroutine psb_dspmm(alpha, a, x, beta, y, desc_a, info,&
--- a/base/modules/psb_s_psblas_mod.F90
+++ b/base/modules/psb_s_psblas_mod.F90
@ -144,12 +144,14 @@ module psb_s_psblas_mod
    end function psb_samax_vect
  end interface

+#if ! defined(BAD_GENERICS)
  interface psb_genrmi
    procedure psb_samax, psb_samaxv, psb_samax_vect
  end interface 
  interface psb_normi
    procedure psb_samax, psb_samaxv, psb_samax_vect
  end interface 
+#endif

  interface psb_geamaxs
    subroutine  psb_samaxvs(res,x,desc_a,info)
@ -218,13 +220,14 @@ module psb_s_psblas_mod
    end subroutine psb_smasum
  end interface

+#if ! defined(BAD_GENERICS)
  interface psb_genrm1
    procedure psb_sasum, psb_sasumv, psb_sasum_vect
  end interface 
  interface psb_norm1
    procedure psb_sasum, psb_sasumv, psb_sasum_vect
  end interface 
-
+#endif

  interface psb_genrm2
    function psb_snrm2(x, desc_a, info, jx)
@ -254,9 +257,11 @@ module psb_s_psblas_mod
    end function psb_snrm2_vect
  end interface

+#if ! defined(BAD_GENERICS)
  interface psb_norm2
    procedure psb_snrm2, psb_snrm2v, psb_snrm2_vect
  end interface 
+#endif

  interface psb_genrm2s
    subroutine  psb_snrm2vs(res,x,desc_a,info)
@ -281,9 +286,11 @@ module psb_s_psblas_mod
    end function psb_snrmi
  end interface

+#if ! defined(BAD_GENERICS)
  interface psb_normi
    procedure psb_snrmi
  end interface 
+#endif

  interface psb_spnrm1
    function psb_sspnrm1(a, desc_a,info)
@ -296,9 +303,11 @@ module psb_s_psblas_mod
    end function psb_sspnrm1
  end interface
  
+#if ! defined(BAD_GENERICS)
  interface psb_norm1
    procedure psb_sspnrm1
  end interface 
+#endif

  interface psb_spmm
    subroutine psb_sspmm(alpha, a, x, beta, y, desc_a, info,&
--- a/base/modules/psb_z_psblas_mod.F90
+++ b/base/modules/psb_z_psblas_mod.F90
@ -144,12 +144,14 @@ module psb_z_psblas_mod
    end function psb_zamax_vect
  end interface

+#if ! defined(BAD_GENERICS)
  interface psb_genrmi
    procedure psb_zamax, psb_zamaxv, psb_zamax_vect
  end interface 
  interface psb_normi
    procedure psb_zamax, psb_zamaxv, psb_zamax_vect
  end interface 
+#endif

  interface psb_geamaxs
    subroutine  psb_zamaxvs(res,x,desc_a,info)
@ -218,13 +220,14 @@ module psb_z_psblas_mod
    end subroutine psb_zmasum
  end interface

+#if ! defined(BAD_GENERICS)
  interface psb_genrm1
    procedure psb_zasum, psb_zasumv, psb_zasum_vect
  end interface 
  interface psb_norm1
    procedure psb_zasum, psb_zasumv, psb_zasum_vect
  end interface 
-
+#endif

  interface psb_genrm2
    function psb_znrm2(x, desc_a, info, jx)
@ -254,9 +257,11 @@ module psb_z_psblas_mod
    end function psb_znrm2_vect
  end interface

+#if ! defined(BAD_GENERICS)
  interface psb_norm2
    procedure psb_znrm2, psb_znrm2v, psb_znrm2_vect
  end interface 
+#endif

  interface psb_genrm2s
    subroutine  psb_znrm2vs(res,x,desc_a,info)
@ -281,9 +286,11 @@ module psb_z_psblas_mod
    end function psb_znrmi
  end interface

+#if ! defined(BAD_GENERICS)
  interface psb_normi
    procedure psb_znrmi
  end interface 
+#endif

  interface psb_spnrm1
    function psb_zspnrm1(a, desc_a,info)
@ -296,9 +303,11 @@ module psb_z_psblas_mod
    end function psb_zspnrm1
  end interface
  
+#if ! defined(BAD_GENERICS)
  interface psb_norm1
    procedure psb_zspnrm1
  end interface 
+#endif

  interface psb_spmm
    subroutine psb_zspmm(alpha, a, x, beta, y, desc_a, info,&