Added tests for the adapt functions

Author: Nielsbk

src/adapt.jl

@@ -21,14 +21,14 @@ end
 
 function Adapt.adapt_structure(to,v::SplitVectorBlocks)
     own = Adapt.adapt(to,v.own)
-    ghost = Adapt.adapt(to,v.own_ghost)
-
+    ghost = Adapt.adapt(to,v.ghost)
     split_vector_blocks(own,ghost)
 end
 
 function Adapt.adapt_structure(to,v::SplitVector)
     blocks = Adapt.adapt(to,v.blocks)
-    split_vector(blocks,v.permutation)
+    perm = Adapt.adapt(to,v.permutation)
+    split_vector(blocks,perm)
 end
 
 function Adapt.adapt_structure(to,v::JaggedArray)
@@ -39,12 +39,14 @@ end
 
 function Adapt.adapt_structure(to,v::SplitMatrix)
     blocks = Adapt.adapt_structure(to,v.blocks)
-    col_par = v.col_permutation
-    row_par = v.row_permutation
-    split_matrix(blocks,row_par,col_par)
+    col_per = v.col_permutation
+    row_per = v.row_permutation
+    split_matrix(blocks,row_par,col_per)
 end
 
 function Adapt.adapt_structure(to,v::PSparseMatrix)
     matrix_partition = Adapt.adapt_structure(to,v.matrix_partition)
-    PSparseMatrix(matrix_partition,v.row_partition,v.col_partition,v.assembled)
-end
+    col_par = v.col_permutation
+    row_par = v.row_permutation
+    PSparseMatrix(matrix_partition,row_par,col_par,v.assembled)
+end

test/adapt_tests.jl

@@ -0,0 +1,64 @@
+using Test
+using PartitionedArrays
+using Adapt
+
+struct FakeCuVector{A} <: AbstractVector{Float64}
+    vector::A
+end
+
+Base.size(v::FakeCuVector) = size(v.vector)
+Base.getindex(v::FakeCuVector,i::Integer) = v.vector[i]
+
+function Adapt.adapt_storage(::Type{<:FakeCuVector},x::AbstractArray)
+    FakeCuVector(x)
+end
+
+function adapt_tests(distribute)
+
+    rank = distribute(LinearIndices((2,2)))
+    
+    a = [[1,2],[3,4,5],Int[],[3,4]]
+    b = JaggedArray(a)
+    c = deepcopy(b)
+
+    c = Adapt.adapt(FakeCuVector,c)
+
+    @test typeof(c.data) == FakeCuVector{typeof(b.data)}
+    @test typeof(c.ptrs) == FakeCuVector{typeof(b.ptrs)}
+    @test typeof(c).name.wrapper == GenericJaggedArray
+
+    a = [1,2,3,4,5]
+    b = deepcopy(a)
+    b = Adapt.adapt(FakeCuVector,b)
+    @test typeof(b) == FakeCuVector{typeof(a)}
+    @test b.vector == a 
+
+    own = [1,2,3,4]
+    ghost = [5,6,7,8]
+    block_a = split_vector_blocks(own, ghost)
+    block_b = deepcopy(block_a)
+    block_b = Adapt.adapt(FakeCuVector,block_b)
+    @test block_b.own.vector == block_a.own
+    @test block_b.ghost.vector == block_a.ghost
+    @test typeof(block_b.own) == FakeCuVector{typeof(block_a.own)}
+    @test typeof(block_b.ghost) == FakeCuVector{typeof(block_a.ghost)}
+
+
+    a = split_vector(block_a,[1,2,3,4,5,6,7,8])
+    b = deepcopy(a)
+    b = Adapt.adapt(FakeCuVector,b)
+
+    @test b.blocks.own.vector == a.blocks.own
+    @test b.blocks.ghost.vector == a.blocks.ghost
+    @test b.permutation.vector == a.permutation
+
+    
+    a = distribute([[1,1,1],[2,2,2],[3,3,3],[4,4,4]])
+    b = distribute([[1,1,1],[2,2,2],[3,3,3],[4,4,4]])
+    b = Adapt.adapt(FakeCuVector,b)
+
+    map(a,b) do val_a,val_b
+        @test typeof(val_b) == FakeCuVector{typeof(val_a)}
+        @test val_b.vector == val_a
+    end
+end

test/debug_array/adapt_tests.jl

@@ -0,0 +1,9 @@
+module DebugArrayAdaptTests
+
+using PartitionedArrays
+
+include(joinpath("..","adapt_tests.jl"))
+
+with_debug(adapt_tests)
+
+end # module

test/debug_array/runtests.jl

@@ -23,4 +23,6 @@ using PartitionedArrays
 
 @testset "fem_example" begin include("fem_example.jl")  end
 
+@testset "adapt" begin include("adapt_tests.jl")  end
+
 end #module

test/mpi_array/adapt_tests.jl

@@ -0,0 +1,5 @@
+using MPI
+include("run_mpi_driver.jl")
+file = joinpath(@__DIR__,"drivers","adapt_tests.jl")
+run_mpi_driver(file;procs=4)
+

test/mpi_array/drivers/adapt_tests.jl

@@ -0,0 +1,9 @@
+module MPIArrayAdaptTests
+
+using PartitionedArrays
+
+include(joinpath("..","..","adapt_tests.jl"))
+
+with_mpi(adapt_tests)
+
+end # module

test/mpi_array/runtests.jl

@@ -13,5 +13,6 @@ using PartitionedArrays
 @testset "p_timer_tests" begin include("p_timer_tests.jl")  end
 @testset "fdm_example" begin include("fdm_example.jl")  end
 @testset "fem_example" begin include("fem_example.jl")  end
+@testset "adapt" begin include("adapt_tests.jl")  end
 
 end #module