psblas3:

config/pac.m4
 configure
 util/metis_int.c
 util/psb_metispart_mod.F90

Use METIS_PartGraphKway, test for same in configure.

config/pac.m4

@@ -1860,8 +1860,8 @@ if test "x$pac_metis_header_ok" == "xyes" ; then
       psblas_cv_metis_includes="$METIS_INCLUDES"
       METIS_LIBS="$psblas_cv_metis $METIS_LIBDIR"
       LIBS="$METIS_LIBS -lm $LIBS";
-      AC_MSG_CHECKING([for METIS_PartGraphRecursive in $METIS_LIBS])
+      AC_MSG_CHECKING([for METIS_PartGraphKway in $METIS_LIBS])
-      AC_TRY_LINK_FUNC(METIS_PartGraphRecursive, 
+      AC_TRY_LINK_FUNC(METIS_PartGraphKway, 
        [psblas_cv_have_metis=yes;pac_metis_lib_ok=yes; ],
        [psblas_cv_have_metis=no;pac_metis_lib_ok=no; METIS_LIBS=""])
       AC_MSG_RESULT($pac_metis_lib_ok)
@@ -1871,8 +1871,8 @@ if test "x$pac_metis_header_ok" == "xyes" ; then
         METIS_LIBS="$psblas_cv_metis $METIS_LIBDIR"
         LIBS="$METIS_LIBS -lm $SAVE_LIBS"
         
-      AC_MSG_CHECKING([for METIS_PartGraphRecursive in $METIS_LIBS])
+      AC_MSG_CHECKING([for METIS_PartGraphKway in $METIS_LIBS])
-      AC_TRY_LINK_FUNC(METIS_PartGraphRecursive, 
+      AC_TRY_LINK_FUNC(METIS_PartGraphKway, 
        [psblas_cv_have_metis=yes;pac_metis_lib_ok=yes; ],
        [psblas_cv_have_metis=no;pac_metis_lib_ok=no; METIS_LIBS=""])
       AC_MSG_RESULT($pac_metis_lib_ok)
@@ -1882,8 +1882,8 @@ if test "x$pac_metis_header_ok" == "xyes" ; then
         METIS_LIBDIR="-L$psblas_cv_metisdir/METIS/Lib -L$psblas_cv_metisdir/METIS/Lib"
         METIS_LIBS="$psblas_cv_metis $METIS_LIBDIR"
         LIBS="$METIS_LIBS -lm $SAVE_LIBS"
-      AC_MSG_CHECKING([for METIS_PartGraphRecursive in $METIS_LIBS])
+      AC_MSG_CHECKING([for METIS_PartGraphKway in $METIS_LIBS])
-      AC_TRY_LINK_FUNC(METIS_PartGraphRecursive, 
+      AC_TRY_LINK_FUNC(METIS_PartGraphKway, 
        [psblas_cv_have_metis=yes;pac_metis_lib_ok=yes; ],
        [psblas_cv_have_metis=no;pac_metis_lib_ok=no; METIS_LIBS=""])
       AC_MSG_RESULT($pac_metis_lib_ok)

util/metis_int.c

@@ -2,10 +2,10 @@
 #if defined(HAVE_METIS_)
 #include "metis.h"
 
-/* extern int METIS_PartGraphRecursive(int *, int *, int *, int *, int *, int *, int *, int *, float *, float, int *, int *, int *); */
+/* extern int METIS_PartGraphKway(int *, int *, int *, int *, int *, int *, int *, int *, float *, float, int *, int *, int *); */
 
 
-int metis_PartGraphRecursive_C(int *n, int *ixadj, int *iadj, int *ivwg, 
+int metis_PartGraphKway_C(int *n, int *ixadj, int *iadj, int *ivwg, 
 				int *iajw, int *nparts, float *weights, 
 				int *graphpart)
 {
@@ -19,14 +19,14 @@ int metis_PartGraphRecursive_C(int *n, int *ixadj, int *iadj, int *ivwg,
   //printf("n:%p ncon:%p ixadj:%p iadj:%p npart:%p weights:%p options:%p objval:%p graphpart: %p\n",n,&ncon,ixadj,iadj,nparts,NULL,options,&objval,graphpart);
   /* fprintf(stderr,"From metis_int: %f\n",weights[0]); */
   if (weights[0] == -1.0) {
-    res = METIS_PartGraphRecursive((idx_t*)n,(idx_t *)&ncon,(idx_t *)ixadj,(idx_t *)iadj,
+    res = METIS_PartGraphKway((idx_t*)n,(idx_t *)&ncon,(idx_t *)ixadj,(idx_t *)iadj,
 				   NULL,NULL,NULL,(idx_t *)nparts,NULL,NULL,options,
 				   &objval,(idx_t *)graphpart);
   } else {
-    /* res = METIS_PartGraphRecursive((idx_t*)n,(idx_t *)&ncon,(idx_t *)ixadj,(idx_t *)iadj, */
+    /* res = METIS_PartGraphKway((idx_t*)n,(idx_t *)&ncon,(idx_t *)ixadj,(idx_t *)iadj, */
     /* 				   NULL,NULL,NULL,(idx_t *)nparts,NULL,NULL,NULL, */
     /* 				   &objval,(idx_t *)graphpart); */
-    res = METIS_PartGraphRecursive((idx_t*)n,(idx_t *)&ncon,(idx_t *)ixadj,(idx_t *)iadj,
+    res = METIS_PartGraphKway((idx_t*)n,(idx_t *)&ncon,(idx_t *)ixadj,(idx_t *)iadj,
     				   NULL,NULL,NULL,(idx_t *)nparts,weights,NULL,options,
     				   &objval,(idx_t *)graphpart);
   }
@@ -40,7 +40,7 @@ int metis_PartGraphRecursive_C(int *n, int *ixadj, int *iadj, int *ivwg,
 
 #else 
 
-int metis_PartGraphRecursive_C(int *n, int *ixadj, int *iadj, int *ivwg, 
+int metis_PartGraphKway_C(int *n, int *ixadj, int *iadj, int *ivwg, 
 				int *iajw, int *nparts, float *weights, 
 				int *graphpart)
 {

util/psb_metispart_mod.F90

@@ -45,7 +45,7 @@
 !        integer(psb_ipk_) :: NPARTS  How many parts we are requiring to the 
 !                                 partition utility
 ! 
-!  DISTR_MTPART(RROOT,CROOT,ICTXT): This subroutine will be called by
+!  DISTR_MTPART(ROOT,ICTXT): This subroutine will be called by
 !      all processes to distribute the information computed by the root
 !      process, to be used subsequently.
 !
@@ -55,14 +55,21 @@
 !
 module psb_metispart_mod
   use psb_base_mod, only : psb_ipk_, psb_sspmat_type, psb_cspmat_type,&
-       & psb_dspmat_type, psb_zspmat_type, psb_err_unit, psb_mpik_
+       & psb_dspmat_type, psb_zspmat_type, psb_err_unit, psb_mpik_,&
+       & psb_s_csr_sparse_mat, psb_d_csr_sparse_mat, &
+       & psb_c_csr_sparse_mat, psb_z_csr_sparse_mat
   public part_graph, build_mtpart, distr_mtpart,&
        & getv_mtpart, free_part
   private 
   integer(psb_ipk_), allocatable, save :: graph_vect(:)
 
   interface build_mtpart
-    module procedure build_mtpart, d_mat_build_mtpart, s_mat_build_mtpart, z_mat_build_mtpart, c_mat_build_mtpart
+    module procedure build_mtpart,&
+         & d_mat_build_mtpart, s_mat_build_mtpart,&
+         & z_mat_build_mtpart, c_mat_build_mtpart, &
+         & d_csr_build_mtpart, s_csr_build_mtpart,&
+         & z_csr_build_mtpart, c_csr_build_mtpart
+
   end interface
 
 contains
@@ -154,11 +161,10 @@ contains
       if (allocated(wgh_)) then 
         call build_mtpart(aa%get_nrows(),aa%get_fmt(),aa%ja,aa%irp,nparts,wgh_)
       else
-        call build_mtpart(aa%get_nrows(),aa%get_fmt(),aa%ja,aa%irp,nparts,wgh_)
+        call build_mtpart(aa%get_nrows(),aa%get_fmt(),aa%ja,aa%irp,nparts)
       end if
     class default
       write(psb_err_unit,*) 'Sorry, right now we only take CSR input!'
-      call psb_abort(ictxt)
     end select
 
   end subroutine d_mat_build_mtpart
@@ -182,11 +188,10 @@ contains
       if (allocated(wgh_)) then 
         call build_mtpart(aa%get_nrows(),aa%get_fmt(),aa%ja,aa%irp,nparts,wgh_)
       else
-        call build_mtpart(aa%get_nrows(),aa%get_fmt(),aa%ja,aa%irp,nparts,wgh_)
+        call build_mtpart(aa%get_nrows(),aa%get_fmt(),aa%ja,aa%irp,nparts)
       end if
     class default
       write(psb_err_unit,*) 'Sorry, right now we only take CSR input!'
-      call psb_abort(ictxt)
     end select
 
   end subroutine z_mat_build_mtpart
@@ -204,7 +209,6 @@ contains
       call build_mtpart(aa%get_nrows(),aa%get_fmt(),aa%ja,aa%irp,nparts,weights)
     class default
       write(psb_err_unit,*) 'Sorry, right now we only take CSR input!'
-      call psb_abort(ictxt)
     end select
 
   end subroutine s_mat_build_mtpart
@@ -222,11 +226,79 @@ contains
       call build_mtpart(aa%get_nrows(),aa%get_fmt(),aa%ja,aa%irp,nparts,weights)
     class default
       write(psb_err_unit,*) 'Sorry, right now we only take CSR input!'
-      call psb_abort(ictxt)
     end select
 
   end subroutine c_mat_build_mtpart
 
+  
+  subroutine d_csr_build_mtpart(a,nparts,weights)
+    use psb_base_mod
+    type(psb_d_csr_sparse_mat), intent(in) :: a
+    integer(psb_ipk_) :: nparts
+    real(psb_dpk_), optional :: weights(:)
+    real(psb_spk_), allocatable :: wgh_(:)
+
+
+    if (present(weights)) then 
+      if (size(weights)==nparts) then 
+        wgh_ = weights
+      end if
+    end if
+    if (allocated(wgh_)) then 
+      call build_mtpart(a%get_nrows(),a%get_fmt(),a%ja,a%irp,nparts,wgh_)
+    else
+      call build_mtpart(a%get_nrows(),a%get_fmt(),a%ja,a%irp,nparts)
+    end if
+
+  end subroutine d_csr_build_mtpart
+
+  subroutine z_csr_build_mtpart(a,nparts,weights)
+    use psb_base_mod
+    type(psb_z_csr_sparse_mat), intent(in) :: a
+    integer(psb_ipk_) :: nparts
+    real(psb_dpk_), optional :: weights(:)
+    real(psb_spk_), allocatable :: wgh_(:)
+    
+
+    if (present(weights)) then 
+      if (size(weights)==nparts) then 
+        wgh_ = weights
+      end if
+    end if
+    if (allocated(wgh_)) then 
+      call build_mtpart(a%get_nrows(),a%get_fmt(),a%ja,a%irp,nparts,wgh_)
+    else
+      call build_mtpart(a%get_nrows(),a%get_fmt(),a%ja,a%irp,nparts)
+    end if
+
+  end subroutine z_csr_build_mtpart
+
+  
+  subroutine s_csr_build_mtpart(a,nparts,weights)
+    use psb_base_mod
+    type(psb_s_csr_sparse_mat), intent(in) :: a
+    integer(psb_ipk_) :: nparts
+    real(psb_spk_), optional :: weights(:)
+    
+
+    call build_mtpart(a%get_nrows(),a%get_fmt(),a%ja,a%irp,nparts,weights)
+
+  end subroutine s_csr_build_mtpart
+
+  
+  subroutine c_csr_build_mtpart(a,nparts,weights)
+    use psb_base_mod
+    type(psb_c_csr_sparse_mat), intent(in) :: a
+    integer(psb_ipk_) :: nparts
+    real(psb_spk_), optional :: weights(:)
+    
+    
+    call build_mtpart(a%get_nrows(),a%get_fmt(),a%ja,a%irp,nparts,weights)
+
+  end subroutine c_csr_build_mtpart
+
+
+
   subroutine build_mtpart(n,fida,ja,irp,nparts,weights)
     use psb_base_mod
     implicit none 
@@ -244,7 +316,7 @@ contains
 
 #if defined(HAVE_METIS)
     interface 
-      ! subroutine METIS_PartGraphRecursive(n,ixadj,iadj,ivwg,iajw,&
+      ! subroutine METIS_PartGraphKway(n,ixadj,iadj,ivwg,iajw,&
       !     & wgflag,numflag,nparts,weights,iopt,nedc,part) bind(c)
       !   use iso_c_binding
       !   integer(c_int) :: n,wgflag,numflag,nparts,nedc
@@ -252,10 +324,10 @@ contains
       !   real(c_float)  :: weights(*)
       !   !integer(psb_ipk_) :: n,wgflag,numflag,nparts,nedc
       !   !integer(psb_ipk_) :: ixadj(*),iadj(*),ivwg(*),iajw(*),iopt(*),part(*)
-      ! end subroutine METIS_PartGraphRecursive
+      ! end subroutine METIS_PartGraphKway
 
-      function METIS_PartGraphRecursive(n,ixadj,iadj,ivwg,iajw,&
+      function METIS_PartGraphKway(n,ixadj,iadj,ivwg,iajw,&
-           & nparts,weights,part) bind(c,name="metis_PartGraphRecursive_C") result(res)
+           & nparts,weights,part) bind(c,name="metis_PartGraphKway_C") result(res)
         use iso_c_binding
         integer(c_int) :: res
         integer(c_int) :: n,nparts
@@ -263,7 +335,7 @@ contains
         real(c_float)  :: weights(*)
         !integer(psb_ipk_) :: n,wgflag,numflag,nparts,nedc
         !integer(psb_ipk_) :: ixadj(*),iadj(*),ivwg(*),iajw(*),iopt(*),part(*)
-      end function METIS_PartGraphRecursive
+      end function METIS_PartGraphKway
     end interface
 
     call psb_realloc(n,graph_vect,info)
@@ -280,7 +352,7 @@ contains
         numflag  = 1
         wgflag   = 0
 
-        write(*,*) 'Before allocation',nparts
+!!$        write(*,*) 'Before allocation',nparts
 
         irpl=irp
         jal = ja
@@ -289,23 +361,23 @@ contains
         wgh_ = -1.0
         if(present(weights)) then
           if (size(weights) == nptl) then 
-            write(*,*) 'weights present',weights
+!!$            write(*,*) 'weights present',weights
-            ! call METIS_PartGraphRecursive(n,irp,ja,idummy,jdummy,&
+            ! call METIS_PartGraphKway(n,irp,ja,idummy,jdummy,&
             !      & wgflag,numflag,nparts,weights,iopt,nedc,graph_vect)
-            info = METIS_PartGraphRecursive(nl,irpl,jal,idummy,jdummy,&
+            info = METIS_PartGraphKway(nl,irpl,jal,idummy,jdummy,&
                  & nptl,weights,gvl)
 
           else
-            write(*,*) 'weights absent',wgh_
+!!$            write(*,*) 'weights absent',wgh_
-            info = METIS_PartGraphRecursive(nl,irpl,jal,idummy,jdummy,&
+            info = METIS_PartGraphKway(nl,irpl,jal,idummy,jdummy,&
                  & nptl,wgh_,gvl)
           end if
         else
-          write(*,*) 'weights absent',wgh_
+!!$          write(*,*) 'weights absent',wgh_
-          info = METIS_PartGraphRecursive(nl,irpl,jal,idummy,jdummy,&
+          info = METIS_PartGraphKway(nl,irpl,jal,idummy,jdummy,&
                & nptl,wgh_,gvl)
         endif
-        write(*,*) 'after allocation',info
+!!$        write(*,*) 'after allocation',info
 
         do i=1, n
           graph_vect(i) = gvl(i) - 1