Added psparse_from_split_blocks

Author: fverdugo

src/PartitionedArrays.jl

@@ -143,6 +143,7 @@ include("p_vector.jl")
 export SplitMatrix
 export split_matrix
 export split_matrix_blocks
+export psparse_from_split_blocks
 export PSparseMatrix
 export psparse
 export psparse!

src/p_sparse_matrix.jl

@@ -637,6 +637,16 @@ function split_matrix(
     SplitMatrix(blocks,row_permutation,col_permutation)
 end
 
+function split_matrix(
+    own_own::AbstractMatrix,
+    own_ghost::AbstractMatrix,
+    ghost_own::AbstractMatrix,
+    ghost_ghost::AbstractMatrix,
+    row_permutation,
+    col_permutation)
+    blocks = split_matrix_blocks(own_own,own_ghost,ghost_own,ghost_ghost)
+    split_matrix(blocks,row_permutation,col_permutation)
+end
 
 Base.size(a::AbstractSplitMatrix) = (length(a.row_permutation),length(a.col_permutation))
 Base.IndexStyle(::Type{<:AbstractSplitMatrix}) = IndexCartesian()
@@ -1294,6 +1304,33 @@ function psparse!(C,V,cache)
     end
 end
 
+function psparse_from_split_blocks(oo,oh,ho,hh,rowp,colp;assembled=false)
+    rperms = map(local_permutation,rowp)
+    cperms = map(local_permutation,colp)
+    values = map(split_matrix,oo,oh,ho,hh,rperms,cperms)
+    PSparseMatrix(values,rowp,colp,assembled)
+end
+
+function psparse_from_split_blocks(oo,oh,rowp,colp;assembled=true)
+    ho = map(oo,rowp,colp) do oo, rows, cols
+        T = typeof(oo)
+        Tv = eltype(oo)
+        Ti = indextype(oo)
+        n_ghost_rows = ghost_length(rows)
+        n_own_cols = own_length(cols)
+        sparse_matrix(T,Ti[],Ti[],Tv[],n_ghost_rows,n_own_cols)
+    end
+    hh = map(oo,rowp,colp) do oo, rows, cols
+        T = typeof(oo)
+        Tv = eltype(oo)
+        Ti = indextype(oo)
+        n_ghost_rows = ghost_length(rows)
+        n_ghost_cols = ghost_length(cols)
+        sparse_matrix(T,Ti[],Ti[],Tv[],n_ghost_rows,n_ghost_cols)
+    end
+    psparse_from_split_blocks(oo,oh,ho,hh,rowp,colp;assembled)
+end
+
 function assemble(A::PSparseMatrix;kwargs...)
     rows = map(remove_ghost,partition(axes(A,1))) 
     assemble(A,rows;kwargs...)

test/p_sparse_matrix_tests.jl

@@ -198,6 +198,18 @@ function p_sparse_matrix_tests(distribute)
       @test all( values .== 6 )
     end
 
+    A = psparse_from_split_blocks(own_own_values(A),own_ghost_values(A),row_partition,col_partition)
+    x = pfill(3.0,axes(A,2);split_format=true)
+    b = similar(x,axes(A,1))
+    mul!(b,A,x)
+    map(own_values(b)) do values
+        @test all( values .== 6 )
+    end
+    consistent!(b) |> wait
+    map(partition(b)) do values
+      @test all( values .== 6 )
+    end
+
     A = psparse(I,J,V,row_partition,col_partition) |> fetch
     x = pfill(3.0,axes(A,2))
     b = similar(x,axes(A,1))