Merge pull request #141 from JordiManyer/jordi-dev

Bugfix: `copy`

Author: fverdugo

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Fixed
+
+- Bug in `copy`.
+
 ## [0.4.4] - 2024-02-20
 
 ### Fixed

src/p_sparse_matrix.jl

@@ -311,6 +311,12 @@ function Base.similar(::Type{<:OldPSparseMatrix{V}},inds::Tuple{<:PRange,<:PRang
     OldPSparseMatrix(matrix_partition,partition(rows),partition(cols))
 end
 
+function Base.copy(a::OldPSparseMatrix)
+    mats = map(copy,partition(a))
+    cache = map(copy_cache,a.cache)
+    OldPSparseMatrix(mats,partition(axes(a,1)),partition(axes(a,2)),cache)
+end
+
 function Base.copy!(a::OldPSparseMatrix,b::OldPSparseMatrix)
     @assert size(a) == size(b)
     copyto!(a,b)
@@ -674,6 +680,15 @@ function Base.similar(a::AbstractSplitMatrix,::Type{T}) where T
     split_matrix(blocks,a.row_permutation,a.col_permutation)
 end
 
+function Base.copy(a::AbstractSplitMatrix)
+    own_own = copy(a.blocks.own_own)
+    own_ghost = copy(a.blocks.own_ghost)
+    ghost_own = copy(a.blocks.ghost_own)
+    ghost_ghost = copy(a.blocks.ghost_ghost)
+    blocks = split_matrix_blocks(own_own,own_ghost,ghost_own,ghost_ghost)
+    split_matrix(blocks,a.row_permutation,a.col_permutation)
+end
+
 function Base.copy!(a::AbstractSplitMatrix,b::AbstractSplitMatrix)
     copy!(a.blocks.own_own,b.blocks.own_own)
     copy!(a.blocks.own_ghost,b.blocks.own_ghost)
@@ -1995,6 +2010,12 @@ function Base.similar(a::PSparseMatrix,::Type{T}) where T
     PSparseMatrix(matrix_partition,partition(rows),partition(cols),a.assembled)
 end
 
+function Base.copy(a::PSparseMatrix)
+    mats = map(copy,partition(a))
+    rows, cols = axes(a)
+    PSparseMatrix(mats,partition(rows),partition(cols),a.assembled)
+end
+
 function Base.copy!(a::PSparseMatrix,b::PSparseMatrix)
     @assert size(a) == size(b)
     @assert a.assembled == b.assembled

test/p_sparse_matrix_tests.jl

@@ -122,6 +122,10 @@ function p_sparse_matrix_tests(distribute)
     @test norm(r) < 1.0e-9
     display(A)
 
+    B = copy(A)
+    @test reduce(&, map((a,b) -> nnz(a) == nnz(b),partition(A),partition(B)))
+    @test reduce(&, map((a,b) -> rowvals(a) == rowvals(b),partition(A),partition(B)))
+
     # New stuff
 
     n = 10
@@ -193,6 +197,7 @@ function p_sparse_matrix_tests(distribute)
     _A = similar(A)
     _A = similar(A,eltype(A))
     copy!(_A,A)
+    _A = copy(A)
 
     LinearAlgebra.fillstored!(A,1.0)
     fill!(x,3.0)
@@ -346,4 +351,3 @@ function p_sparse_matrix_tests(distribute)
     B = LinearAlgebra.I-A
 
 end
-