Fix tools_cbind

gpucinterfaces
Salvatore Filippone 6 months ago
parent 3b2630911b
commit 78c33d3631

@ -39,7 +39,7 @@ lib: objs
$(COBJS): $(CMOD) $(COBJS): $(CMOD)
psb_base_cbind_mod.o: psb_cpenv_mod.o psb_objhandle_mod.o psb_base_tools_cbind_mod.o \ psb_base_cbind_mod.o: psb_cpenv_mod.o psb_objhandle_mod.o psb_base_tools_cbind_mod.o \
psb_base_string_cbind_mod.o psb_base_psblas_cbind_mod.o \ psb_base_psblas_cbind_mod.o \
psb_s_tools_cbind_mod.o psb_s_serial_cbind_mod.o psb_s_psblas_cbind_mod.o \ psb_s_tools_cbind_mod.o psb_s_serial_cbind_mod.o psb_s_psblas_cbind_mod.o \
psb_d_tools_cbind_mod.o psb_d_serial_cbind_mod.o psb_d_psblas_cbind_mod.o \ psb_d_tools_cbind_mod.o psb_d_serial_cbind_mod.o psb_d_psblas_cbind_mod.o \
psb_c_tools_cbind_mod.o psb_c_serial_cbind_mod.o psb_c_psblas_cbind_mod.o \ psb_c_tools_cbind_mod.o psb_c_serial_cbind_mod.o psb_c_psblas_cbind_mod.o \
@ -47,7 +47,7 @@ psb_base_cbind_mod.o: psb_cpenv_mod.o psb_objhandle_mod.o psb_base_tools_cbind_m
psb_s_comm_cbind_mod.o psb_d_comm_cbind_mod.o \ psb_s_comm_cbind_mod.o psb_d_comm_cbind_mod.o \
psb_c_comm_cbind_mod.o psb_z_comm_cbind_mod.o psb_c_comm_cbind_mod.o psb_z_comm_cbind_mod.o
psb_base_tools_cbind_mod.o: psb_cpenv_mod.o psb_objhandle_mod.o psb_base_string_cbind_mod.o psb_base_tools_cbind_mod.o: psb_cpenv_mod.o psb_objhandle_mod.o
psb_s_tools_cbind_mod.o psb_s_serial_cbind_mod.o \ psb_s_tools_cbind_mod.o psb_s_serial_cbind_mod.o \
psb_d_tools_cbind_mod.o psb_d_serial_cbind_mod.o \ psb_d_tools_cbind_mod.o psb_d_serial_cbind_mod.o \
@ -56,7 +56,7 @@ psb_z_tools_cbind_mod.o psb_z_serial_cbind_mod.o \
psb_s_psblas_cbind_mod.o psb_d_psblas_cbind_mod.o \ psb_s_psblas_cbind_mod.o psb_d_psblas_cbind_mod.o \
psb_c_psblas_cbind_mod.o psb_z_psblas_cbind_mod.o \ psb_c_psblas_cbind_mod.o psb_z_psblas_cbind_mod.o \
psb_s_comm_cbind_mod.o psb_d_comm_cbind_mod.o \ psb_s_comm_cbind_mod.o psb_d_comm_cbind_mod.o \
psb_c_comm_cbind_mod.o psb_z_comm_cbind_mod.o: psb_base_tools_cbind_mod.o psb_objhandle_mod.o psb_base_string_cbind_mod.o psb_c_comm_cbind_mod.o psb_z_comm_cbind_mod.o: psb_base_tools_cbind_mod.o psb_objhandle_mod.o
psb_base_psblas_cbind_mod.o: psb_s_psblas_cbind_mod.o psb_d_psblas_cbind_mod.o psb_c_psblas_cbind_mod.o psb_z_psblas_cbind_mod.o psb_base_psblas_cbind_mod.o: psb_s_psblas_cbind_mod.o psb_d_psblas_cbind_mod.o psb_c_psblas_cbind_mod.o psb_z_psblas_cbind_mod.o

@ -470,43 +470,41 @@ contains
! Set the mold variable based on afmt ! Set the mold variable based on afmt
select case (psb_toupper(fafmt)) select case (psb_toupper(fafmt))
#if defined(PSB_HAVE_CUDA) #if defined(PSB_HAVE_CUDA)
case('ELG') case('ELG')
amold => aelg amold => aelg
case('HLG') case('HLG')
call psi_set_hksz(hksz) call psi_set_hksz(hksz)
amold => ahlg amold => ahlg
case('CSRG') case('CSRG')
amold => acsrg amold => acsrg
case('ELL') case('ELL')
amold => aell amold => aell
case('HLL') case('HLL')
call psi_set_hksz(hksz) call psi_set_hksz(hksz)
amold => ahll amold => ahll
case('CSR') case('CSR')
amold => acsr amold => acsr
case('DNS') case('DNS')
amold => adns amold => adns
case default case default
write(*,*) 'Unknown format defaulting to HLG' write(*,*) 'Unknown format defaulting to HLG'
amold => ahlg amold => ahlg
end select
#else #else
select case(psb_toupper(fafmt)) case('ELL')
case('ELL') amold => aell
amold => aell case('HLL')
case('HLL') call psi_set_hksz(hksz)
call psi_set_hksz(hksz) amold => ahll
amold => ahll amold => ahdia
amold => ahdia case('CSR')
case('CSR') amold => acsr
amold => acsr case('DNS')
case('DNS') amold => adns
amold => adns case default
case default write(*,*) 'Unknown format defaulting to CSR'
write(*,*) 'Unknown format defaulting to CSR' amold => acsr
amold => acsr
end select
#endif #endif
end select
select case(fafmt) select case(fafmt)
#if 0 #if 0

@ -471,48 +471,46 @@ contains
! Set the mold variable based on afmt ! Set the mold variable based on afmt
select case (psb_toupper(fafmt)) select case (psb_toupper(fafmt))
#if defined(PSB_HAVE_CUDA) #if defined(PSB_HAVE_CUDA)
case('ELG') case('ELG')
amold => aelg amold => aelg
case('HLG') case('HLG')
call psi_set_hksz(hksz) call psi_set_hksz(hksz)
amold => ahlg amold => ahlg
case('HDIAG') case('HDIAG')
amold => ahdiag amold => ahdiag
case('CSRG') case('CSRG')
amold => acsrg amold => acsrg
case('ELL') case('ELL')
amold => aell amold => aell
case('HLL') case('HLL')
call psi_set_hksz(hksz) call psi_set_hksz(hksz)
amold => ahll amold => ahll
case('HDIA') case('HDIA')
amold => ahdia amold => ahdia
case('CSR') case('CSR')
amold => acsr amold => acsr
case('DNS') case('DNS')
amold => adns amold => adns
case default case default
write(*,*) 'Unknown format defaulting to HLG' write(*,*) 'Unknown format defaulting to HLG'
amold => ahlg amold => ahlg
end select
#else #else
select case(psb_toupper(fafmt)) case('ELL')
case('ELL') amold => aell
amold => aell case('HLL')
case('HLL') call psi_set_hksz(hksz)
call psi_set_hksz(hksz) amold => ahll
amold => ahll case('HDIA')
case('HDIA') amold => ahdia
amold => ahdia case('CSR')
case('CSR') amold => acsr
amold => acsr case('DNS')
case('DNS') amold => adns
amold => adns case default
case default write(*,*) 'Unknown format defaulting to CSR'
write(*,*) 'Unknown format defaulting to CSR' amold => acsr
amold => acsr
end select
#endif #endif
end select
select case(fafmt) select case(fafmt)
#if 0 #if 0

@ -471,48 +471,46 @@ contains
! Set the mold variable based on afmt ! Set the mold variable based on afmt
select case (psb_toupper(fafmt)) select case (psb_toupper(fafmt))
#if defined(PSB_HAVE_CUDA) #if defined(PSB_HAVE_CUDA)
case('ELG') case('ELG')
amold => aelg amold => aelg
case('HLG') case('HLG')
call psi_set_hksz(hksz) call psi_set_hksz(hksz)
amold => ahlg amold => ahlg
case('HDIAG') case('HDIAG')
amold => ahdiag amold => ahdiag
case('CSRG') case('CSRG')
amold => acsrg amold => acsrg
case('ELL') case('ELL')
amold => aell amold => aell
case('HLL') case('HLL')
call psi_set_hksz(hksz) call psi_set_hksz(hksz)
amold => ahll amold => ahll
case('HDIA') case('HDIA')
amold => ahdia amold => ahdia
case('CSR') case('CSR')
amold => acsr amold => acsr
case('DNS') case('DNS')
amold => adns amold => adns
case default case default
write(*,*) 'Unknown format defaulting to HLG' write(*,*) 'Unknown format defaulting to HLG'
amold => ahlg amold => ahlg
end select
#else #else
select case(psb_toupper(fafmt)) case('ELL')
case('ELL') amold => aell
amold => aell case('HLL')
case('HLL') call psi_set_hksz(hksz)
call psi_set_hksz(hksz) amold => ahll
amold => ahll case('HDIA')
case('HDIA') amold => ahdia
amold => ahdia case('CSR')
case('CSR') amold => acsr
amold => acsr case('DNS')
case('DNS') amold => adns
amold => adns case default
case default write(*,*) 'Unknown format defaulting to CSR'
write(*,*) 'Unknown format defaulting to CSR' amold => acsr
amold => acsr
end select
#endif #endif
end select
select case(fafmt) select case(fafmt)
#if 0 #if 0

@ -470,43 +470,41 @@ contains
! Set the mold variable based on afmt ! Set the mold variable based on afmt
select case (psb_toupper(fafmt)) select case (psb_toupper(fafmt))
#if defined(PSB_HAVE_CUDA) #if defined(PSB_HAVE_CUDA)
case('ELG') case('ELG')
amold => aelg amold => aelg
case('HLG') case('HLG')
call psi_set_hksz(hksz) call psi_set_hksz(hksz)
amold => ahlg amold => ahlg
case('CSRG') case('CSRG')
amold => acsrg amold => acsrg
case('ELL') case('ELL')
amold => aell amold => aell
case('HLL') case('HLL')
call psi_set_hksz(hksz) call psi_set_hksz(hksz)
amold => ahll amold => ahll
case('CSR') case('CSR')
amold => acsr amold => acsr
case('DNS') case('DNS')
amold => adns amold => adns
case default case default
write(*,*) 'Unknown format defaulting to HLG' write(*,*) 'Unknown format defaulting to HLG'
amold => ahlg amold => ahlg
end select
#else #else
select case(psb_toupper(fafmt)) case('ELL')
case('ELL') amold => aell
amold => aell case('HLL')
case('HLL') call psi_set_hksz(hksz)
call psi_set_hksz(hksz) amold => ahll
amold => ahll amold => ahdia
amold => ahdia case('CSR')
case('CSR') amold => acsr
amold => acsr case('DNS')
case('DNS') amold => adns
amold => adns case default
case default write(*,*) 'Unknown format defaulting to CSR'
write(*,*) 'Unknown format defaulting to CSR' amold => acsr
amold => acsr
end select
#endif #endif
end select
select case(fafmt) select case(fafmt)
#if 0 #if 0

Loading…
Cancel
Save