Changelog
 base/modules/Makefile
 base/modules/psb_ip_reord_mod.f90
 base/newserial/Makefile
 base/newserial/psbn_base_mat_mod.f03
 base/newserial/psbn_coo_mat.f03
 base/newserial/psbn_d_base_mat_mod.f03
 base/newserial/psbn_d_coo_impl.f03
 base/newserial/psbn_mat_mod.f03
 base/serial/Makefile
 base/serial/psb_ip_reord_mod.f90
 config/pac.m4


Reworked base_mat to include COO (everybody must know about COO to
define A%TO_COO() and A%FROM_COO)
This commit is contained in:
Salvatore Filippone
2009-08-27 16:16:59 +00:00
parent eddf493ae9
commit 0ce5545cea
11 changed files with 2923 additions and 1957 deletions
+2 -1
View File
@@ -5,7 +5,7 @@ UTIL_MODS = psb_string_mod.o psb_spmat_type.o \
psb_desc_type.o psb_sort_mod.o psb_penv_mod.o \
psb_serial_mod.o psb_tools_mod.o psb_blacs_mod.o \
psb_linmap_type_mod.o psb_comm_mod.o psb_psblas_mod.o \
psi_serial_mod.o psi_mod.o \
psi_serial_mod.o psi_mod.o psb_ip_reord_mod.o\
psb_check_mod.o psb_gps_mod.o psb_linmap_mod.o psb_hash_mod.o
MODULES=$(BASIC_MODS) $(UTIL_MODS)
@@ -26,6 +26,7 @@ lib: $(BASIC_MODS) blacsmod $(UTIL_MODS) $(OBJS) $(LIBMOD)
psb_realloc_mod.o : psb_error_mod.o
psb_spmat_type.o : psb_realloc_mod.o psb_error_mod.o psb_const_mod.o psb_string_mod.o psb_sort_mod.o
psb_error_mod.o: psb_const_mod.o
psb_ip_reord_mod.o: psb_const_mod.o
psb_penv_mod.o: psb_const_mod.o psb_error_mod.o psb_realloc_mod.o psb_blacs_mod.o
psb_blacs_mod.o: psb_const_mod.o
psi_serial_mod.o: psb_const_mod.o psb_realloc_mod.o
+670
View File
@@ -0,0 +1,670 @@
!!$
!!$ Parallel Sparse BLAS version 2.2
!!$ (C) Copyright 2006/2007/2008
!!$ Salvatore Filippone University of Rome Tor Vergata
!!$ Alfredo Buttari University of Rome Tor Vergata
!!$
!!$ Redistribution and use in source and binary forms, with or without
!!$ modification, are permitted provided that the following conditions
!!$ are met:
!!$ 1. Redistributions of source code must retain the above copyright
!!$ notice, this list of conditions and the following disclaimer.
!!$ 2. Redistributions in binary form must reproduce the above copyright
!!$ notice, this list of conditions, and the following disclaimer in the
!!$ documentation and/or other materials provided with the distribution.
!!$ 3. The name of the PSBLAS group or the names of its contributors may
!!$ not be used to endorse or promote products derived from this
!!$ software without specific written permission.
!!$
!!$ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
!!$ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
!!$ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
!!$ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PSBLAS GROUP OR ITS CONTRIBUTORS
!!$ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
!!$ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
!!$ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
!!$ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
!!$ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
!!$ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
!
! Reorder (an) input vector(s) based on a list sort output.
! Based on: D. E. Knuth: The Art of Computer Programming
! vol. 3: Sorting and Searching, Addison Wesley, 1973
! ex. 5.2.12
!
!
module psb_ip_reord_mod
use psb_const_mod
interface psb_ip_reord
module procedure psb_ip_reord_i1,&
& psb_ip_reord_s1, psb_ip_reord_d1,&
& psb_ip_reord_c1, psb_ip_reord_z1,&
& psb_ip_reord_i1i1,&
& psb_ip_reord_s1i1, psb_ip_reord_d1i1,&
& psb_ip_reord_c1i1, psb_ip_reord_z1i1,&
& psb_ip_reord_s1i2, psb_ip_reord_d1i2,&
& psb_ip_reord_c1i2, psb_ip_reord_z1i2,&
& psb_ip_reord_s1i3, psb_ip_reord_d1i3,&
& psb_ip_reord_c1i3, psb_ip_reord_z1i3
end interface
contains
subroutine psb_ip_reord_i1(n,x,iaux)
integer, intent(in) :: n
integer :: iaux(0:*)
integer :: x(*)
integer :: lswap, lp, k
integer :: swap
lp = iaux(0)
k = 1
do
if ((lp==0).or.(k>n)) exit
do
if (lp >= k) exit
lp = iaux(lp)
end do
swap = x(lp)
x(lp) = x(k)
x(k) = swap
lswap = iaux(lp)
iaux(lp) = iaux(k)
iaux(k) = lp
lp = lswap
k = k + 1
enddo
return
end subroutine psb_ip_reord_i1
subroutine psb_ip_reord_s1(n,x,iaux)
integer, intent(in) :: n
integer :: iaux(0:*)
real(psb_spk_) :: x(*)
integer :: lswap, lp, k
real(psb_spk_) :: swap
lp = iaux(0)
k = 1
do
if ((lp==0).or.(k>n)) exit
do
if (lp >= k) exit
lp = iaux(lp)
end do
swap = x(lp)
x(lp) = x(k)
x(k) = swap
lswap = iaux(lp)
iaux(lp) = iaux(k)
iaux(k) = lp
lp = lswap
k = k + 1
enddo
return
end subroutine psb_ip_reord_s1
subroutine psb_ip_reord_d1(n,x,iaux)
integer, intent(in) :: n
integer :: iaux(0:*)
real(psb_dpk_) :: x(*)
integer :: lswap, lp, k
real(psb_dpk_) :: swap
lp = iaux(0)
k = 1
do
if ((lp==0).or.(k>n)) exit
do
if (lp >= k) exit
lp = iaux(lp)
end do
swap = x(lp)
x(lp) = x(k)
x(k) = swap
lswap = iaux(lp)
iaux(lp) = iaux(k)
iaux(k) = lp
lp = lswap
k = k + 1
enddo
return
end subroutine psb_ip_reord_d1
subroutine psb_ip_reord_c1(n,x,iaux)
integer, intent(in) :: n
integer :: iaux(0:*)
complex(psb_spk_) :: x(*)
integer :: lswap, lp, k
complex(psb_spk_) :: swap
lp = iaux(0)
k = 1
do
if ((lp==0).or.(k>n)) exit
do
if (lp >= k) exit
lp = iaux(lp)
end do
swap = x(lp)
x(lp) = x(k)
x(k) = swap
lswap = iaux(lp)
iaux(lp) = iaux(k)
iaux(k) = lp
lp = lswap
k = k + 1
enddo
return
end subroutine psb_ip_reord_c1
subroutine psb_ip_reord_z1(n,x,iaux)
integer, intent(in) :: n
integer :: iaux(0:*)
complex(psb_dpk_) :: x(*)
integer :: lswap, lp, k
complex(psb_dpk_) :: swap
lp = iaux(0)
k = 1
do
if ((lp==0).or.(k>n)) exit
do
if (lp >= k) exit
lp = iaux(lp)
end do
swap = x(lp)
x(lp) = x(k)
x(k) = swap
lswap = iaux(lp)
iaux(lp) = iaux(k)
iaux(k) = lp
lp = lswap
k = k + 1
enddo
return
end subroutine psb_ip_reord_z1
subroutine psb_ip_reord_i1i1(n,x,indx,iaux)
integer, intent(in) :: n
integer :: iaux(0:*)
integer :: x(*)
integer :: indx(*)
integer :: lswap, lp, k, ixswap
integer :: swap
lp = iaux(0)
k = 1
do
if ((lp==0).or.(k>n)) exit
do
if (lp >= k) exit
lp = iaux(lp)
end do
swap = x(lp)
x(lp) = x(k)
x(k) = swap
ixswap = indx(lp)
indx(lp) = indx(k)
indx(k) = ixswap
lswap = iaux(lp)
iaux(lp) = iaux(k)
iaux(k) = lp
lp = lswap
k = k + 1
enddo
return
end subroutine psb_ip_reord_i1i1
subroutine psb_ip_reord_s1i1(n,x,indx,iaux)
integer, intent(in) :: n
integer :: iaux(0:*)
real(psb_spk_) :: x(*)
integer :: indx(*)
integer :: lswap, lp, k, ixswap
real(psb_spk_) :: swap
lp = iaux(0)
k = 1
do
if ((lp==0).or.(k>n)) exit
do
if (lp >= k) exit
lp = iaux(lp)
end do
swap = x(lp)
x(lp) = x(k)
x(k) = swap
ixswap = indx(lp)
indx(lp) = indx(k)
indx(k) = ixswap
lswap = iaux(lp)
iaux(lp) = iaux(k)
iaux(k) = lp
lp = lswap
k = k + 1
enddo
return
end subroutine psb_ip_reord_s1i1
subroutine psb_ip_reord_d1i1(n,x,indx,iaux)
integer, intent(in) :: n
integer :: iaux(0:*)
real(psb_dpk_) :: x(*)
integer :: indx(*)
integer :: lswap, lp, k, ixswap
real(psb_dpk_) :: swap
lp = iaux(0)
k = 1
do
if ((lp==0).or.(k>n)) exit
do
if (lp >= k) exit
lp = iaux(lp)
end do
swap = x(lp)
x(lp) = x(k)
x(k) = swap
ixswap = indx(lp)
indx(lp) = indx(k)
indx(k) = ixswap
lswap = iaux(lp)
iaux(lp) = iaux(k)
iaux(k) = lp
lp = lswap
k = k + 1
enddo
return
end subroutine psb_ip_reord_d1i1
subroutine psb_ip_reord_c1i1(n,x,indx,iaux)
integer, intent(in) :: n
integer :: iaux(0:*)
complex(psb_spk_) :: x(*)
integer :: indx(*)
integer :: lswap, lp, k, ixswap
complex(psb_spk_) :: swap
lp = iaux(0)
k = 1
do
if ((lp==0).or.(k>n)) exit
do
if (lp >= k) exit
lp = iaux(lp)
end do
swap = x(lp)
x(lp) = x(k)
x(k) = swap
ixswap = indx(lp)
indx(lp) = indx(k)
indx(k) = ixswap
lswap = iaux(lp)
iaux(lp) = iaux(k)
iaux(k) = lp
lp = lswap
k = k + 1
enddo
return
end subroutine psb_ip_reord_c1i1
subroutine psb_ip_reord_z1i1(n,x,indx,iaux)
integer, intent(in) :: n
integer :: iaux(0:*)
complex(psb_dpk_) :: x(*)
integer :: indx(*)
integer :: lswap, lp, k, ixswap
complex(psb_dpk_) :: swap
lp = iaux(0)
k = 1
do
if ((lp==0).or.(k>n)) exit
do
if (lp >= k) exit
lp = iaux(lp)
end do
swap = x(lp)
x(lp) = x(k)
x(k) = swap
ixswap = indx(lp)
indx(lp) = indx(k)
indx(k) = ixswap
lswap = iaux(lp)
iaux(lp) = iaux(k)
iaux(k) = lp
lp = lswap
k = k + 1
enddo
return
end subroutine psb_ip_reord_z1i1
subroutine psb_ip_reord_s1i2(n,x,i1,i2,iaux)
integer, intent(in) :: n
integer :: iaux(0:*)
real(psb_spk_) :: x(*)
integer :: i1(*), i2(*)
integer :: lswap, lp, k, isw1, isw2
real(psb_spk_) :: swap
lp = iaux(0)
k = 1
do
if ((lp==0).or.(k>n)) exit
do
if (lp >= k) exit
lp = iaux(lp)
end do
swap = x(lp)
x(lp) = x(k)
x(k) = swap
isw1 = i1(lp)
i1(lp) = i1(k)
i1(k) = isw1
isw2 = i2(lp)
i2(lp) = i2(k)
i2(k) = isw2
lswap = iaux(lp)
iaux(lp) = iaux(k)
iaux(k) = lp
lp = lswap
k = k + 1
enddo
return
end subroutine psb_ip_reord_s1i2
subroutine psb_ip_reord_d1i2(n,x,i1,i2,iaux)
integer, intent(in) :: n
integer :: iaux(0:*)
real(psb_dpk_) :: x(*)
integer :: i1(*), i2(*)
integer :: lswap, lp, k, isw1, isw2
real(psb_dpk_) :: swap
lp = iaux(0)
k = 1
do
if ((lp==0).or.(k>n)) exit
do
if (lp >= k) exit
lp = iaux(lp)
end do
swap = x(lp)
x(lp) = x(k)
x(k) = swap
isw1 = i1(lp)
i1(lp) = i1(k)
i1(k) = isw1
isw2 = i2(lp)
i2(lp) = i2(k)
i2(k) = isw2
lswap = iaux(lp)
iaux(lp) = iaux(k)
iaux(k) = lp
lp = lswap
k = k + 1
enddo
return
end subroutine psb_ip_reord_d1i2
subroutine psb_ip_reord_c1i2(n,x,i1,i2,iaux)
integer, intent(in) :: n
integer :: iaux(0:*)
complex(psb_spk_) :: x(*)
integer :: i1(*), i2(*)
integer :: lswap, lp, k, isw1, isw2
complex(psb_spk_) :: swap
lp = iaux(0)
k = 1
do
if ((lp==0).or.(k>n)) exit
do
if (lp >= k) exit
lp = iaux(lp)
end do
swap = x(lp)
x(lp) = x(k)
x(k) = swap
isw1 = i1(lp)
i1(lp) = i1(k)
i1(k) = isw1
isw2 = i2(lp)
i2(lp) = i2(k)
i2(k) = isw2
lswap = iaux(lp)
iaux(lp) = iaux(k)
iaux(k) = lp
lp = lswap
k = k + 1
enddo
return
end subroutine psb_ip_reord_c1i2
subroutine psb_ip_reord_z1i2(n,x,i1,i2,iaux)
integer, intent(in) :: n
integer :: iaux(0:*)
complex(psb_dpk_) :: x(*)
integer :: i1(*), i2(*)
integer :: lswap, lp, k, isw1, isw2
complex(psb_dpk_) :: swap
lp = iaux(0)
k = 1
do
if ((lp==0).or.(k>n)) exit
do
if (lp >= k) exit
lp = iaux(lp)
end do
swap = x(lp)
x(lp) = x(k)
x(k) = swap
isw1 = i1(lp)
i1(lp) = i1(k)
i1(k) = isw1
isw2 = i2(lp)
i2(lp) = i2(k)
i2(k) = isw2
lswap = iaux(lp)
iaux(lp) = iaux(k)
iaux(k) = lp
lp = lswap
k = k + 1
enddo
return
end subroutine psb_ip_reord_z1i2
subroutine psb_ip_reord_s1i3(n,x,i1,i2,i3,iaux)
integer, intent(in) :: n
integer :: iaux(0:*)
real(psb_spk_) :: x(*)
integer :: i1(*), i2(*), i3(*)
integer :: lswap, lp, k, isw1, isw2, isw3
real(psb_spk_) :: swap
lp = iaux(0)
k = 1
do
if ((lp==0).or.(k>n)) exit
do
if (lp >= k) exit
lp = iaux(lp)
end do
swap = x(lp)
x(lp) = x(k)
x(k) = swap
isw1 = i1(lp)
i1(lp) = i1(k)
i1(k) = isw1
isw2 = i2(lp)
i2(lp) = i2(k)
i2(k) = isw2
isw3 = i3(lp)
i3(lp) = i3(k)
i3(k) = isw3
lswap = iaux(lp)
iaux(lp) = iaux(k)
iaux(k) = lp
lp = lswap
k = k + 1
enddo
return
end subroutine psb_ip_reord_s1i3
subroutine psb_ip_reord_d1i3(n,x,i1,i2,i3,iaux)
integer, intent(in) :: n
integer :: iaux(0:*)
real(psb_dpk_) :: x(*)
integer :: i1(*), i2(*),i3(*)
integer :: lswap, lp, k, isw1, isw2,isw3
real(psb_dpk_) :: swap
lp = iaux(0)
k = 1
do
if ((lp==0).or.(k>n)) exit
do
if (lp >= k) exit
lp = iaux(lp)
end do
swap = x(lp)
x(lp) = x(k)
x(k) = swap
isw1 = i1(lp)
i1(lp) = i1(k)
i1(k) = isw1
isw2 = i2(lp)
i2(lp) = i2(k)
i2(k) = isw2
isw3 = i3(lp)
i3(lp) = i3(k)
i3(k) = isw3
lswap = iaux(lp)
iaux(lp) = iaux(k)
iaux(k) = lp
lp = lswap
k = k + 1
enddo
return
end subroutine psb_ip_reord_d1i3
subroutine psb_ip_reord_c1i3(n,x,i1,i2,i3,iaux)
integer, intent(in) :: n
integer :: iaux(0:*)
complex(psb_spk_) :: x(*)
integer :: i1(*), i2(*), i3(*)
integer :: lswap, lp, k, isw1, isw2, isw3
complex(psb_spk_) :: swap
lp = iaux(0)
k = 1
do
if ((lp==0).or.(k>n)) exit
do
if (lp >= k) exit
lp = iaux(lp)
end do
swap = x(lp)
x(lp) = x(k)
x(k) = swap
isw1 = i1(lp)
i1(lp) = i1(k)
i1(k) = isw1
isw2 = i2(lp)
i2(lp) = i2(k)
i2(k) = isw2
isw3 = i3(lp)
i3(lp) = i3(k)
i3(k) = isw3
lswap = iaux(lp)
iaux(lp) = iaux(k)
iaux(k) = lp
lp = lswap
k = k + 1
enddo
return
end subroutine psb_ip_reord_c1i3
subroutine psb_ip_reord_z1i3(n,x,i1,i2,i3,iaux)
integer, intent(in) :: n
integer :: iaux(0:*)
complex(psb_dpk_) :: x(*)
integer :: i1(*), i2(*), i3(*)
integer :: lswap, lp, k, isw1, isw2, isw3
complex(psb_dpk_) :: swap
lp = iaux(0)
k = 1
do
if ((lp==0).or.(k>n)) exit
do
if (lp >= k) exit
lp = iaux(lp)
end do
swap = x(lp)
x(lp) = x(k)
x(k) = swap
isw1 = i1(lp)
i1(lp) = i1(k)
i1(k) = isw1
isw2 = i2(lp)
i2(lp) = i2(k)
i2(k) = isw2
isw3 = i3(lp)
i3(lp) = i3(k)
i3(k) = isw3
lswap = iaux(lp)
iaux(lp) = iaux(k)
iaux(k) = lp
lp = lswap
k = k + 1
enddo
return
end subroutine psb_ip_reord_z1i3
end module psb_ip_reord_mod