From 78c33d3631ea0b0a5cf29bd6171f9379a1270259 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 15 Jan 2026 14:50:35 +0100 Subject: [PATCH] Fix tools_cbind --- cbind/base/Makefile | 6 +-- cbind/base/psb_c_tools_cbind_mod.F90 | 68 ++++++++++++------------ cbind/base/psb_d_tools_cbind_mod.F90 | 78 ++++++++++++++-------------- cbind/base/psb_s_tools_cbind_mod.F90 | 78 ++++++++++++++-------------- cbind/base/psb_z_tools_cbind_mod.F90 | 68 ++++++++++++------------ 5 files changed, 145 insertions(+), 153 deletions(-) diff --git a/cbind/base/Makefile b/cbind/base/Makefile index 9dc9286f..9d4d734c 100644 --- a/cbind/base/Makefile +++ b/cbind/base/Makefile @@ -39,7 +39,7 @@ lib: objs $(COBJS): $(CMOD) 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_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 \ @@ -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_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_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_c_psblas_cbind_mod.o psb_z_psblas_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 diff --git a/cbind/base/psb_c_tools_cbind_mod.F90 b/cbind/base/psb_c_tools_cbind_mod.F90 index 33e259e6..a3fa1772 100644 --- a/cbind/base/psb_c_tools_cbind_mod.F90 +++ b/cbind/base/psb_c_tools_cbind_mod.F90 @@ -470,43 +470,41 @@ contains ! Set the mold variable based on afmt select case (psb_toupper(fafmt)) #if defined(PSB_HAVE_CUDA) - case('ELG') - amold => aelg - case('HLG') - call psi_set_hksz(hksz) - amold => ahlg - case('CSRG') - amold => acsrg - case('ELL') - amold => aell - case('HLL') - call psi_set_hksz(hksz) - amold => ahll - case('CSR') - amold => acsr - case('DNS') - amold => adns - case default - write(*,*) 'Unknown format defaulting to HLG' - amold => ahlg - end select + case('ELG') + amold => aelg + case('HLG') + call psi_set_hksz(hksz) + amold => ahlg + case('CSRG') + amold => acsrg + case('ELL') + amold => aell + case('HLL') + call psi_set_hksz(hksz) + amold => ahll + case('CSR') + amold => acsr + case('DNS') + amold => adns + case default + write(*,*) 'Unknown format defaulting to HLG' + amold => ahlg #else - select case(psb_toupper(fafmt)) - case('ELL') - amold => aell - case('HLL') - call psi_set_hksz(hksz) - amold => ahll - amold => ahdia - case('CSR') - amold => acsr - case('DNS') - amold => adns - case default - write(*,*) 'Unknown format defaulting to CSR' - amold => acsr - end select + case('ELL') + amold => aell + case('HLL') + call psi_set_hksz(hksz) + amold => ahll + amold => ahdia + case('CSR') + amold => acsr + case('DNS') + amold => adns + case default + write(*,*) 'Unknown format defaulting to CSR' + amold => acsr #endif + end select select case(fafmt) #if 0 diff --git a/cbind/base/psb_d_tools_cbind_mod.F90 b/cbind/base/psb_d_tools_cbind_mod.F90 index 95ed9e9e..935b6cc6 100644 --- a/cbind/base/psb_d_tools_cbind_mod.F90 +++ b/cbind/base/psb_d_tools_cbind_mod.F90 @@ -471,48 +471,46 @@ contains ! Set the mold variable based on afmt select case (psb_toupper(fafmt)) #if defined(PSB_HAVE_CUDA) - case('ELG') - amold => aelg - case('HLG') - call psi_set_hksz(hksz) - amold => ahlg - case('HDIAG') - amold => ahdiag - case('CSRG') - amold => acsrg - case('ELL') - amold => aell - case('HLL') - call psi_set_hksz(hksz) - amold => ahll - case('HDIA') - amold => ahdia - case('CSR') - amold => acsr - case('DNS') - amold => adns - case default - write(*,*) 'Unknown format defaulting to HLG' - amold => ahlg - end select + case('ELG') + amold => aelg + case('HLG') + call psi_set_hksz(hksz) + amold => ahlg + case('HDIAG') + amold => ahdiag + case('CSRG') + amold => acsrg + case('ELL') + amold => aell + case('HLL') + call psi_set_hksz(hksz) + amold => ahll + case('HDIA') + amold => ahdia + case('CSR') + amold => acsr + case('DNS') + amold => adns + case default + write(*,*) 'Unknown format defaulting to HLG' + amold => ahlg #else - select case(psb_toupper(fafmt)) - case('ELL') - amold => aell - case('HLL') - call psi_set_hksz(hksz) - amold => ahll - case('HDIA') - amold => ahdia - case('CSR') - amold => acsr - case('DNS') - amold => adns - case default - write(*,*) 'Unknown format defaulting to CSR' - amold => acsr - end select + case('ELL') + amold => aell + case('HLL') + call psi_set_hksz(hksz) + amold => ahll + case('HDIA') + amold => ahdia + case('CSR') + amold => acsr + case('DNS') + amold => adns + case default + write(*,*) 'Unknown format defaulting to CSR' + amold => acsr #endif + end select select case(fafmt) #if 0 diff --git a/cbind/base/psb_s_tools_cbind_mod.F90 b/cbind/base/psb_s_tools_cbind_mod.F90 index 0ad7e60d..7633564f 100644 --- a/cbind/base/psb_s_tools_cbind_mod.F90 +++ b/cbind/base/psb_s_tools_cbind_mod.F90 @@ -471,48 +471,46 @@ contains ! Set the mold variable based on afmt select case (psb_toupper(fafmt)) #if defined(PSB_HAVE_CUDA) - case('ELG') - amold => aelg - case('HLG') - call psi_set_hksz(hksz) - amold => ahlg - case('HDIAG') - amold => ahdiag - case('CSRG') - amold => acsrg - case('ELL') - amold => aell - case('HLL') - call psi_set_hksz(hksz) - amold => ahll - case('HDIA') - amold => ahdia - case('CSR') - amold => acsr - case('DNS') - amold => adns - case default - write(*,*) 'Unknown format defaulting to HLG' - amold => ahlg - end select + case('ELG') + amold => aelg + case('HLG') + call psi_set_hksz(hksz) + amold => ahlg + case('HDIAG') + amold => ahdiag + case('CSRG') + amold => acsrg + case('ELL') + amold => aell + case('HLL') + call psi_set_hksz(hksz) + amold => ahll + case('HDIA') + amold => ahdia + case('CSR') + amold => acsr + case('DNS') + amold => adns + case default + write(*,*) 'Unknown format defaulting to HLG' + amold => ahlg #else - select case(psb_toupper(fafmt)) - case('ELL') - amold => aell - case('HLL') - call psi_set_hksz(hksz) - amold => ahll - case('HDIA') - amold => ahdia - case('CSR') - amold => acsr - case('DNS') - amold => adns - case default - write(*,*) 'Unknown format defaulting to CSR' - amold => acsr - end select + case('ELL') + amold => aell + case('HLL') + call psi_set_hksz(hksz) + amold => ahll + case('HDIA') + amold => ahdia + case('CSR') + amold => acsr + case('DNS') + amold => adns + case default + write(*,*) 'Unknown format defaulting to CSR' + amold => acsr #endif + end select select case(fafmt) #if 0 diff --git a/cbind/base/psb_z_tools_cbind_mod.F90 b/cbind/base/psb_z_tools_cbind_mod.F90 index 6c530889..0ca9424d 100644 --- a/cbind/base/psb_z_tools_cbind_mod.F90 +++ b/cbind/base/psb_z_tools_cbind_mod.F90 @@ -470,43 +470,41 @@ contains ! Set the mold variable based on afmt select case (psb_toupper(fafmt)) #if defined(PSB_HAVE_CUDA) - case('ELG') - amold => aelg - case('HLG') - call psi_set_hksz(hksz) - amold => ahlg - case('CSRG') - amold => acsrg - case('ELL') - amold => aell - case('HLL') - call psi_set_hksz(hksz) - amold => ahll - case('CSR') - amold => acsr - case('DNS') - amold => adns - case default - write(*,*) 'Unknown format defaulting to HLG' - amold => ahlg - end select + case('ELG') + amold => aelg + case('HLG') + call psi_set_hksz(hksz) + amold => ahlg + case('CSRG') + amold => acsrg + case('ELL') + amold => aell + case('HLL') + call psi_set_hksz(hksz) + amold => ahll + case('CSR') + amold => acsr + case('DNS') + amold => adns + case default + write(*,*) 'Unknown format defaulting to HLG' + amold => ahlg #else - select case(psb_toupper(fafmt)) - case('ELL') - amold => aell - case('HLL') - call psi_set_hksz(hksz) - amold => ahll - amold => ahdia - case('CSR') - amold => acsr - case('DNS') - amold => adns - case default - write(*,*) 'Unknown format defaulting to CSR' - amold => acsr - end select + case('ELL') + amold => aell + case('HLL') + call psi_set_hksz(hksz) + amold => ahll + amold => ahdia + case('CSR') + amold => acsr + case('DNS') + amold => adns + case default + write(*,*) 'Unknown format defaulting to CSR' + amold => acsr #endif + end select select case(fafmt) #if 0