added parallel double precision spspmm implementations

base/modules/Makefile

@@ -64,7 +64,8 @@ SERIAL_MODS=serial/psb_s_serial_mod.o serial/psb_d_serial_mod.o \
 	serial/psb_s_base_mat_mod.o serial/psb_s_csr_mat_mod.o serial/psb_s_csc_mat_mod.o serial/psb_s_mat_mod.o \
 	serial/psb_d_base_mat_mod.o serial/psb_d_csr_mat_mod.o serial/psb_d_csc_mat_mod.o serial/psb_d_mat_mod.o \
 	serial/psb_c_base_mat_mod.o serial/psb_c_csr_mat_mod.o serial/psb_c_csc_mat_mod.o serial/psb_c_mat_mod.o \
-	serial/psb_z_base_mat_mod.o serial/psb_z_csr_mat_mod.o serial/psb_z_csc_mat_mod.o serial/psb_z_mat_mod.o
+	serial/psb_z_base_mat_mod.o serial/psb_z_csr_mat_mod.o serial/psb_z_csc_mat_mod.o serial/psb_z_mat_mod.o \
+	serial/psb_d_rb_idx_tree_mod.o serial/psb_rb_idx_tree_mod.o
 #\
 #	serial/psb_ls_csr_mat_mod.o serial/psb_ld_csr_mat_mod.o serial/psb_lc_csr_mat_mod.o serial/psb_lz_csr_mat_mod.o 
 #\
@@ -270,6 +271,9 @@ serial/psb_z_vect_mod.o: serial/psb_z_base_vect_mod.o serial/psb_i_vect_mod.o
 serial/psb_s_serial_mod.o serial/psb_d_serial_mod.o serial/psb_c_serial_mod.o serial/psb_z_serial_mod.o: serial/psb_mat_mod.o auxil/psb_string_mod.o auxil/psb_sort_mod.o auxil/psi_serial_mod.o
 serial/psb_vect_mod.o: serial/psb_i_vect_mod.o serial/psb_l_vect_mod.o serial/psb_d_vect_mod.o serial/psb_s_vect_mod.o serial/psb_c_vect_mod.o serial/psb_z_vect_mod.o
 
+serial/psb_d_rb_idx_tree_mod.o: serial/psb_d_csr_mat_mod.o
+serial/psb_rb_idx_tree_mod.o: serial/psb_d_rb_idx_tree_mod.o
+
 error.o psb_realloc_mod.o: psb_error_mod.o 
 psb_error_impl.o: psb_penv_mod.o
 psb_timers_mod.o: psb_penv_mod.o psb_const_mod.o psb_realloc_mod.o psb_error_mod.o

base/modules/serial/psb_d_csr_mat_mod.f90

@@ -46,6 +46,14 @@ module psb_d_csr_mat_mod
 
   use psb_d_base_mat_mod
 
+  integer(psb_ipk_), parameter :: spspmm_serial = 0
+  integer(psb_ipk_), parameter :: spspmm_omp_gustavson = 1
+  integer(psb_ipk_), parameter :: spspmm_omp_gustavson_1d = 2
+  integer(psb_ipk_), parameter :: spspmm_serial_rb_tree = 3
+  integer(psb_ipk_), parameter :: spspmm_omp_rb_tree = 4
+  integer(psb_ipk_), parameter :: spspmm_omp_two_pass = 5
+  integer(psb_ipk_) :: spspmm_impl = spspmm_serial
+
   !> \namespace  psb_base_mod  \class  psb_d_csr_sparse_mat
   !! \extends psb_d_base_mat_mod::psb_d_base_sparse_mat
   !!

base/modules/serial/psb_d_mat_mod.F90

@@ -79,7 +79,10 @@
 module psb_d_mat_mod
 
   use psb_d_base_mat_mod
-  use psb_d_csr_mat_mod,  only : psb_d_csr_sparse_mat, psb_ld_csr_sparse_mat
+  use psb_d_csr_mat_mod,  only : psb_d_csr_sparse_mat, psb_ld_csr_sparse_mat, &
+                                spspmm_impl, spspmm_serial, spspmm_omp_gustavson, &
+                                spspmm_omp_gustavson_1d, spspmm_serial_rb_tree, &
+                                spspmm_omp_rb_tree, spspmm_omp_two_pass
   use psb_d_csc_mat_mod,  only : psb_d_csc_sparse_mat, psb_ld_csc_sparse_mat
 
   type :: psb_dspmat_type

base/modules/serial/psb_d_rb_idx_tree_mod.f90

@@ -0,0 +1,91 @@
+! Red black tree implementation ordered by index
+!
+! Each node contains and index and a double precision value
+!
+! The tree should always be well balanced
+!
+! inserting a node with an existing index will 
+! add up the new value to the old one
+module psb_d_rb_idx_tree_mod
+    use psb_const_mod
+    implicit none
+    type :: psb_d_rb_idx_node
+        integer(psb_ipk_) :: idx
+        real(psb_dpk_) :: val
+        type(psb_d_rb_idx_node), pointer :: left, right, parent
+        logical :: is_red
+    end type psb_d_rb_idx_node
+
+    type :: psb_d_rb_idx_tree
+        type(psb_d_rb_idx_node), pointer :: root
+        integer(psb_ipk_) :: nnz
+
+        contains
+
+        procedure :: insert => psb_d_rb_idx_tree_insert
+    end type psb_d_rb_idx_tree
+
+    interface psb_rb_idx_tree_insert
+    subroutine psb_d_rb_idx_tree_insert(this, idx, val)
+        import :: psb_ipk_, psb_dpk_, psb_d_rb_idx_tree
+        implicit none
+        class(psb_d_rb_idx_tree), intent(inout) :: this
+        integer(psb_ipk_), intent(in) :: idx
+        real(psb_dpk_), intent(in) :: val
+    end subroutine psb_d_rb_idx_tree_insert
+    end interface psb_rb_idx_tree_insert
+    
+    interface psb_rb_idx_tree_scalar_sparse_row_mul
+    subroutine psb_d_rb_idx_tree_scalar_sparse_row_mul(tree, scalar, mat, row_num)
+        use psb_d_csr_mat_mod, only : psb_d_csr_sparse_mat
+        import :: psb_ipk_, psb_dpk_, psb_d_rb_idx_tree
+        implicit none
+        type(psb_d_rb_idx_tree), intent(inout) :: tree
+        real(psb_dpk_), intent(in) :: scalar
+        type(psb_d_csr_sparse_mat), intent(in) :: mat
+        integer(psb_ipk_), intent(in) :: row_num
+    end subroutine psb_d_rb_idx_tree_scalar_sparse_row_mul
+    end interface psb_rb_idx_tree_scalar_sparse_row_mul
+ 
+    interface psb_rb_idx_tree_merge
+    subroutine psb_d_rb_idx_tree_merge(trees, mat)
+        use psb_d_csr_mat_mod, only : psb_d_csr_sparse_mat
+        import :: psb_d_rb_idx_tree
+        type(psb_d_rb_idx_tree), allocatable, intent(inout) :: trees(:)
+        type(psb_d_csr_sparse_mat), intent(inout) :: mat
+    end subroutine psb_d_rb_idx_tree_merge
+    end interface psb_rb_idx_tree_merge
+    
+    interface psb_rb_idx_tree_fix_insertion
+    subroutine psb_d_rb_idx_tree_fix_insertion(this, node)
+        import :: psb_d_rb_idx_tree, psb_d_rb_idx_node
+        implicit none
+        class(psb_d_rb_idx_tree), intent(inout) :: this
+        type(psb_d_rb_idx_node), pointer, intent(inout) :: node
+    end subroutine psb_d_rb_idx_tree_fix_insertion
+    end interface psb_rb_idx_tree_fix_insertion
+
+    interface psb_rb_idx_tree_swap_colors
+    subroutine psb_d_rb_idx_tree_swap_colors(n1, n2)
+        import :: psb_d_rb_idx_node
+        implicit none
+        type(psb_d_rb_idx_node), pointer, intent(inout) :: n1, n2
+    end subroutine psb_d_rb_idx_tree_swap_colors
+    end interface psb_rb_idx_tree_swap_colors
+
+    interface psb_rb_idx_tree_rotate_right
+    subroutine psb_d_rb_idx_tree_rotate_right(node)
+        import :: psb_d_rb_idx_node
+        implicit none
+        type(psb_d_rb_idx_node), pointer, intent(inout) :: node
+    end subroutine psb_d_rb_idx_tree_rotate_right
+    end interface psb_rb_idx_tree_rotate_right
+
+    interface psb_rb_idx_tree_rotate_left
+    subroutine psb_d_rb_idx_tree_rotate_left(node)
+        import :: psb_d_rb_idx_node
+        implicit none
+        type(psb_d_rb_idx_node), pointer, intent(inout) :: node
+    end subroutine psb_d_rb_idx_tree_rotate_left
+    end interface psb_rb_idx_tree_rotate_left
+end module psb_d_rb_idx_tree_mod

base/modules/serial/psb_rb_idx_tree_mod.f90

@@ -0,0 +1,5 @@
+module psb_rb_idx_tree_mod
+    use psb_const_mod
+
+    use psb_d_rb_idx_tree_mod
+end module psb_rb_idx_tree_mod