Skip to content

Commit 2539b6c

Browse files
committed
Fix interface location and use in spspmm
1 parent 42b8daa commit 2539b6c

File tree

4 files changed

+28
-156
lines changed

4 files changed

+28
-156
lines changed

base/serial/psb_cspspmm.f90

Lines changed: 7 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
!
3838
subroutine psb_cspspmm(a,b,c,info)
3939
use psb_mat_mod
40-
!use psb_c_serial_mod, psb_protect_name => psb_cspspmm
40+
use psb_c_csr_mat_mod
41+
use psb_c_csc_mat_mod
42+
use psb_c_serial_mod, psb_protect_name => psb_cspspmm
4143
implicit none
4244

4345
type(psb_cspmat_type), intent(in) :: a,b
@@ -48,24 +50,6 @@ subroutine psb_cspspmm(a,b,c,info)
4850
integer(psb_ipk_) :: err_act
4951
character(len=*), parameter :: name='psb_spspmm'
5052
logical :: done_spmm
51-
!!$ interface
52-
!!$ subroutine psb_ccsrspspmm(a,b,c,info)
53-
!!$ use psb_c_mat_mod, only : psb_c_csr_sparse_mat
54-
!!$ import :: psb_ipk_
55-
!!$ implicit none
56-
!!$ class(psb_c_csr_sparse_mat), intent(in) :: a,b
57-
!!$ type(psb_c_csr_sparse_mat), intent(out) :: c
58-
!!$ integer(psb_ipk_), intent(out) :: info
59-
!!$ end subroutine psb_ccsrspspmm
60-
!!$ subroutine psb_ccscspspmm(a,b,c,info)
61-
!!$ use psb_c_mat_mod, only : psb_c_csc_sparse_mat
62-
!!$ import :: psb_ipk_
63-
!!$ implicit none
64-
!!$ class(psb_c_csc_sparse_mat), intent(in) :: a,b
65-
!!$ type(psb_c_csc_sparse_mat), intent(out) :: c
66-
!!$ integer(psb_ipk_), intent(out) :: info
67-
!!$ end subroutine psb_ccscspspmm
68-
!!$ end interface
6953
call psb_erractionsave(err_act)
7054
info = psb_success_
7155

@@ -136,7 +120,9 @@ end subroutine psb_cspspmm
136120

137121
subroutine psb_lcspspmm(a,b,c,info)
138122
use psb_mat_mod
139-
! use psb_c_serial_mod, psb_protect_name => psb_lcspspmm
123+
use psb_c_csr_mat_mod
124+
use psb_c_csc_mat_mod
125+
use psb_c_serial_mod, psb_protect_name => psb_lcspspmm
140126
implicit none
141127

142128
type(psb_lcspmat_type), intent(in) :: a,b
@@ -147,25 +133,7 @@ subroutine psb_lcspspmm(a,b,c,info)
147133
integer(psb_ipk_) :: err_act
148134
character(len=*), parameter :: name='psb_spspmm'
149135
logical :: done_spmm
150-
!!$ interface
151-
!!$ subroutine psb_lccsrspspmm(a,b,c,info)
152-
!!$ use psb_c_mat_mod, only : psb_lc_csr_sparse_mat
153-
!!$ import :: psb_ipk_
154-
!!$ implicit none
155-
!!$ class(psb_lc_csr_sparse_mat), intent(in) :: a,b
156-
!!$ type(psb_lc_csr_sparse_mat), intent(out) :: c
157-
!!$ integer(psb_ipk_), intent(out) :: info
158-
!!$ end subroutine psb_lccsrspspmm
159-
!!$ subroutine psb_lccscspspmm(a,b,c,info)
160-
!!$ use psb_c_mat_mod, only : psb_lc_csc_sparse_mat
161-
!!$ import :: psb_ipk_
162-
!!$ implicit none
163-
!!$ class(psb_lc_csc_sparse_mat), intent(in) :: a,b
164-
!!$ type(psb_lc_csc_sparse_mat), intent(out) :: c
165-
!!$ integer(psb_ipk_), intent(out) :: info
166-
!!$ end subroutine psb_lccscspspmm
167-
!!$ end interface
168-
call psb_erractionsave(err_act)
136+
call psb_erractionsave(err_act)
169137
info = psb_success_
170138

171139
if ((a%is_null()) .or.(b%is_null())) then

base/serial/psb_dspspmm.f90

Lines changed: 7 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
!
3838
subroutine psb_dspspmm(a,b,c,info)
3939
use psb_mat_mod
40-
!use psb_d_serial_mod, psb_protect_name => psb_dspspmm
40+
use psb_d_csr_mat_mod
41+
use psb_d_csc_mat_mod
42+
use psb_d_serial_mod, psb_protect_name => psb_dspspmm
4143
implicit none
4244

4345
type(psb_dspmat_type), intent(in) :: a,b
@@ -48,24 +50,6 @@ subroutine psb_dspspmm(a,b,c,info)
4850
integer(psb_ipk_) :: err_act
4951
character(len=*), parameter :: name='psb_spspmm'
5052
logical :: done_spmm
51-
!!$ interface
52-
!!$ subroutine psb_dcsrspspmm(a,b,c,info)
53-
!!$ use psb_d_mat_mod, only : psb_d_csr_sparse_mat
54-
!!$ import :: psb_ipk_
55-
!!$ implicit none
56-
!!$ class(psb_d_csr_sparse_mat), intent(in) :: a,b
57-
!!$ type(psb_d_csr_sparse_mat), intent(out) :: c
58-
!!$ integer(psb_ipk_), intent(out) :: info
59-
!!$ end subroutine psb_dcsrspspmm
60-
!!$ subroutine psb_dcscspspmm(a,b,c,info)
61-
!!$ use psb_d_mat_mod, only : psb_d_csc_sparse_mat
62-
!!$ import :: psb_ipk_
63-
!!$ implicit none
64-
!!$ class(psb_d_csc_sparse_mat), intent(in) :: a,b
65-
!!$ type(psb_d_csc_sparse_mat), intent(out) :: c
66-
!!$ integer(psb_ipk_), intent(out) :: info
67-
!!$ end subroutine psb_dcscspspmm
68-
!!$ end interface
6953
call psb_erractionsave(err_act)
7054
info = psb_success_
7155

@@ -136,7 +120,9 @@ end subroutine psb_dspspmm
136120

137121
subroutine psb_ldspspmm(a,b,c,info)
138122
use psb_mat_mod
139-
! use psb_d_serial_mod, psb_protect_name => psb_ldspspmm
123+
use psb_d_csr_mat_mod
124+
use psb_d_csc_mat_mod
125+
use psb_d_serial_mod, psb_protect_name => psb_ldspspmm
140126
implicit none
141127

142128
type(psb_ldspmat_type), intent(in) :: a,b
@@ -147,25 +133,7 @@ subroutine psb_ldspspmm(a,b,c,info)
147133
integer(psb_ipk_) :: err_act
148134
character(len=*), parameter :: name='psb_spspmm'
149135
logical :: done_spmm
150-
!!$ interface
151-
!!$ subroutine psb_ldcsrspspmm(a,b,c,info)
152-
!!$ use psb_d_mat_mod, only : psb_ld_csr_sparse_mat
153-
!!$ import :: psb_ipk_
154-
!!$ implicit none
155-
!!$ class(psb_ld_csr_sparse_mat), intent(in) :: a,b
156-
!!$ type(psb_ld_csr_sparse_mat), intent(out) :: c
157-
!!$ integer(psb_ipk_), intent(out) :: info
158-
!!$ end subroutine psb_ldcsrspspmm
159-
!!$ subroutine psb_ldcscspspmm(a,b,c,info)
160-
!!$ use psb_d_mat_mod, only : psb_ld_csc_sparse_mat
161-
!!$ import :: psb_ipk_
162-
!!$ implicit none
163-
!!$ class(psb_ld_csc_sparse_mat), intent(in) :: a,b
164-
!!$ type(psb_ld_csc_sparse_mat), intent(out) :: c
165-
!!$ integer(psb_ipk_), intent(out) :: info
166-
!!$ end subroutine psb_ldcscspspmm
167-
!!$ end interface
168-
call psb_erractionsave(err_act)
136+
call psb_erractionsave(err_act)
169137
info = psb_success_
170138

171139
if ((a%is_null()) .or.(b%is_null())) then

base/serial/psb_sspspmm.f90

Lines changed: 7 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
!
3838
subroutine psb_sspspmm(a,b,c,info)
3939
use psb_mat_mod
40-
!use psb_s_serial_mod, psb_protect_name => psb_sspspmm
40+
use psb_s_csr_mat_mod
41+
use psb_s_csc_mat_mod
42+
use psb_s_serial_mod, psb_protect_name => psb_sspspmm
4143
implicit none
4244

4345
type(psb_sspmat_type), intent(in) :: a,b
@@ -48,24 +50,6 @@ subroutine psb_sspspmm(a,b,c,info)
4850
integer(psb_ipk_) :: err_act
4951
character(len=*), parameter :: name='psb_spspmm'
5052
logical :: done_spmm
51-
!!$ interface
52-
!!$ subroutine psb_scsrspspmm(a,b,c,info)
53-
!!$ use psb_s_mat_mod, only : psb_s_csr_sparse_mat
54-
!!$ import :: psb_ipk_
55-
!!$ implicit none
56-
!!$ class(psb_s_csr_sparse_mat), intent(in) :: a,b
57-
!!$ type(psb_s_csr_sparse_mat), intent(out) :: c
58-
!!$ integer(psb_ipk_), intent(out) :: info
59-
!!$ end subroutine psb_scsrspspmm
60-
!!$ subroutine psb_scscspspmm(a,b,c,info)
61-
!!$ use psb_s_mat_mod, only : psb_s_csc_sparse_mat
62-
!!$ import :: psb_ipk_
63-
!!$ implicit none
64-
!!$ class(psb_s_csc_sparse_mat), intent(in) :: a,b
65-
!!$ type(psb_s_csc_sparse_mat), intent(out) :: c
66-
!!$ integer(psb_ipk_), intent(out) :: info
67-
!!$ end subroutine psb_scscspspmm
68-
!!$ end interface
6953
call psb_erractionsave(err_act)
7054
info = psb_success_
7155

@@ -136,7 +120,9 @@ end subroutine psb_sspspmm
136120

137121
subroutine psb_lsspspmm(a,b,c,info)
138122
use psb_mat_mod
139-
! use psb_s_serial_mod, psb_protect_name => psb_lsspspmm
123+
use psb_s_csr_mat_mod
124+
use psb_s_csc_mat_mod
125+
use psb_s_serial_mod, psb_protect_name => psb_lsspspmm
140126
implicit none
141127

142128
type(psb_lsspmat_type), intent(in) :: a,b
@@ -147,25 +133,7 @@ subroutine psb_lsspspmm(a,b,c,info)
147133
integer(psb_ipk_) :: err_act
148134
character(len=*), parameter :: name='psb_spspmm'
149135
logical :: done_spmm
150-
!!$ interface
151-
!!$ subroutine psb_lscsrspspmm(a,b,c,info)
152-
!!$ use psb_s_mat_mod, only : psb_ls_csr_sparse_mat
153-
!!$ import :: psb_ipk_
154-
!!$ implicit none
155-
!!$ class(psb_ls_csr_sparse_mat), intent(in) :: a,b
156-
!!$ type(psb_ls_csr_sparse_mat), intent(out) :: c
157-
!!$ integer(psb_ipk_), intent(out) :: info
158-
!!$ end subroutine psb_lscsrspspmm
159-
!!$ subroutine psb_lscscspspmm(a,b,c,info)
160-
!!$ use psb_s_mat_mod, only : psb_ls_csc_sparse_mat
161-
!!$ import :: psb_ipk_
162-
!!$ implicit none
163-
!!$ class(psb_ls_csc_sparse_mat), intent(in) :: a,b
164-
!!$ type(psb_ls_csc_sparse_mat), intent(out) :: c
165-
!!$ integer(psb_ipk_), intent(out) :: info
166-
!!$ end subroutine psb_lscscspspmm
167-
!!$ end interface
168-
call psb_erractionsave(err_act)
136+
call psb_erractionsave(err_act)
169137
info = psb_success_
170138

171139
if ((a%is_null()) .or.(b%is_null())) then

base/serial/psb_zspspmm.f90

Lines changed: 7 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
!
3838
subroutine psb_zspspmm(a,b,c,info)
3939
use psb_mat_mod
40-
!use psb_z_serial_mod, psb_protect_name => psb_zspspmm
40+
use psb_z_csr_mat_mod
41+
use psb_z_csc_mat_mod
42+
use psb_z_serial_mod, psb_protect_name => psb_zspspmm
4143
implicit none
4244

4345
type(psb_zspmat_type), intent(in) :: a,b
@@ -48,24 +50,6 @@ subroutine psb_zspspmm(a,b,c,info)
4850
integer(psb_ipk_) :: err_act
4951
character(len=*), parameter :: name='psb_spspmm'
5052
logical :: done_spmm
51-
!!$ interface
52-
!!$ subroutine psb_zcsrspspmm(a,b,c,info)
53-
!!$ use psb_z_mat_mod, only : psb_z_csr_sparse_mat
54-
!!$ import :: psb_ipk_
55-
!!$ implicit none
56-
!!$ class(psb_z_csr_sparse_mat), intent(in) :: a,b
57-
!!$ type(psb_z_csr_sparse_mat), intent(out) :: c
58-
!!$ integer(psb_ipk_), intent(out) :: info
59-
!!$ end subroutine psb_zcsrspspmm
60-
!!$ subroutine psb_zcscspspmm(a,b,c,info)
61-
!!$ use psb_z_mat_mod, only : psb_z_csc_sparse_mat
62-
!!$ import :: psb_ipk_
63-
!!$ implicit none
64-
!!$ class(psb_z_csc_sparse_mat), intent(in) :: a,b
65-
!!$ type(psb_z_csc_sparse_mat), intent(out) :: c
66-
!!$ integer(psb_ipk_), intent(out) :: info
67-
!!$ end subroutine psb_zcscspspmm
68-
!!$ end interface
6953
call psb_erractionsave(err_act)
7054
info = psb_success_
7155

@@ -136,7 +120,9 @@ end subroutine psb_zspspmm
136120

137121
subroutine psb_lzspspmm(a,b,c,info)
138122
use psb_mat_mod
139-
! use psb_z_serial_mod, psb_protect_name => psb_lzspspmm
123+
use psb_z_csr_mat_mod
124+
use psb_z_csc_mat_mod
125+
use psb_z_serial_mod, psb_protect_name => psb_lzspspmm
140126
implicit none
141127

142128
type(psb_lzspmat_type), intent(in) :: a,b
@@ -147,25 +133,7 @@ subroutine psb_lzspspmm(a,b,c,info)
147133
integer(psb_ipk_) :: err_act
148134
character(len=*), parameter :: name='psb_spspmm'
149135
logical :: done_spmm
150-
!!$ interface
151-
!!$ subroutine psb_lzcsrspspmm(a,b,c,info)
152-
!!$ use psb_z_mat_mod, only : psb_lz_csr_sparse_mat
153-
!!$ import :: psb_ipk_
154-
!!$ implicit none
155-
!!$ class(psb_lz_csr_sparse_mat), intent(in) :: a,b
156-
!!$ type(psb_lz_csr_sparse_mat), intent(out) :: c
157-
!!$ integer(psb_ipk_), intent(out) :: info
158-
!!$ end subroutine psb_lzcsrspspmm
159-
!!$ subroutine psb_lzcscspspmm(a,b,c,info)
160-
!!$ use psb_z_mat_mod, only : psb_lz_csc_sparse_mat
161-
!!$ import :: psb_ipk_
162-
!!$ implicit none
163-
!!$ class(psb_lz_csc_sparse_mat), intent(in) :: a,b
164-
!!$ type(psb_lz_csc_sparse_mat), intent(out) :: c
165-
!!$ integer(psb_ipk_), intent(out) :: info
166-
!!$ end subroutine psb_lzcscspspmm
167-
!!$ end interface
168-
call psb_erractionsave(err_act)
136+
call psb_erractionsave(err_act)
169137
info = psb_success_
170138

171139
if ((a%is_null()) .or.(b%is_null())) then

0 commit comments

Comments
 (0)